From a6b40848b8a66c87c73a6b942fab6f8804808851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20B=C3=A9gaudeau?= Date: Fri, 7 Jan 2022 22:26:13 +0100 Subject: [PATCH 1/3] [932] Introduce the RepresentationMetadata concept MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://github.com/eclipse-sirius/sirius-components/issues/932 Signed-off-by: Pierre-Charles David Signed-off-by: Stéphane Bégaudeau --- CHANGELOG.adoc | 1 + .../collaborative/diagrams/ToolService.java | 3 +- .../diagrams/api/IToolService.java | 18 -------- .../main/resources/schema/diagram.graphqls | 2 +- .../src/main/resources/schema/core.graphqls | 13 ++++-- .../src/diagram/DiagramWebSocketContainer.tsx | 13 +++--- .../DiagramWebSocketContainer.types.ts | 23 ++++++++-- frontend/src/diagram/operations.ts | 42 ++++++++++--------- .../sprotty/__tests__/siriusWebDiagram.ts | 2 - 9 files changed, 62 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index d41788e769..e290906306 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -19,6 +19,7 @@ - [core] `IEditService.findClass()` has been removed - [core] `IRepresentationDescriptionSearchService` has a new `findAll` method to return all the representation descriptions available in a given editing context - [core] The package containing the concepts related to the editing context has been renamed to remove references to the project +- https://github.com/eclipse-sirius/sirius-components/issues/932[#932] [graphql] Introduce the RepresentationMetadata concept in order to prepare the separation of the metadata from the representation === Dependency update diff --git a/backend/sirius-web-spring-collaborative-diagrams/src/main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/ToolService.java b/backend/sirius-web-spring-collaborative-diagrams/src/main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/ToolService.java index 3a9077c264..0cf01c2a9b 100644 --- a/backend/sirius-web-spring-collaborative-diagrams/src/main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/ToolService.java +++ b/backend/sirius-web-spring-collaborative-diagrams/src/main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/ToolService.java @@ -40,8 +40,7 @@ public ToolService(IRepresentationDescriptionSearchService representationDescrip this.representationDescriptionSearchService = Objects.requireNonNull(representationDescriptionSearchService); } - @Override - public List getToolSections(IEditingContext editingContext, Diagram diagram) { + private List getToolSections(IEditingContext editingContext, Diagram diagram) { // @formatter:off return this.representationDescriptionSearchService.findById(editingContext, diagram.getDescriptionId()) .filter(DiagramDescription.class::isInstance) diff --git a/backend/sirius-web-spring-collaborative-diagrams/src/main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/api/IToolService.java b/backend/sirius-web-spring-collaborative-diagrams/src/main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/api/IToolService.java index 40a20c955b..f81debba81 100644 --- a/backend/sirius-web-spring-collaborative-diagrams/src/main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/api/IToolService.java +++ b/backend/sirius-web-spring-collaborative-diagrams/src/main/java/org/eclipse/sirius/web/spring/collaborative/diagrams/api/IToolService.java @@ -12,13 +12,11 @@ *******************************************************************************/ package org.eclipse.sirius.web.spring.collaborative.diagrams.api; -import java.util.List; import java.util.Optional; import org.eclipse.sirius.web.core.api.IEditingContext; import org.eclipse.sirius.web.diagrams.Diagram; import org.eclipse.sirius.web.diagrams.tools.ITool; -import org.eclipse.sirius.web.diagrams.tools.ToolSection; /** * Interface used to manipulate tools. @@ -27,22 +25,6 @@ */ public interface IToolService { - /** - * Find a specific tool according to the given diagram and tool identifiers. - * - * @param diagram - * the diagram - * @param toolId - * the tool identifier - */ Optional findToolById(IEditingContext editingContext, Diagram diagram, String toolId); - /** - * Get all tool sections available in a specific diagram. - * - * @param diagram - * the diagram - */ - List getToolSections(IEditingContext editingContext, Diagram diagram); - } diff --git a/backend/sirius-web-spring-collaborative-diagrams/src/main/resources/schema/diagram.graphqls b/backend/sirius-web-spring-collaborative-diagrams/src/main/resources/schema/diagram.graphqls index 27379d0a79..76fa32584e 100644 --- a/backend/sirius-web-spring-collaborative-diagrams/src/main/resources/schema/diagram.graphqls +++ b/backend/sirius-web-spring-collaborative-diagrams/src/main/resources/schema/diagram.graphqls @@ -26,7 +26,6 @@ type Diagram implements Representation { position: Position! nodes: [Node!]! edges: [Edge!]! - toolSections: [ToolSection!]! } type Node { @@ -190,6 +189,7 @@ type DiagramDescription implements RepresentationDescription { id: ID! label: String! autoLayout: Boolean! + toolSections: [ToolSection!]! } type NodeDescription { diff --git a/backend/sirius-web-spring-collaborative/src/main/resources/schema/core.graphqls b/backend/sirius-web-spring-collaborative/src/main/resources/schema/core.graphqls index aed5329fd1..291cb0a107 100644 --- a/backend/sirius-web-spring-collaborative/src/main/resources/schema/core.graphqls +++ b/backend/sirius-web-spring-collaborative/src/main/resources/schema/core.graphqls @@ -14,7 +14,7 @@ interface Viewer { type EditingContext { id: ID! domains: [Domain!]! - representation(representationId: ID!): Representation + representation(representationId: ID!): RepresentationMetadata representations: EditingContextRepresentationConnection! representationDescriptions(kind: ID!): EditingContextRepresentationDescriptionConnection! stereotypeDescriptions: EditingContextStereotypeDescriptionConnection! @@ -32,6 +32,13 @@ type Domain { label: String! } +type RepresentationMetadata { + id: ID! + label: String! + kind: String! + description: RepresentationDescription! +} + interface Representation { id: ID! kind: String! @@ -60,7 +67,7 @@ type EditingContextRepresentationConnection { } type EditingContextRepresentationEdge { - node: Representation! + node: RepresentationMetadata! } type EditingContextRepresentationDescriptionConnection { @@ -201,7 +208,7 @@ union CreateRepresentationPayload = ErrorPayload | CreateRepresentationSuccessPa type CreateRepresentationSuccessPayload { id: ID! - representation: Representation! + representation: RepresentationMetadata! } input CreateRootObjectInput { diff --git a/frontend/src/diagram/DiagramWebSocketContainer.tsx b/frontend/src/diagram/DiagramWebSocketContainer.tsx index 967c4194e0..96b8d5837e 100644 --- a/frontend/src/diagram/DiagramWebSocketContainer.tsx +++ b/frontend/src/diagram/DiagramWebSocketContainer.tsx @@ -21,7 +21,8 @@ import { ServerContext } from 'common/ServerContext'; import { CreateEdgeTool, CreateNodeTool, - GQLDiagram, + GQLDiagramDescription, + GQLDiagramEventPayload, GQLDiagramEventSubscription, GQLDiagramRefreshedEventPayload, GQLErrorPayload, @@ -94,7 +95,6 @@ import { import { edgeCreationFeedback } from 'diagram/sprotty/edgeCreationFeedback'; import { Toolbar } from 'diagram/Toolbar'; import { atLeastOneCanInvokeEdgeTool, canInvokeTool } from 'diagram/toolServices'; -import { GQLDiagramEventPayload } from 'index'; import React, { useCallback, useContext, useEffect, useRef } from 'react'; import { SelectionDialogWebSocketContainer } from 'selection/SelectionDialogWebSocketContainer'; import { EditLabelAction, FitToScreenAction, HoverFeedbackAction, SEdge, SGraph, SModelElement, SNode } from 'sprotty'; @@ -136,7 +136,8 @@ const useDiagramWebSocketContainerStyle = makeStyles((theme) => ({ }, })); -const isDiagram = (representation): representation is GQLDiagram => representation.__typename === 'Diagram'; +const isDiagramDescription = (representationDescription): representationDescription is GQLDiagramDescription => + representationDescription.__typename === 'DiagramDescription'; const isDiagramRefreshedEventPayload = (payload: GQLDiagramEventPayload): payload is GQLDiagramRefreshedEventPayload => payload.__typename === 'DiagramRefreshedEventPayload'; const isSubscribersUpdatedEventPayload = ( @@ -704,9 +705,9 @@ export const DiagramWebSocketContainer = ({ useEffect(() => { if (!toolSectionLoading && diagramWebSocketContainer === 'ready' && toolSectionData) { - const representation = toolSectionData.viewer.editingContext.representation; - if (isDiagram(representation)) { - const { toolSections } = representation; + const representationDescription = toolSectionData.viewer.editingContext.representation.description; + if (isDiagramDescription(representationDescription)) { + const { toolSections } = representationDescription; const setToolSectionsEvent: SetToolSectionsEvent = { type: 'SET_TOOL_SECTIONS', toolSections: toolSections }; dispatch(setToolSectionsEvent); diff --git a/frontend/src/diagram/DiagramWebSocketContainer.types.ts b/frontend/src/diagram/DiagramWebSocketContainer.types.ts index 9c59b2cb1d..c03c939724 100644 --- a/frontend/src/diagram/DiagramWebSocketContainer.types.ts +++ b/frontend/src/diagram/DiagramWebSocketContainer.types.ts @@ -114,12 +114,30 @@ export interface GQLViewer { } export interface GQLEditingContext { - representation: GQLRepresentation; + representation: GQLRepresentationMetadata; +} + +export interface GQLRepresentationMetadata { + id: string; + label: string; + kind: string; + description: GQLRepresentationDescription; +} + +export interface GQLRepresentationDescription { + id: string; +} + +export interface GQLDiagramDescription extends GQLRepresentationDescription { + toolSections: GQLToolSection[]; } export interface GQLRepresentation { - __typename: string; + id: string; + label: string; + kind: string; } + export interface GQLDiagram extends GQLRepresentation { id: string; label: string; @@ -131,7 +149,6 @@ export interface GQLDiagram extends GQLRepresentation { position: GQLPosition; nodes: GQLNode[]; edges: GQLEdge[]; - toolSections: GQLToolSection[]; } export interface GQLSize { diff --git a/frontend/src/diagram/operations.ts b/frontend/src/diagram/operations.ts index 054fdfb825..9a0b65f6d9 100644 --- a/frontend/src/diagram/operations.ts +++ b/frontend/src/diagram/operations.ts @@ -325,31 +325,33 @@ export const getToolSectionsQuery = gql` viewer { editingContext(editingContextId: $editingContextId) { representation(representationId: $diagramId) { - ... on Diagram { - toolSections { - id - label - imageURL - tools { - __typename + description { + ... on DiagramDescription { + toolSections { id label imageURL - ... on CreateNodeTool { - targetDescriptions { - id + tools { + __typename + id + label + imageURL + ... on CreateNodeTool { + targetDescriptions { + id + } + appliesToDiagramRoot + selectionDescriptionId } - appliesToDiagramRoot - selectionDescriptionId - } - ... on CreateEdgeTool { - edgeCandidates { - ...edgeCandidateField + ... on CreateEdgeTool { + edgeCandidates { + ...edgeCandidateField + } } - } - ... on DeleteTool { - targetDescriptions { - id + ... on DeleteTool { + targetDescriptions { + id + } } } } diff --git a/frontend/src/diagram/sprotty/__tests__/siriusWebDiagram.ts b/frontend/src/diagram/sprotty/__tests__/siriusWebDiagram.ts index 9f9c98b60a..358088b60a 100644 --- a/frontend/src/diagram/sprotty/__tests__/siriusWebDiagram.ts +++ b/frontend/src/diagram/sprotty/__tests__/siriusWebDiagram.ts @@ -25,8 +25,6 @@ export const siriusWebDiagram: GQLDiagram = { label: 'Topography', descriptionId: "inmemory.odesign#//@ownedViewpoints[name='Exchanges']/@ownedRepresentations[name='Topography']", autoLayout: false, - toolSections: [], - __typename: 'Diagram', position: { x: 0, y: 0, From 80b980b03b8a2a3c6c6486ca083d49c631cbd112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20B=C3=A9gaudeau?= Date: Mon, 10 Jan 2022 10:23:33 +0100 Subject: [PATCH 2/3] [932] Remove duplicate fields from Representation to leverage RepresentationMetadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The fields label, kind and descriptionId will not appear on the GraphQL Representation interface anymore. The RepresentationMetadata should be used instead. Bug: https://github.com/eclipse-sirius/sirius-components/issues/932 Signed-off-by: Stéphane Bégaudeau --- .../web/core/RepresentationMetadata.java | 61 +++++++++++++++++++ .../RepresentationMetadataSearchService.java | 34 +++++++++++ .../IRepresentationMetadataSearchService.java | 27 ++++++++ .../main/resources/schema/diagram.graphqls | 4 +- .../src/main/resources/schema/form.graphqls | 4 +- .../main/resources/schema/selection.graphqls | 4 +- .../src/main/resources/schema/tree.graphqls | 4 +- .../main/resources/schema/validation.graphqls | 4 +- .../src/main/resources/schema/core.graphqls | 3 +- .../DiagramWebSocketContainer.types.ts | 6 +- frontend/src/diagram/operations.ts | 10 ++- .../sprotty/__tests__/convertDiagram.test.ts | 4 +- .../sprotty/__tests__/siriusWebDiagram.ts | 11 +++- .../src/diagram/sprotty/convertDiagram.tsx | 11 +++- .../GraphqlTreeEventSubscription.test.ts | 1 - .../src/explorer/getTreeEventSubscription.ts | 1 - frontend/src/form/Form.types.ts | 7 ++- frontend/src/form/FormEventFragments.ts | 4 +- frontend/src/form/FormEventFragments.types.ts | 13 +++- frontend/src/properties/Properties.tsx | 6 +- .../ValidationWebSocketContainer.tsx | 1 - .../ValidationWebSocketContainer.types.ts | 1 - 22 files changed, 181 insertions(+), 40 deletions(-) create mode 100644 backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/RepresentationMetadata.java create mode 100644 backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/RepresentationMetadataSearchService.java create mode 100644 backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/api/IRepresentationMetadataSearchService.java diff --git a/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/RepresentationMetadata.java b/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/RepresentationMetadata.java new file mode 100644 index 0000000000..3691f67038 --- /dev/null +++ b/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/RepresentationMetadata.java @@ -0,0 +1,61 @@ +/******************************************************************************* + * Copyright (c) 2022 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 + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.web.core; + +import java.text.MessageFormat; +import java.util.Objects; +import java.util.UUID; + +/** + * The metadata of a representation. + * + * @author sbegaudeau + */ +public class RepresentationMetadata { + private final String id; + + private final String kind; + + private final String label; + + private final UUID descriptionId; + + public RepresentationMetadata(String id, String kind, String label, UUID descriptionId) { + this.id = Objects.requireNonNull(id); + this.kind = Objects.requireNonNull(kind); + this.label = Objects.requireNonNull(label); + this.descriptionId = Objects.requireNonNull(descriptionId); + } + + public String getId() { + return this.id; + } + + public String getKind() { + return this.kind; + } + + public String getLabel() { + return this.label; + } + + public UUID getDescriptionId() { + return this.descriptionId; + } + + @Override + public String toString() { + String pattern = "{0} '{'id: {1}, kind: {2}, label: {3}, descriptionId: {4}'}'"; //$NON-NLS-1$ + return MessageFormat.format(pattern, this.getClass().getSimpleName(), this.id, this.kind, this.label, this.descriptionId); + } +} diff --git a/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/RepresentationMetadataSearchService.java b/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/RepresentationMetadataSearchService.java new file mode 100644 index 0000000000..f540da1257 --- /dev/null +++ b/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/RepresentationMetadataSearchService.java @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2022 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 + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.web.core; + +import java.util.Optional; + +import org.eclipse.sirius.web.core.api.IRepresentationMetadataSearchService; +import org.eclipse.sirius.web.representations.IRepresentation; +import org.springframework.stereotype.Service; + +/** + * Used to find the metadata of a representation. + * + * @author sbegaudeau + */ +@Service +public class RepresentationMetadataSearchService implements IRepresentationMetadataSearchService { + + @Override + public Optional findByRepresentation(IRepresentation representation) { + return Optional.of(new RepresentationMetadata(representation.getId(), representation.getKind(), representation.getLabel(), representation.getDescriptionId())); + } + +} diff --git a/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/api/IRepresentationMetadataSearchService.java b/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/api/IRepresentationMetadataSearchService.java new file mode 100644 index 0000000000..25d7340e08 --- /dev/null +++ b/backend/sirius-web-core-api/src/main/java/org/eclipse/sirius/web/core/api/IRepresentationMetadataSearchService.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2022 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 + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.web.core.api; + +import java.util.Optional; + +import org.eclipse.sirius.web.core.RepresentationMetadata; +import org.eclipse.sirius.web.representations.IRepresentation; + +/** + * Used to search and retrieve the metadata of a representation. + * + * @author sbegaudeau + */ +public interface IRepresentationMetadataSearchService { + Optional findByRepresentation(IRepresentation representation); +} diff --git a/backend/sirius-web-spring-collaborative-diagrams/src/main/resources/schema/diagram.graphqls b/backend/sirius-web-spring-collaborative-diagrams/src/main/resources/schema/diagram.graphqls index 76fa32584e..5eb7d8a5cf 100644 --- a/backend/sirius-web-spring-collaborative-diagrams/src/main/resources/schema/diagram.graphqls +++ b/backend/sirius-web-spring-collaborative-diagrams/src/main/resources/schema/diagram.graphqls @@ -17,9 +17,7 @@ type DiagramRefreshedEventPayload { type Diagram implements Representation { id: ID! - label: String! - kind: String! - descriptionId: ID! + metadata: RepresentationMetadata! targetObjectId: ID! autoLayout: Boolean! size: Size! diff --git a/backend/sirius-web-spring-collaborative-forms/src/main/resources/schema/form.graphqls b/backend/sirius-web-spring-collaborative-forms/src/main/resources/schema/form.graphqls index f19879bec4..3ce6323b0f 100644 --- a/backend/sirius-web-spring-collaborative-forms/src/main/resources/schema/form.graphqls +++ b/backend/sirius-web-spring-collaborative-forms/src/main/resources/schema/form.graphqls @@ -45,9 +45,7 @@ type FormRefreshedEventPayload { type Form implements Representation { id: ID! - kind: String! - label: String! - descriptionId: ID! + metadata: RepresentationMetadata! targetObjectId: ID! pages: [Page!]! } diff --git a/backend/sirius-web-spring-collaborative-selection/src/main/resources/schema/selection.graphqls b/backend/sirius-web-spring-collaborative-selection/src/main/resources/schema/selection.graphqls index b6d971b122..8f1ee37898 100644 --- a/backend/sirius-web-spring-collaborative-selection/src/main/resources/schema/selection.graphqls +++ b/backend/sirius-web-spring-collaborative-selection/src/main/resources/schema/selection.graphqls @@ -18,9 +18,7 @@ type SelectionRefreshedEventPayload { type Selection implements Representation { id: ID! - label: String! - kind: String! - descriptionId: ID! + metadata: RepresentationMetadata! targetObjectId: String! message: String objects: [SelectionObject!]! diff --git a/backend/sirius-web-spring-collaborative-trees/src/main/resources/schema/tree.graphqls b/backend/sirius-web-spring-collaborative-trees/src/main/resources/schema/tree.graphqls index 8b701205c3..69d9bd7398 100644 --- a/backend/sirius-web-spring-collaborative-trees/src/main/resources/schema/tree.graphqls +++ b/backend/sirius-web-spring-collaborative-trees/src/main/resources/schema/tree.graphqls @@ -17,9 +17,7 @@ type TreeRefreshedEventPayload { type Tree implements Representation { id: ID! - label: String! - kind: String! - descriptionId: ID! + metadata: RepresentationMetadata! children: [TreeItem!]! } diff --git a/backend/sirius-web-spring-collaborative-validation/src/main/resources/schema/validation.graphqls b/backend/sirius-web-spring-collaborative-validation/src/main/resources/schema/validation.graphqls index 9ac924d4f2..7fd5fef38d 100644 --- a/backend/sirius-web-spring-collaborative-validation/src/main/resources/schema/validation.graphqls +++ b/backend/sirius-web-spring-collaborative-validation/src/main/resources/schema/validation.graphqls @@ -16,9 +16,7 @@ type ValidationRefreshedEventPayload { type Validation implements Representation { id: ID! - kind: String! - label: String! - descriptionId: ID! + metadata: RepresentationMetadata! diagnostics: [Diagnostic!]! } diff --git a/backend/sirius-web-spring-collaborative/src/main/resources/schema/core.graphqls b/backend/sirius-web-spring-collaborative/src/main/resources/schema/core.graphqls index 291cb0a107..a3210ceef8 100644 --- a/backend/sirius-web-spring-collaborative/src/main/resources/schema/core.graphqls +++ b/backend/sirius-web-spring-collaborative/src/main/resources/schema/core.graphqls @@ -41,8 +41,7 @@ type RepresentationMetadata { interface Representation { id: ID! - kind: String! - label: String! + metadata: RepresentationMetadata! } interface RepresentationDescription { diff --git a/frontend/src/diagram/DiagramWebSocketContainer.types.ts b/frontend/src/diagram/DiagramWebSocketContainer.types.ts index c03c939724..35c30094de 100644 --- a/frontend/src/diagram/DiagramWebSocketContainer.types.ts +++ b/frontend/src/diagram/DiagramWebSocketContainer.types.ts @@ -134,15 +134,11 @@ export interface GQLDiagramDescription extends GQLRepresentationDescription { export interface GQLRepresentation { id: string; - label: string; - kind: string; } export interface GQLDiagram extends GQLRepresentation { id: string; - label: string; - kind: string; - descriptionId: string; + metadata: GQLRepresentationMetadata; targetObjectId: string; autoLayout: boolean; size: GQLSize; diff --git a/frontend/src/diagram/operations.ts b/frontend/src/diagram/operations.ts index 9a0b65f6d9..88f008e1eb 100644 --- a/frontend/src/diagram/operations.ts +++ b/frontend/src/diagram/operations.ts @@ -29,10 +29,14 @@ export const diagramEventSubscription = gql` id diagram { id - kind + metadata { + kind + label + description { + id + } + } targetObjectId - label - descriptionId position { x y diff --git a/frontend/src/diagram/sprotty/__tests__/convertDiagram.test.ts b/frontend/src/diagram/sprotty/__tests__/convertDiagram.test.ts index 6044741d68..0cfcca17d4 100644 --- a/frontend/src/diagram/sprotty/__tests__/convertDiagram.test.ts +++ b/frontend/src/diagram/sprotty/__tests__/convertDiagram.test.ts @@ -44,10 +44,10 @@ describe('ModelConverter', () => { expect(sprottyDiagram).toBeInstanceOf(Diagram); expect(sprottyDiagram.id).toBe(siriusWebDiagram.id); - expect(sprottyDiagram.kind).toBe(siriusWebDiagram.kind); + expect(sprottyDiagram.kind).toBe(siriusWebDiagram.metadata.kind); expect(sprottyDiagram.type).toBe('graph'); expect(sprottyDiagram.targetObjectId).toBe(siriusWebDiagram.targetObjectId); - expect(sprottyDiagram.label).toBe(siriusWebDiagram.label); + expect(sprottyDiagram.label).toBe(siriusWebDiagram.metadata.label); const expectedDiagramChildrenLength = siriusWebDiagram.nodes.length + siriusWebDiagram.edges.length; expect(sprottyDiagram.children).toHaveLength(expectedDiagramChildrenLength); diff --git a/frontend/src/diagram/sprotty/__tests__/siriusWebDiagram.ts b/frontend/src/diagram/sprotty/__tests__/siriusWebDiagram.ts index 358088b60a..eeb6065fb6 100644 --- a/frontend/src/diagram/sprotty/__tests__/siriusWebDiagram.ts +++ b/frontend/src/diagram/sprotty/__tests__/siriusWebDiagram.ts @@ -20,10 +20,15 @@ import { export const siriusWebDiagram: GQLDiagram = { id: 'bf6a7cc1-011d-4900-8fa1-16b575a71175', - kind: 'siriusComponents://representation?type=DiagramDiagram', + metadata: { + id: 'bf6a7cc1-011d-4900-8fa1-16b575a71175', + label: 'Topography', + kind: 'siriusComponents://representation?type=DiagramDiagram', + description: { + id: "inmemory.odesign#//@ownedViewpoints[name='Exchanges']/@ownedRepresentations[name='Topography']", + }, + }, targetObjectId: 'robot#/', - label: 'Topography', - descriptionId: "inmemory.odesign#//@ownedViewpoints[name='Exchanges']/@ownedRepresentations[name='Topography']", autoLayout: false, position: { x: 0, diff --git a/frontend/src/diagram/sprotty/convertDiagram.tsx b/frontend/src/diagram/sprotty/convertDiagram.tsx index ec0b907cc4..687ae32a68 100644 --- a/frontend/src/diagram/sprotty/convertDiagram.tsx +++ b/frontend/src/diagram/sprotty/convertDiagram.tsx @@ -69,14 +69,21 @@ import { * @return a Sprotty diagram object */ export const convertDiagram = (gqlDiagram: GQLDiagram, httpOrigin: string, readOnly: boolean): Diagram => { - const { id, descriptionId, targetObjectId, autoLayout, nodes, edges, kind, label } = gqlDiagram; + const { + id, + metadata: { label, kind, description }, + targetObjectId, + autoLayout, + nodes, + edges, + } = gqlDiagram; const diagram = new Diagram(); diagram.id = id; diagram.type = 'graph'; diagram.kind = kind; diagram.label = label; - diagram.descriptionId = descriptionId; + diagram.descriptionId = description.id; diagram.targetObjectId = targetObjectId; diagram.features = createFeatureSet([hoverFeedbackFeature, viewportFeature]); diff --git a/frontend/src/explorer/__tests__/GraphqlTreeEventSubscription.test.ts b/frontend/src/explorer/__tests__/GraphqlTreeEventSubscription.test.ts index 8a40a85134..5533e26dd7 100644 --- a/frontend/src/explorer/__tests__/GraphqlTreeEventSubscription.test.ts +++ b/frontend/src/explorer/__tests__/GraphqlTreeEventSubscription.test.ts @@ -21,7 +21,6 @@ const getDocumentSubscription = gql` id tree { id - label children { ...treeItemFields children { diff --git a/frontend/src/explorer/getTreeEventSubscription.ts b/frontend/src/explorer/getTreeEventSubscription.ts index a92bcd96da..f4c6b9777f 100644 --- a/frontend/src/explorer/getTreeEventSubscription.ts +++ b/frontend/src/explorer/getTreeEventSubscription.ts @@ -20,7 +20,6 @@ subscription treeEvent($input: TreeEventInput!) { id tree { id - label children { ${treeChildren} } diff --git a/frontend/src/form/Form.types.ts b/frontend/src/form/Form.types.ts index bb4891f5c1..b7fa6597b6 100644 --- a/frontend/src/form/Form.types.ts +++ b/frontend/src/form/Form.types.ts @@ -10,9 +10,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ + +export interface RepresentationMetadata { + label: string; +} + export interface Form { id: string; - label: string; + metadata: RepresentationMetadata; pages: Page[]; } diff --git a/frontend/src/form/FormEventFragments.ts b/frontend/src/form/FormEventFragments.ts index 08ffa8a7c2..eb29c2697f 100644 --- a/frontend/src/form/FormEventFragments.ts +++ b/frontend/src/form/FormEventFragments.ts @@ -38,7 +38,9 @@ export const formRefreshedEventPayloadFragment = gql` id form { id - label + metadata { + label + } pages { id label diff --git a/frontend/src/form/FormEventFragments.types.ts b/frontend/src/form/FormEventFragments.types.ts index 78ef219c6d..f044002db7 100644 --- a/frontend/src/form/FormEventFragments.types.ts +++ b/frontend/src/form/FormEventFragments.types.ts @@ -67,9 +67,20 @@ export interface GQLFormRefreshedEventPayload form: GQLForm; } -export interface GQLForm { +export interface GQLRepresentationMetadata { id: string; label: string; + kind: string; + description: GQLRepresentationDescription; +} + +export interface GQLRepresentationDescription { + id: string; +} + +export interface GQLForm { + id: string; + metadata: GQLRepresentationMetadata; pages: GQLPage[]; } diff --git a/frontend/src/properties/Properties.tsx b/frontend/src/properties/Properties.tsx index 7ded1a3053..a9ca3eaaa8 100644 --- a/frontend/src/properties/Properties.tsx +++ b/frontend/src/properties/Properties.tsx @@ -62,7 +62,11 @@ export const Properties = ({ readOnly, }: FormProps) => { const classes = usePropertiesStyles(); - const { id, label, pages } = form; + const { + id, + metadata: { label }, + pages, + } = form; let content; if (pages.length > 1) { diff --git a/frontend/src/validation/ValidationWebSocketContainer.tsx b/frontend/src/validation/ValidationWebSocketContainer.tsx index c7f73f2845..cf4f8573d6 100644 --- a/frontend/src/validation/ValidationWebSocketContainer.tsx +++ b/frontend/src/validation/ValidationWebSocketContainer.tsx @@ -47,7 +47,6 @@ const validationEventSubscription = gql` id validation { id - label diagnostics { id kind diff --git a/frontend/src/validation/ValidationWebSocketContainer.types.ts b/frontend/src/validation/ValidationWebSocketContainer.types.ts index bdc4b4791d..a06e4e541c 100644 --- a/frontend/src/validation/ValidationWebSocketContainer.types.ts +++ b/frontend/src/validation/ValidationWebSocketContainer.types.ts @@ -30,7 +30,6 @@ export interface GQLValidationRefreshedEventPayload extends GQLValidationEventPa export interface GQLValidation { id: string; - label: string; diagnostics: GQLDiagnostic[]; } From 9563535eaf62c5a970b031819dec133f712c21d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20B=C3=A9gaudeau?= Date: Wed, 12 Jan 2022 16:55:20 +0100 Subject: [PATCH 3/3] [releng] Bump version to 2021.12.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Bégaudeau --- backend/pom.xml | 2 +- backend/sirius-web-annotations-spring/pom.xml | 2 +- backend/sirius-web-annotations/pom.xml | 2 +- backend/sirius-web-api/pom.xml | 10 +++---- backend/sirius-web-compatibility/pom.xml | 20 +++++++------- backend/sirius-web-components/pom.xml | 4 +-- backend/sirius-web-core-api/pom.xml | 8 +++--- .../sirius-web-diagrams-layout-api/pom.xml | 6 ++--- backend/sirius-web-diagrams-layout/pom.xml | 14 +++++----- backend/sirius-web-diagrams-tests/pom.xml | 4 +-- backend/sirius-web-diagrams/pom.xml | 8 +++--- backend/sirius-web-domain-design/pom.xml | 4 +-- backend/sirius-web-domain-edit/pom.xml | 4 +-- backend/sirius-web-domain/pom.xml | 2 +- backend/sirius-web-emf/pom.xml | 26 +++++++++---------- backend/sirius-web-forms-tests/pom.xml | 4 +-- backend/sirius-web-forms/pom.xml | 10 +++---- backend/sirius-web-graphiql/pom.xml | 2 +- backend/sirius-web-graphql-utils/pom.xml | 6 ++--- backend/sirius-web-graphql-voyager/pom.xml | 2 +- backend/sirius-web-interpreter/pom.xml | 2 +- backend/sirius-web-representations/pom.xml | 4 +-- backend/sirius-web-selection/pom.xml | 8 +++--- .../pom.xml | 16 ++++++------ .../pom.xml | 12 ++++----- .../pom.xml | 12 ++++----- .../pom.xml | 10 +++---- .../pom.xml | 12 ++++----- .../sirius-web-spring-collaborative/pom.xml | 10 +++---- backend/sirius-web-spring-graphql-api/pom.xml | 4 +-- backend/sirius-web-spring-graphql/pom.xml | 12 ++++----- backend/sirius-web-spring-starter/pom.xml | 22 ++++++++-------- backend/sirius-web-spring-tests/pom.xml | 4 +-- backend/sirius-web-tests/pom.xml | 4 +-- backend/sirius-web-trees/pom.xml | 8 +++--- backend/sirius-web-validation/pom.xml | 8 +++--- backend/sirius-web-view-edit/pom.xml | 4 +-- backend/sirius-web-view/pom.xml | 2 +- frontend/package-lock.json | 4 +-- frontend/package.json | 2 +- 40 files changed, 150 insertions(+), 150 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index dbd52bc138..a52668a148 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -15,7 +15,7 @@ org.eclipse.sirius.web sirius-components - 2021.12.10 + 2021.12.11 sirius-components Sirius Components diff --git a/backend/sirius-web-annotations-spring/pom.xml b/backend/sirius-web-annotations-spring/pom.xml index 69226f0ebf..bd79ba6a66 100644 --- a/backend/sirius-web-annotations-spring/pom.xml +++ b/backend/sirius-web-annotations-spring/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-annotations-spring - 2021.12.10 + 2021.12.11 sirius-web-annotations-spring Sirius Web Annotations Spring diff --git a/backend/sirius-web-annotations/pom.xml b/backend/sirius-web-annotations/pom.xml index 7ceaeda4c5..b98aa604bd 100644 --- a/backend/sirius-web-annotations/pom.xml +++ b/backend/sirius-web-annotations/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 sirius-web-annotations Sirius Web Annotations diff --git a/backend/sirius-web-api/pom.xml b/backend/sirius-web-api/pom.xml index 6dd5e12a71..e55598223b 100644 --- a/backend/sirius-web-api/pom.xml +++ b/backend/sirius-web-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-api - 2021.12.10 + 2021.12.11 sirius-web-api Sirius Web API @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-forms - 2021.12.10 + 2021.12.11 io.projectreactor @@ -66,7 +66,7 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-compatibility/pom.xml b/backend/sirius-web-compatibility/pom.xml index b421bc5281..b65b16a80a 100644 --- a/backend/sirius-web-compatibility/pom.xml +++ b/backend/sirius-web-compatibility/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-compatibility - 2021.12.10 + 2021.12.11 sirius-web-compatibility Sirius Web Compatibility @@ -72,7 +72,7 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test @@ -82,43 +82,43 @@ org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-core-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-diagrams - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-forms - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-selection - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-trees - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-interpreter - 2021.12.10 + 2021.12.11 org.eclipse.emf diff --git a/backend/sirius-web-components/pom.xml b/backend/sirius-web-components/pom.xml index c79d5a824a..9aabb90aaf 100644 --- a/backend/sirius-web-components/pom.xml +++ b/backend/sirius-web-components/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-components - 2021.12.10 + 2021.12.11 sirius-web-components Sirius Web Components @@ -52,7 +52,7 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-core-api/pom.xml b/backend/sirius-web-core-api/pom.xml index 36ec3a1495..f744d006ff 100644 --- a/backend/sirius-web-core-api/pom.xml +++ b/backend/sirius-web-core-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-core-api - 2021.12.10 + 2021.12.11 sirius-web-core-api Sirius Web Core API @@ -51,17 +51,17 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-diagrams-layout-api/pom.xml b/backend/sirius-web-diagrams-layout-api/pom.xml index 2d128242f1..d95b2c2ffb 100644 --- a/backend/sirius-web-diagrams-layout-api/pom.xml +++ b/backend/sirius-web-diagrams-layout-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-diagrams-layout-api - 2021.12.10 + 2021.12.11 sirius-web-diagrams-layout-api Sirius Web Diagrams Layout API @@ -42,12 +42,12 @@ org.eclipse.sirius.web sirius-web-diagrams - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-core-api - 2021.12.10 + 2021.12.11 diff --git a/backend/sirius-web-diagrams-layout/pom.xml b/backend/sirius-web-diagrams-layout/pom.xml index ed7e471e56..174fc1fbee 100644 --- a/backend/sirius-web-diagrams-layout/pom.xml +++ b/backend/sirius-web-diagrams-layout/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-diagrams-layout - 2021.12.10 + 2021.12.11 sirius-web-diagrams-layout Sirius Web Diagrams layout @@ -65,17 +65,17 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-core-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-diagrams-layout-api - 2021.12.10 + 2021.12.11 org.eclipse.elk @@ -112,7 +112,7 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test @@ -127,12 +127,12 @@ org.eclipse.sirius.web sirius-web-diagrams - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-diagrams-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-diagrams-tests/pom.xml b/backend/sirius-web-diagrams-tests/pom.xml index 203bc4feb6..e86cf16e40 100644 --- a/backend/sirius-web-diagrams-tests/pom.xml +++ b/backend/sirius-web-diagrams-tests/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-diagrams-tests - 2021.12.10 + 2021.12.11 sirius-web-diagrams-tests Sirius Web Diagrams Tests @@ -42,7 +42,7 @@ org.eclipse.sirius.web sirius-web-diagrams - 2021.12.10 + 2021.12.11 org.assertj diff --git a/backend/sirius-web-diagrams/pom.xml b/backend/sirius-web-diagrams/pom.xml index 82d7f48c65..8247442038 100644 --- a/backend/sirius-web-diagrams/pom.xml +++ b/backend/sirius-web-diagrams/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-diagrams - 2021.12.10 + 2021.12.11 sirius-web-diagrams Sirius Web Diagrams @@ -42,12 +42,12 @@ org.eclipse.sirius.web sirius-web-components - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 org.springframework.boot @@ -57,7 +57,7 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-domain-design/pom.xml b/backend/sirius-web-domain-design/pom.xml index 0b3a85abbd..5f8d7be005 100644 --- a/backend/sirius-web-domain-design/pom.xml +++ b/backend/sirius-web-domain-design/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-domain-design - 2021.12.10 + 2021.12.11 sirius-web-domain-design Sirius Web Domain Definition DSL - Graphical Modeler Definition @@ -64,7 +64,7 @@ org.eclipse.sirius.web sirius-web-domain - 2021.12.10 + 2021.12.11 diff --git a/backend/sirius-web-domain-edit/pom.xml b/backend/sirius-web-domain-edit/pom.xml index a2196fe1f8..993e4d9d24 100644 --- a/backend/sirius-web-domain-edit/pom.xml +++ b/backend/sirius-web-domain-edit/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-domain-edit - 2021.12.10 + 2021.12.11 sirius-web-domain-edit Sirius Web Domain Definition DSL - Edit Support @@ -64,7 +64,7 @@ org.eclipse.sirius.web sirius-web-domain - 2021.12.10 + 2021.12.11 diff --git a/backend/sirius-web-domain/pom.xml b/backend/sirius-web-domain/pom.xml index 8ea66366a5..2fa69e7ff3 100644 --- a/backend/sirius-web-domain/pom.xml +++ b/backend/sirius-web-domain/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-domain - 2021.12.10 + 2021.12.11 sirius-web-domain Sirius Web Domain Definition DSL diff --git a/backend/sirius-web-emf/pom.xml b/backend/sirius-web-emf/pom.xml index c1a8aa66e8..40bc10b0e8 100644 --- a/backend/sirius-web-emf/pom.xml +++ b/backend/sirius-web-emf/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-emf - 2021.12.10 + 2021.12.11 sirius-web-emf Sirius Web EMF @@ -66,52 +66,52 @@ org.eclipse.sirius.web sirius-web-spring-graphql-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-diagrams - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-forms - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-trees - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-validation - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-compatibility - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-interpreter - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-domain - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-view - 2021.12.10 + 2021.12.11 org.eclipse.emf @@ -160,13 +160,13 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-forms-tests/pom.xml b/backend/sirius-web-forms-tests/pom.xml index 4d24619dab..0490350283 100644 --- a/backend/sirius-web-forms-tests/pom.xml +++ b/backend/sirius-web-forms-tests/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-forms-tests - 2021.12.10 + 2021.12.11 sirius-web-forms-tests Sirius Web Forms Tests @@ -42,7 +42,7 @@ org.eclipse.sirius.web sirius-web-forms - 2021.12.10 + 2021.12.11 org.assertj diff --git a/backend/sirius-web-forms/pom.xml b/backend/sirius-web-forms/pom.xml index b298df488c..fae10762aa 100644 --- a/backend/sirius-web-forms/pom.xml +++ b/backend/sirius-web-forms/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-forms - 2021.12.10 + 2021.12.11 sirius-web-forms Sirius Web Forms @@ -46,17 +46,17 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-components - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 org.springframework.boot @@ -66,7 +66,7 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-graphiql/pom.xml b/backend/sirius-web-graphiql/pom.xml index 2671b5db5d..ce043d13ee 100644 --- a/backend/sirius-web-graphiql/pom.xml +++ b/backend/sirius-web-graphiql/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-graphiql - 2021.12.10 + 2021.12.11 sirius-web-graphiql Sirius Web Graphiql support. This project contribute a GraphQL query tool on the /graphiql/index.html URI. diff --git a/backend/sirius-web-graphql-utils/pom.xml b/backend/sirius-web-graphql-utils/pom.xml index 0d2ab5f62b..0a189ce80c 100644 --- a/backend/sirius-web-graphql-utils/pom.xml +++ b/backend/sirius-web-graphql-utils/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-graphql-utils - 2021.12.10 + 2021.12.11 sirius-web-graphql-utils Sirius Web GraphQL Utils @@ -43,7 +43,7 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 com.graphql-java @@ -53,7 +53,7 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-graphql-voyager/pom.xml b/backend/sirius-web-graphql-voyager/pom.xml index f7e820c2d4..065863d7e8 100644 --- a/backend/sirius-web-graphql-voyager/pom.xml +++ b/backend/sirius-web-graphql-voyager/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-graphql-voyager - 2021.12.10 + 2021.12.11 sirius-web-graphql-voyager Sirius Web Graph Voyager. This project contribute a GraphQL API UX thanks to the https://github.com/APIs-guru/graphql-voyager project. diff --git a/backend/sirius-web-interpreter/pom.xml b/backend/sirius-web-interpreter/pom.xml index a96eebb010..bf05620026 100644 --- a/backend/sirius-web-interpreter/pom.xml +++ b/backend/sirius-web-interpreter/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-interpreter - 2021.12.10 + 2021.12.11 sirius-web-interpreter Sirius Web Intepreter diff --git a/backend/sirius-web-representations/pom.xml b/backend/sirius-web-representations/pom.xml index 12f9963dd2..3dfa21bb69 100644 --- a/backend/sirius-web-representations/pom.xml +++ b/backend/sirius-web-representations/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 sirius-web-representations Sirius Web Representations @@ -42,7 +42,7 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 diff --git a/backend/sirius-web-selection/pom.xml b/backend/sirius-web-selection/pom.xml index 1e286b29dd..3fa7a8d8fc 100644 --- a/backend/sirius-web-selection/pom.xml +++ b/backend/sirius-web-selection/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-selection - 2021.12.10 + 2021.12.11 sirius-web-selection Sirius Web Selection @@ -42,17 +42,17 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-spring-collaborative-diagrams/pom.xml b/backend/sirius-web-spring-collaborative-diagrams/pom.xml index d98b8e88b4..cf73eb1a9e 100644 --- a/backend/sirius-web-spring-collaborative-diagrams/pom.xml +++ b/backend/sirius-web-spring-collaborative-diagrams/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-diagrams - 2021.12.10 + 2021.12.11 sirius-web-spring-collaborative-diagrams Sirius Web Spring Collaborative Diagrams @@ -50,39 +50,39 @@ org.eclipse.sirius.web sirius-web-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-diagrams - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-diagrams-layout - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-diagrams-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-spring-collaborative-forms/pom.xml b/backend/sirius-web-spring-collaborative-forms/pom.xml index 8b8f66bf2c..9a544097ab 100644 --- a/backend/sirius-web-spring-collaborative-forms/pom.xml +++ b/backend/sirius-web-spring-collaborative-forms/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-forms - 2021.12.10 + 2021.12.11 sirius-web-spring-collaborative-forms Sirius Web Spring Collaborative Forms @@ -50,28 +50,28 @@ org.eclipse.sirius.web sirius-web-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-forms - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-spring-collaborative-selection/pom.xml b/backend/sirius-web-spring-collaborative-selection/pom.xml index e67320d61e..9a32fac7f2 100644 --- a/backend/sirius-web-spring-collaborative-selection/pom.xml +++ b/backend/sirius-web-spring-collaborative-selection/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-selection - 2021.12.10 + 2021.12.11 sirius-web-spring-collaborative-selection Sirius Web Spring Collaborative Selection @@ -43,7 +43,7 @@ org.eclipse.sirius.web sirius-web-selection - 2021.12.10 + 2021.12.11 org.springframework @@ -56,23 +56,23 @@ org.eclipse.sirius.web sirius-web-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-spring-collaborative-trees/pom.xml b/backend/sirius-web-spring-collaborative-trees/pom.xml index 80b8686c31..01a7161325 100644 --- a/backend/sirius-web-spring-collaborative-trees/pom.xml +++ b/backend/sirius-web-spring-collaborative-trees/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-trees - 2021.12.10 + 2021.12.11 sirius-web-spring-collaborative-trees Sirius Web Spring Collaborative Trees @@ -42,12 +42,12 @@ org.eclipse.sirius.web sirius-web-spring-collaborative - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-trees - 2021.12.10 + 2021.12.11 org.springframework @@ -68,13 +68,13 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-spring-collaborative-validation/pom.xml b/backend/sirius-web-spring-collaborative-validation/pom.xml index 6a3d203778..b4ccff85e5 100644 --- a/backend/sirius-web-spring-collaborative-validation/pom.xml +++ b/backend/sirius-web-spring-collaborative-validation/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative-validation - 2021.12.10 + 2021.12.11 sirius-web-spring-collaborative-validation Sirius Web Spring Collaborative Validation @@ -46,17 +46,17 @@ org.eclipse.sirius.web sirius-web-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-validation - 2021.12.10 + 2021.12.11 org.springframework.boot @@ -66,13 +66,13 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-spring-collaborative/pom.xml b/backend/sirius-web-spring-collaborative/pom.xml index 9ab7fdd7f6..b4ed49a60c 100644 --- a/backend/sirius-web-spring-collaborative/pom.xml +++ b/backend/sirius-web-spring-collaborative/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-collaborative - 2021.12.10 + 2021.12.11 sirius-web-spring-collaborative Sirius Web Spring Collaborative @@ -70,23 +70,23 @@ org.eclipse.sirius.web sirius-web-core-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-spring-graphql-api/pom.xml b/backend/sirius-web-spring-graphql-api/pom.xml index 5d913901d0..7b26f0fbb7 100644 --- a/backend/sirius-web-spring-graphql-api/pom.xml +++ b/backend/sirius-web-spring-graphql-api/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-graphql-api - 2021.12.10 + 2021.12.11 sirius-web-spring-graphql-api Sirius Web Spring GraphQL API @@ -48,7 +48,7 @@ org.eclipse.sirius.web sirius-web-annotations-spring - 2021.12.10 + 2021.12.11 diff --git a/backend/sirius-web-spring-graphql/pom.xml b/backend/sirius-web-spring-graphql/pom.xml index f02f0933f5..f5002a9609 100644 --- a/backend/sirius-web-spring-graphql/pom.xml +++ b/backend/sirius-web-spring-graphql/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-graphql - 2021.12.10 + 2021.12.11 sirius-web-spring-graphql Sirius Web Spring GraphQL @@ -68,28 +68,28 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-graphql-utils - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-graphql-api - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-spring-starter/pom.xml b/backend/sirius-web-spring-starter/pom.xml index e1f20d3552..5ea1914028 100644 --- a/backend/sirius-web-spring-starter/pom.xml +++ b/backend/sirius-web-spring-starter/pom.xml @@ -15,7 +15,7 @@ org.eclipse.sirius.web sirius-web-spring-starter - 2021.12.10 + 2021.12.11 sirius-web-spring-starter Sirius Web Spring Starter @@ -55,52 +55,52 @@ org.eclipse.sirius.web sirius-web-spring-graphql - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-diagrams-layout - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-diagrams - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-forms - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-selection - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-trees - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-spring-collaborative-validation - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-emf - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-compatibility - 2021.12.10 + 2021.12.11 diff --git a/backend/sirius-web-spring-tests/pom.xml b/backend/sirius-web-spring-tests/pom.xml index 876ced02fb..b2f1d5b838 100644 --- a/backend/sirius-web-spring-tests/pom.xml +++ b/backend/sirius-web-spring-tests/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-spring-tests - 2021.12.10 + 2021.12.11 sirius-web-spring-tests Sirius Web Spring Tests @@ -46,7 +46,7 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 org.springframework diff --git a/backend/sirius-web-tests/pom.xml b/backend/sirius-web-tests/pom.xml index ca88259fda..7cdf792352 100644 --- a/backend/sirius-web-tests/pom.xml +++ b/backend/sirius-web-tests/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 sirius-web-tests Sirius Web Tests @@ -51,7 +51,7 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 diff --git a/backend/sirius-web-trees/pom.xml b/backend/sirius-web-trees/pom.xml index 91758a0dda..1b7fd5d2fb 100644 --- a/backend/sirius-web-trees/pom.xml +++ b/backend/sirius-web-trees/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-trees - 2021.12.10 + 2021.12.11 sirius-web-trees Sirius Web Trees @@ -42,17 +42,17 @@ org.eclipse.sirius.web sirius-web-annotations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-validation/pom.xml b/backend/sirius-web-validation/pom.xml index 861168ff3e..4e94fced16 100644 --- a/backend/sirius-web-validation/pom.xml +++ b/backend/sirius-web-validation/pom.xml @@ -22,7 +22,7 @@ org.eclipse.sirius.web sirius-web-validation - 2021.12.10 + 2021.12.11 sirius-web-validation Sirius Web Validation @@ -47,17 +47,17 @@ org.eclipse.sirius.web sirius-web-components - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-representations - 2021.12.10 + 2021.12.11 org.eclipse.sirius.web sirius-web-tests - 2021.12.10 + 2021.12.11 test diff --git a/backend/sirius-web-view-edit/pom.xml b/backend/sirius-web-view-edit/pom.xml index 79fc9383d0..9900e376ad 100644 --- a/backend/sirius-web-view-edit/pom.xml +++ b/backend/sirius-web-view-edit/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-view-edit - 2021.12.10 + 2021.12.11 sirius-web-view-edit Sirius Web View Definition DSL - Edit Support @@ -64,7 +64,7 @@ org.eclipse.sirius.web sirius-web-view - 2021.12.10 + 2021.12.11 diff --git a/backend/sirius-web-view/pom.xml b/backend/sirius-web-view/pom.xml index c7633fcb97..55ac211ec3 100644 --- a/backend/sirius-web-view/pom.xml +++ b/backend/sirius-web-view/pom.xml @@ -23,7 +23,7 @@ org.eclipse.sirius.web sirius-web-view - 2021.12.10 + 2021.12.11 sirius-web-view Sirius Web View Definition DSL diff --git a/frontend/package-lock.json b/frontend/package-lock.json index e4f8b2cf3c..dd883c44ba 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "@eclipse-sirius/sirius-components", - "version": "2021.12.10", + "version": "2021.12.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@eclipse-sirius/sirius-components", - "version": "2021.12.10", + "version": "2021.12.11", "license": "EPL-2.0", "dependencies": { "uuid": "8.3.2" diff --git a/frontend/package.json b/frontend/package.json index e71cd50d8e..a1ea6fd691 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "@eclipse-sirius/sirius-components", - "version": "2021.12.10", + "version": "2021.12.11", "author": "Eclipse Sirius", "license": "EPL-2.0", "description": "Reusable components used to build the Sirius Web frontend",