[5715] Add hasChildrenExpression to RowDescription in table

Bug: #5715
Signed-off-by: Florian ROUËNÉ <[email protected]>

Author: frouene

CHANGELOG.adoc

@@ -32,6 +32,7 @@ The code responsible for the import has been refactor with:
 * `ProjectImporter` no longer exist. Its code has been split among `IProjectContentImportParticipant`.
 
 
+- https://github.com/eclipse-sirius/sirius-web/issues/5715[#5715] [table] In table, `RowDescription` must now declare a `hasChildrenExpression` if `subRows` is enabled.
 
 === Dependency update
 
@@ -59,7 +60,7 @@ Use `org.eclipse.emf.ecore.util.ECrossReferenceAdapter.getCrossReferenceAdapter(
 === Improvements
 
 - https://github.com/eclipse-sirius/sirius-web/issues/5608[#5608] [diagram] Hide empty sections on the palette
-
+- https://github.com/eclipse-sirius/sirius-web/issues/5715[#5715] [table] Add `hasChildrenExpression` to `RowDescription` to block the expand action on rows that have no children
 
 
 == 2025.10.0

packages/formdescriptioneditors/backend/sirius-components-collaborative-formdescriptioneditors-widget-table/src/main/java/org/eclipse/sirius/components/formdescriptioneditors/widget/table/TableWidgetPreviewConverterProvider.java

@@ -59,6 +59,7 @@ private TableWidgetDescription getTableWidgetDescription(org.eclipse.sirius.comp
                 .isResizablePredicate(vm -> false)
                 .initialHeightProvider(vm -> -1)
                 .depthLevelProvider(vm -> 0)
+                .hasChildrenProvider(vm -> false)
                 .build();
         var tableDescription = TableDescription.newTableDescription(UUID.randomUUID().toString())
                 .label("")

packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/table/PackageTableRepresentationDescriptionProvider.java

@@ -107,6 +107,7 @@ public List<IRepresentationDescription> getRepresentationDescriptions(IEditingCo
                 .isResizablePredicate(variableManager -> true)
                 .initialHeightProvider(variableManager -> 53)
                 .depthLevelProvider(this::getSemanticElementDepthLevel)
+                .hasChildrenProvider(this::hasChildren)
                 .build();
 
         var tableDescription = TableDescription.newTableDescription(TABLE_DESCRIPTION_ID)
@@ -203,6 +204,18 @@ private boolean hasExpandedParent(EObject eObject, List<String> expandedIds) {
         return true;
     }
 
+    private boolean hasChildren(VariableManager variableManager) {
+        return variableManager.get(VariableManager.SELF, EObject.class)
+                .map(eObject -> {
+                    if (eObject instanceof Package) {
+                        return false;
+                    } else {
+                        return !eObject.eContents().isEmpty();
+                    }
+                })
+                .orElse(false);
+    }
+
     private Integer getSemanticElementDepthLevel(VariableManager variableManager) {
         return variableManager.get(VariableManager.SELF, EObject.class)
                 .map(this::getEObjectDepthLevel)

packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/representations/table/ProjectTableRepresentationDescriptionProvider.java

@@ -79,6 +79,7 @@ public List<IRepresentationDescription> getRepresentationDescriptions(IEditingCo
                 .isResizablePredicate(variableManager -> false)
                 .initialHeightProvider(variableManager -> -1)
                 .depthLevelProvider(variableManager -> 0)
+                .hasChildrenProvider(variableManager -> false)
                 .build();
 
         var tableDescription = TableDescription.newTableDescription(TABLE_DESCRIPTION_ID)

packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/tables/PapayaViewTableControllerIntegrationTests.java

@@ -254,6 +254,30 @@ public void givenViewTableWithSubElementsWhenSubscriptionIsCreatedThenTheDepthLe
                 .verify(Duration.ofSeconds(10));
     }
 
+    @Test
+    @GivenSiriusWebServer
+    @DisplayName("Given a view table description with sub elements, when a subscription is created, then hasChildren is correctly set")
+    public void givenViewTableWithSubElementsWhenSubscriptionIsCreatedThenHasChildrenIsCorrectlySet() {
+        var flux = this.givenSubscriptionToViewTableRepresentation();
+
+        Consumer<Object> tableContentConsumer = assertRefreshedTableThat(table -> {
+            assertThat(table).isNotNull();
+            assertThat(table.isEnableSubRows()).isTrue();
+            assertThat(table.getLines()).hasSize(6);
+            assertThat(table.getLines().get(0).isHasChildren()).isTrue();
+            assertThat(table.getLines().get(1).isHasChildren()).isFalse();
+            assertThat(table.getLines().get(2).isHasChildren()).isFalse();
+            assertThat(table.getLines().get(3).isHasChildren()).isTrue();
+            assertThat(table.getLines().get(4).isHasChildren()).isTrue();
+            assertThat(table.getLines().get(5).isHasChildren()).isTrue();
+        });
+
+        StepVerifier.create(flux)
+                .consumeNextWith(tableContentConsumer)
+                .thenCancel()
+                .verify(Duration.ofSeconds(10));
+    }
+
     @Test
     @GivenSiriusWebServer
     @DisplayName("Given a view table description with Failure element, when hide-failure row filter is activated, then the failure row is not in table")

packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/forms/FormWithTableDescriptionProvider.java

@@ -146,6 +146,7 @@ private TableWidgetDescription getTableWidgetDescription() {
                 .isResizablePredicate(variableManager -> false)
                 .initialHeightProvider(variableManager -> 0)
                 .depthLevelProvider(variableManager -> 0)
+                .hasChildrenProvider(variableManager -> false)
                 .build();
 
         TableDescription tableDescription = TableDescription.newTableDescription(FORM_WITH_TABLE_ID)

packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/tables/ViewTableDescriptionProvider.java

@@ -114,6 +114,7 @@ private TableDescription createTableDescription() {
                 .contextMenuEntries(contextMenuEntry)
                 .depthLevelExpression(
                         "aql:if self.oclIsKindOf(papaya::Type) then 0 else if self.oclIsKindOf(papaya::Operation) then 1 else if self.oclIsKindOf(papaya::Parameter) then 2 else endif endif endif")
+                .hasChildrenExpression("aql:self.eContents()->filter({papaya::Type | papaya::Operation | papaya::Parameter})->size() == 0")
                 .build();
 
         var setNameOperation = new ViewBuilders().newSetValue()

packages/sirius-web/frontend/sirius-web-application/src/extension/TableWidgetDocumentTransform.ts

@@ -135,6 +135,7 @@ export const tableWidgetDocumentTransform = new DocumentTransform((document) =>
                   fieldBuilder('height'),
                   fieldBuilder('isResizable'),
                   fieldBuilder('depthLevel'),
+                  fieldBuilder('hasChildren'),
                   structuredFieldBuilder('cells', [
                     fieldBuilder('id'),
                     fieldBuilder('targetObjectId'),

packages/tables/backend/sirius-components-collaborative-tables/src/main/resources/schema/table.graphqls

@@ -93,6 +93,7 @@ type Line {
   height: Int!
   isResizable: Boolean!
   depthLevel: Int!
+  hasChildren: Boolean!
 }
 
 type PaginationData {

packages/tables/backend/sirius-components-tables/src/main/java/org/eclipse/sirius/components/tables/Line.java

@@ -49,10 +49,16 @@ public final class Line {
 
     private int depthLevel;
 
+    private boolean hasChildren;
+
     private Line() {
         // Prevent instantiation
     }
 
+    public static Builder newLine(UUID id) {
+        return new Builder(id);
+    }
+
     public UUID getId() {
         return this.id;
     }
@@ -97,8 +103,8 @@ public int getDepthLevel() {
         return this.depthLevel;
     }
 
-    public static Builder newLine(UUID id) {
-        return new Builder(id);
+    public boolean isHasChildren() {
+        return this.hasChildren;
     }
 
     @Override
@@ -137,6 +143,8 @@ public static final class Builder {
 
         private int depthLevel;
 
+        private boolean hasChildren;
+
         private Builder(UUID id) {
             this.id = Objects.requireNonNull(id);
         }
@@ -191,6 +199,11 @@ public Builder depthLevel(int depthLevel) {
             return this;
         }
 
+        public Builder hasChildren(boolean hasChildren) {
+            this.hasChildren = hasChildren;
+            return this;
+        }
+
         public Line build() {
             Line line = new Line();
             line.id = Objects.requireNonNull(this.id);
@@ -204,6 +217,7 @@ public Line build() {
             line.height = this.height;
             line.resizable = this.resizable;
             line.depthLevel = this.depthLevel;
+            line.hasChildren = this.hasChildren;
             return line;
         }
     }