[4547] Adapt the VSCode extension to the use of SemanticData#id as ed…

…itingContextId Bug: #4547 Signed-off-by: Guillaume Coutable <[email protected]>
eclipse-sirius · Feb 13, 2025 · 30b10cf · 30b10cf
1 parent eb763fa
commit 30b10cf
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 18 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -95,6 +95,7 @@ Now they are executed for some data if the data was coming from a studio too.
 - https://github.com/eclipse-sirius/sirius-web/issues/4544[#4544] [diagram] Fix an issue where quicktools could be misaligned by ensuring now that all quick tools provided by Sirius Web are 24px in width and 24px in height
 - https://github.com/eclipse-sirius/sirius-web/issues/4523[#4523] [diagram] Fix an issue that caused the palette to be unopenable during a fit view
 - https://github.com/eclipse-sirius/sirius-web/issues/4557[#4557] [sirius-web] Fix an issue where targetObjectURI was not set in manifest.json during the download of a project
+- https://github.com/eclipse-sirius/sirius-web/issues/4547[#4547] [vs-code] Adapt the VSCode extension to the use of SemanticData#id as editingContextId
 
 
 === New Features

diff --git a/vscode-extension/package.json b/vscode-extension/package.json
@@ -144,6 +144,7 @@
     "@mui/icons-material": "5.15.19",
     "@mui/material": "5.15.19",
     "@xstate/react": "3.0.0",
+    "@xyflow/react": "12.2.1",
     "axios": "0.21.4",
     "d3": "7.0.0",
     "elkjs": "0.8.2",
@@ -155,7 +156,6 @@
     "notistack": "3.0.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "@xyflow/react": "12.2.1",
     "reflect-metadata": "0.1.13",
     "subscriptions-transport-ws": "0.11.0",
     "uuid": "8.3.2",

diff --git a/vscode-extension/src/data/ModelData.ts b/vscode-extension/src/data/ModelData.ts
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 Obeo.
+ * Copyright (c) 2022, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -19,7 +19,7 @@ export class ModelData {
     public readonly kind: string,
     public readonly imageURL: string,
     public readonly serverId: string,
-    public readonly projectId: string,
+    public readonly editingContextId: string,
     public readonly hasChildren: boolean
   ) {
     this.children = [];

diff --git a/vscode-extension/src/data/ProjectData.ts b/vscode-extension/src/data/ProjectData.ts
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2024 Obeo.
+ * Copyright (c) 2022, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -28,7 +28,12 @@ export class ProjectData {
   private representationsData: RepresentationData[];
   private subscriptionTreeEventId: string | undefined;
 
-  constructor(public readonly id: string, public readonly name: string, public readonly serverId: string) {
+  constructor(
+    public readonly id: string,
+    public readonly editingContextId: string,
+    public readonly name: string,
+    public readonly serverId: string
+  ) {
     this.modelsData = [];
     this.representationsData = [];
   }
@@ -71,7 +76,7 @@ export class ProjectData {
             representationId: `explorer://?treeDescriptionId=explorer_tree_description&expandedIds=[${expandedItems
               .map(encodeURIComponent)
               .join(',')}]&activeFilterIds=[]`,
-            editingContextId: this.id,
+            editingContextId: this.editingContextId,
           },
         },
       };
@@ -126,7 +131,7 @@ export class ProjectData {
             element.kind,
             element.imageURL,
             this.serverId,
-            this.id,
+            this.editingContextId,
             element.hasChildren
           );
           modelsData.push(modelData);
@@ -166,7 +171,7 @@ export class ProjectData {
         queryURL,
         {
           query: graphQLQuery,
-          variables: { editingContextId: this.id },
+          variables: { editingContextId: this.editingContextId },
         },
         headers
       )
@@ -180,7 +185,12 @@ export class ProjectData {
             .map((e) => e.node)
             .filter(this.isHandledRepresentation);
           representations.forEach((diagram) => {
-            const representationData = new RepresentationData(diagram.id, diagram.label, diagram.kind, this.id);
+            const representationData = new RepresentationData(
+              diagram.id,
+              diagram.label,
+              diagram.kind,
+              this.editingContextId
+            );
             this.representationsData.push(representationData);
           });
           return Promise.resolve(this.representationsData);

diff --git a/vscode-extension/src/data/RepresentationData.ts b/vscode-extension/src/data/RepresentationData.ts
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 Obeo.
+ * Copyright (c) 2022, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -16,6 +16,6 @@ export class RepresentationData {
     public readonly id: string,
     public readonly label: string,
     public readonly kind: string,
-    public readonly projectId: string
+    public readonly editingContextId: string
   ) {}
 }
diff --git a/vscode-extension/src/data/ServerData.ts b/vscode-extension/src/data/ServerData.ts
@@ -58,6 +58,9 @@ export class ServerData {
               node {
                 id
                 name
+                currentEditingContext {
+                  id
+                }
               }
             }
           }
@@ -82,8 +85,8 @@ export class ServerData {
         } else {
           this.projectsData = [];
           const projects = response.data.data.viewer.projects.edges.map((e: { node: any }) => e.node);
-          projects.forEach((node: { id: string; name: string; visibility: string }) => {
-            const projectData = new ProjectData(node.id, node.name, this.id);
+          projects.forEach((node: { id: string; name: string; currentEditingContext: { id: string } }) => {
+            const projectData = new ProjectData(node.id, node.currentEditingContext.id, node.name, this.id);
             this.projectsData.push(projectData);
           });
           return Promise.resolve(this.projectsData);

diff --git a/vscode-extension/src/viewsContainer/views/explorerView.ts b/vscode-extension/src/viewsContainer/views/explorerView.ts
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 Obeo.
+ * Copyright (c) 2022, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@ import {
   ProviderResult,
   TreeDataProvider,
   TreeItem,
-  TreeItemCollapsibleState
+  TreeItemCollapsibleState,
 } from 'vscode';
 import { ModelData } from '../../data/ModelData';
 import { ProjectData } from '../../data/ProjectData';
@@ -146,7 +146,7 @@ export class ExplorerViewProvider implements TreeDataProvider<ModelItem> {
           serverData.serverAddress,
           serverData.username,
           serverData.password,
-          projectData.id,
+          projectData.editingContextId,
           element.id,
           element.label,
           element.kind,

diff --git a/vscode-extension/src/viewsContainer/views/representationsView.ts b/vscode-extension/src/viewsContainer/views/representationsView.ts
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022 Obeo.
+ * Copyright (c) 2022, 2025 Obeo.
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -61,7 +61,7 @@ export class RepresentationsViewProvider implements TreeDataProvider<Representat
                   serverData.serverAddress,
                   serverData.username,
                   serverData.password,
-                  projectData.id,
+                  projectData.editingContextId,
                   representationData.id,
                   representationData.label,
                   representationData.kind,