UI: Optimize creating subjects hierarchy in Models Tree (#3671)

iTwin · May 25, 2022 · 9ebf7af · 9ebf7af
1 parent b8d805f
commit 9ebf7af
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/...win/appui-react/ui-models-tree-optimize-creating-subjects-hierarchy_2022-05-24-12-58.json b/...win/appui-react/ui-models-tree-optimize-creating-subjects-hierarchy_2022-05-24-12-58.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/appui-react",
+      "comment": "Models Tree: Optimize creating subjects hierarchy",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/appui-react"
+}
diff --git a/...ts/presentation_rules/VisibilityWidget.ModelsTree-GroupedByClass.PresentationRuleSet.json b/...ts/presentation_rules/VisibilityWidget.ModelsTree-GroupedByClass.PresentationRuleSet.json
@@ -121,6 +121,7 @@
             }
           ],
           "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") = NULL AND json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") = NULL AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "hasChildren": "Always",
           "hideIfNoChildren": true,
           "groupByClass": false,
           "groupByLabel": false
@@ -152,6 +153,7 @@
             }
           ],
           "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND (json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") <> NULL OR json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") <> NULL) AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "hasChildren": "Always",
           "hideNodesInHierarchy": true,
           "groupByClass": false,
           "groupByLabel": false

diff --git a/...n-test-app/assets/presentation_rules/VisibilityWidget.ModelsTree.PresentationRuleSet.json b/...n-test-app/assets/presentation_rules/VisibilityWidget.ModelsTree.PresentationRuleSet.json
@@ -121,6 +121,7 @@
             }
           ],
           "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") = NULL AND json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") = NULL AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "hasChildren": "Always",
           "hideIfNoChildren": true,
           "groupByClass": false,
           "groupByLabel": false
@@ -152,6 +153,7 @@
             }
           ],
           "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND (json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") <> NULL OR json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") <> NULL) AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "hasChildren": "Always",
           "hideNodesInHierarchy": true,
           "groupByClass": false,
           "groupByLabel": false

diff --git a/ui/appui-react/src/appui-react/imodel-components/models-tree/Hierarchy.GroupedByClass.json b/ui/appui-react/src/appui-react/imodel-components/models-tree/Hierarchy.GroupedByClass.json
@@ -121,6 +121,7 @@
             }
           ],
           "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") = NULL AND json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") = NULL AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "hasChildren": "Always",
           "hideIfNoChildren": true,
           "groupByClass": false,
           "groupByLabel": false
@@ -152,6 +153,7 @@
             }
           ],
           "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND (json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") <> NULL OR json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") <> NULL) AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "hasChildren": "Always",
           "hideNodesInHierarchy": true,
           "groupByClass": false,
           "groupByLabel": false

diff --git a/ui/appui-react/src/appui-react/imodel-components/models-tree/Hierarchy.json b/ui/appui-react/src/appui-react/imodel-components/models-tree/Hierarchy.json
@@ -121,6 +121,7 @@
             }
           ],
           "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") = NULL AND json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") = NULL AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "hasChildren": "Always",
           "hideIfNoChildren": true,
           "groupByClass": false,
           "groupByLabel": false
@@ -152,6 +153,7 @@
             }
           ],
           "instanceFilter": "(parent.ECInstanceId = partition.Parent.Id OR json_extract(parent.JsonProperties, \"$.Subject.Model.TargetPartition\") = printf(\"0x%x\", partition.ECInstanceId)) AND NOT this.IsPrivate AND (json_extract(partition.JsonProperties, \"$.PhysicalPartition.Model.Content\") <> NULL OR json_extract(partition.JsonProperties, \"$.GraphicalPartition3d.Model.Content\") <> NULL) AND this.HasRelatedInstance(\"BisCore:ModelContainsElements\", \"Forward\", \"BisCore:GeometricElement3d\")",
+          "hasChildren": "Always",
           "hideNodesInHierarchy": true,
           "groupByClass": false,
           "groupByLabel": false