Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
399 changes: 317 additions & 82 deletions dotnet/src/Generated/Rpc.cs

Large diffs are not rendered by default.

277 changes: 208 additions & 69 deletions dotnet/src/Generated/SessionEvents.cs

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions dotnet/src/Session.cs
Original file line number Diff line number Diff line change
Expand Up @@ -911,22 +911,19 @@ private void UpdateOpenCanvasesFromEvent(SessionEvent sessionEvent)
var data = canvasEvent.Data;
if (string.IsNullOrEmpty(data.InstanceId)
|| string.IsNullOrEmpty(data.CanvasId)
|| string.IsNullOrEmpty(data.ExtensionId)
|| string.IsNullOrEmpty(data.Availability.Value))
|| string.IsNullOrEmpty(data.ExtensionId))
{
_logger.LogWarning("failed to deserialize session.canvas.opened payload");
return;
}

UpsertOpenCanvas(new OpenCanvasInstance
{
Availability = new CanvasInstanceAvailability(data.Availability.Value),
CanvasId = data.CanvasId,
ExtensionId = data.ExtensionId,
ExtensionName = data.ExtensionName,
Input = data.Input,
InstanceId = data.InstanceId,
Reopen = data.Reopen,
Status = data.Status,
Title = data.Title,
Url = data.Url,
Expand Down
14 changes: 0 additions & 14 deletions dotnet/test/Unit/CanvasTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,9 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
Timestamp = DateTimeOffset.UtcNow,
Data = new SessionCanvasOpenedData
{
Availability = CanvasOpenedAvailability.Ready,
CanvasId = "",
ExtensionId = "project:counter",
InstanceId = "missing-canvas-id",
Reopen = false,
}
});
DispatchEvent(session, new SessionCanvasOpenedEvent
Expand All @@ -163,7 +161,6 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
Timestamp = DateTimeOffset.UtcNow,
Data = new SessionCanvasOpenedData
{
Availability = CanvasOpenedAvailability.Ready,
CanvasId = "counter",
ExtensionId = "project:counter",
ExtensionName = "Counter Provider",
Expand All @@ -172,7 +169,6 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
Status = "ready",
Url = "https://example.test/counter",
Input = JsonDocument.Parse("""{"seed":1}""").RootElement.Clone(),
Reopen = false,
}
});
DispatchEvent(session, new SessionCanvasOpenedEvent
Expand All @@ -181,12 +177,10 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
Timestamp = DateTimeOffset.UtcNow,
Data = new SessionCanvasOpenedData
{
Availability = CanvasOpenedAvailability.Stale,
CanvasId = "logs",
ExtensionId = "project:logs",
InstanceId = "logs-1",
Title = "Logs",
Reopen = false,
}
});

Expand All @@ -201,7 +195,6 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
Timestamp = DateTimeOffset.UtcNow,
Data = new SessionCanvasOpenedData
{
Availability = CanvasOpenedAvailability.Stale,
CanvasId = "counter",
ExtensionId = "project:counter",
ExtensionName = "Counter Provider",
Expand All @@ -210,7 +203,6 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
Status = "reconnected",
Url = "https://example.test/counter-updated",
Input = JsonDocument.Parse("""{"seed":2}""").RootElement.Clone(),
Reopen = true,
}
});

Expand All @@ -222,8 +214,6 @@ public void SessionCanvasOpenedEvent_UpdatesOpenCanvasSnapshots()
Assert.Equal("Counter Updated", canvas.Title);
Assert.Equal("reconnected", canvas.Status);
Assert.Equal("https://example.test/counter-updated", canvas.Url);
Assert.True(canvas.Reopen);
Assert.Equal(CanvasInstanceAvailability.Stale, canvas.Availability);
Assert.Equal(2, canvas.Input!.Value.GetProperty("seed").GetInt32());
},
canvas => Assert.Equal("logs-1", canvas.InstanceId));
Expand All @@ -240,12 +230,10 @@ public void SessionCanvasClosedEvent_RemovesOpenCanvasSnapshots()
Timestamp = DateTimeOffset.UtcNow,
Data = new SessionCanvasOpenedData
{
Availability = CanvasOpenedAvailability.Ready,
CanvasId = "counter",
ExtensionId = "project:counter",
InstanceId = "counter-1",
Title = "Counter",
Reopen = false,
}
});
DispatchEvent(session, new SessionCanvasOpenedEvent
Expand All @@ -254,12 +242,10 @@ public void SessionCanvasClosedEvent_RemovesOpenCanvasSnapshots()
Timestamp = DateTimeOffset.UtcNow,
Data = new SessionCanvasOpenedData
{
Availability = CanvasOpenedAvailability.Ready,
CanvasId = "logs",
ExtensionId = "project:logs",
InstanceId = "logs-1",
Title = "Logs",
Reopen = false,
}
});

Expand Down
1 change: 0 additions & 1 deletion dotnet/test/Unit/SerializationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,6 @@ public void ResumeSessionRequest_CanSerializeOpenCanvases_WithSdkOptions()
CanvasId = "canvas-id",
ExtensionId = "ext-id",
InstanceId = "instance-1",
Availability = CanvasInstanceAvailability.Ready,
},
};
var request = CreateInternalRequest(
Expand Down
12 changes: 4 additions & 8 deletions go/canvas_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,9 @@ func TestCanvasResumeSessionResponse_OpenCanvasesParse(t *testing.T) {
"workspacePath": "/tmp/ws",
"openCanvases": [
{
"availability": "ready",
"canvasId": "echo",
"extensionId": "project:echo",
"instanceId": "echo-1",
"reopen": false
"instanceId": "echo-1"
}
]
}`)
Expand Down Expand Up @@ -343,11 +341,9 @@ func TestCanvasResumeSessionRequest_OpenCanvasesWireShape(t *testing.T) {
SessionID: "s1",
OpenCanvases: []rpc.OpenCanvasInstance{
{
Availability: "ready",
CanvasID: "echo",
ExtensionID: "project:echo",
InstanceID: "echo-1",
Reopen: false,
CanvasID: "echo",
ExtensionID: "project:echo",
InstanceID: "echo-1",
},
},
}
Expand Down
Loading
Loading