@itwin/tree-widget-react 4.0.0-alpha.2 → 4.0.0-alpha.20

package/lib/esm/tree-widget-react/components/trees/models-tree/ModelsTreeDefinition.js

@@ -2,19 +2,23 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-import { bufferCount, defer, from, lastValueFrom, map, merge, mergeAll, mergeMap, reduce, switchMap } from "rxjs";
+import { bufferCount, defaultIfEmpty, defer, firstValueFrom, forkJoin, from, fromEvent, identity, lastValueFrom, map, merge, mergeAll, mergeMap, reduce, switchMap, takeUntil, toArray, } from "rxjs";
+import { Guid } from "@itwin/core-bentley";
 import { IModel } from "@itwin/core-common";
-import { createNodesQueryClauseFactory, createPredicateBasedHierarchyDefinition, NodeSelectClauseColumnNames, ProcessedHierarchyNode, } from "@itwin/presentation-hierarchies";
+import { createNodesQueryClauseFactory, createPredicateBasedHierarchyDefinition, HierarchyFilteringPath, NodeSelectClauseColumnNames, ProcessedHierarchyNode, } from "@itwin/presentation-hierarchies";
 import { createBisInstanceLabelSelectClauseFactory, ECSql } from "@itwin/presentation-shared";
-import { collect } from "../common/Rxjs.js";
+import { CLASS_NAME_Element, CLASS_NAME_GeometricElement3d, CLASS_NAME_GeometricModel3d, CLASS_NAME_InformationPartitionElement, CLASS_NAME_ISubModeledElement, CLASS_NAME_Model, CLASS_NAME_SpatialCategory, CLASS_NAME_Subject, } from "../common/internal/ClassNameDefinitions.js";
+import { collect } from "../common/internal/Rxjs.js";
+import { createIdsSelector, getOptimalBatchSize, groupingNodeHasFilterTargets, parseIdsSelectorResult, releaseMainThreadOnItemsCount, } from "../common/internal/Utils.js";
 import { FilterLimitExceededError } from "../common/TreeErrors.js";
-import { createIdsSelector, parseIdsSelectorResult } from "../common/Utils.js";
-import { releaseMainThreadOnItemsCount } from "./Utils.js";
 const MAX_FILTERING_INSTANCE_KEY_COUNT = 100;
+/** @internal */
 export const defaultHierarchyConfiguration = {
     elementClassGrouping: "enable",
-    elementClassSpecification: "BisCore.GeometricElement3d",
+    elementClassSpecification: CLASS_NAME_GeometricElement3d,
     showEmptyModels: false,
+    hideRootSubject: false,
+    hierarchyLevelFiltering: "enable",
 };
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 export var ModelsTreeInstanceKeyPathsProps;
@@ -24,54 +28,68 @@ export var ModelsTreeInstanceKeyPathsProps;
     }
     ModelsTreeInstanceKeyPathsProps.isLabelProps = isLabelProps;
 })(ModelsTreeInstanceKeyPathsProps || (ModelsTreeInstanceKeyPathsProps = {}));
+/** @internal */
 export class ModelsTreeDefinition {
+    #impl;
+    #idsCache;
+    #hierarchyConfig;
+    #selectQueryFactory;
+    #nodeLabelSelectClauseFactory;
+    #queryExecutor;
+    #isSupported;
+    static #componentName = "ModelsTreeDefinition";
+    #componentId;
     constructor(props) {
-        this._impl = createPredicateBasedHierarchyDefinition({
+        this.#impl = createPredicateBasedHierarchyDefinition({
             classHierarchyInspector: props.imodelAccess,
             hierarchy: {
-                rootNodes: async (requestProps) => this.createSubjectChildrenQuery({ ...requestProps, parentNodeInstanceIds: [IModel.rootSubjectId] }),
+                rootNodes: async (requestProps) => this.createSubjectChildrenQuery({ ...requestProps, parentNodeInstanceIds: this.#hierarchyConfig.hideRootSubject ? [IModel.rootSubjectId] : [] }),
                 childNodes: [
                     {
-                        parentInstancesNodePredicate: "BisCore.Subject",
+                        parentInstancesNodePredicate: CLASS_NAME_Subject,
                         definitions: async (requestProps) => this.createSubjectChildrenQuery(requestProps),
                     },
                     {
-                        parentInstancesNodePredicate: "BisCore.ISubModeledElement",
+                        parentInstancesNodePredicate: CLASS_NAME_ISubModeledElement,
                         definitions: async (requestProps) => this.createISubModeledElementChildrenQuery(requestProps),
                     },
                     {
-                        parentInstancesNodePredicate: "BisCore.GeometricModel3d",
+                        parentInstancesNodePredicate: CLASS_NAME_GeometricModel3d,
                         definitions: async (requestProps) => this.createGeometricModel3dChildrenQuery(requestProps),
                     },
                     {
-                        parentInstancesNodePredicate: "BisCore.SpatialCategory",
+                        parentInstancesNodePredicate: CLASS_NAME_SpatialCategory,
                         definitions: async (requestProps) => this.createSpatialCategoryChildrenQuery(requestProps),
                     },
                     {
-                        parentInstancesNodePredicate: "BisCore.GeometricElement3d",
+                        parentInstancesNodePredicate: CLASS_NAME_GeometricElement3d,
                         definitions: async (requestProps) => this.createGeometricElement3dChildrenQuery(requestProps),
                     },
                 ],
             },
         });
-        this._idsCache = props.idsCache;
-        this._queryExecutor = props.imodelAccess;
-        this._hierarchyConfig = props.hierarchyConfig;
-        this._nodeLabelSelectClauseFactory = createBisInstanceLabelSelectClauseFactory({ classHierarchyInspector: props.imodelAccess });
-        this._selectQueryFactory = createNodesQueryClauseFactory({
+        this.#componentId = props.componentId ?? Guid.createValue();
+        this.#idsCache = props.idsCache;
+        this.#queryExecutor = props.imodelAccess;
+        this.#hierarchyConfig = props.hierarchyConfig;
+        this.#nodeLabelSelectClauseFactory = createBisInstanceLabelSelectClauseFactory({ classHierarchyInspector: props.imodelAccess });
+        this.#selectQueryFactory = createNodesQueryClauseFactory({
             imodelAccess: props.imodelAccess,
-            instanceLabelSelectClauseFactory: this._nodeLabelSelectClauseFactory,
+            instanceLabelSelectClauseFactory: this.#nodeLabelSelectClauseFactory,
         });
     }
     async postProcessNode(node) {
         if (ProcessedHierarchyNode.isGroupingNode(node)) {
+            const { hasFilterTargetAncestor, hasDirectNonFilteredTargets } = groupingNodeHasFilterTargets(node.children);
             return {
                 ...node,
-                label: this._hierarchyConfig.elementClassGrouping === "enableWithCounts" ? `${node.label} (${node.children.length})` : node.label,
+                label: this.#hierarchyConfig.elementClassGrouping === "enableWithCounts" ? `${node.label} (${node.children.length})` : node.label,
                 extendedData: {
                     ...node.extendedData,
                     // add `modelId` and `categoryId` from the first grouped element
                     ...node.children[0].extendedData,
+                    ...(hasDirectNonFilteredTargets ? { hasDirectNonFilteredTargets } : {}),
+                    ...(hasFilterTargetAncestor ? { hasFilterTargetAncestor } : {}),
                     // `imageId` is assigned to instance nodes at query time, but grouping ones need to
                     // be handled during post-processing
                     imageId: "icon-ec-class",
@@ -81,53 +99,56 @@ export class ModelsTreeDefinition {
         return node;
     }
     async defineHierarchyLevel(props) {
-        if (this._isSupported === undefined) {
-            this._isSupported = this.isSupported();
+        if (this.#isSupported === undefined) {
+            this.#isSupported = this.isSupported();
         }
-        if ((await this._isSupported) === false) {
+        if ((await this.#isSupported) === false) {
             return [];
         }
-        return this._impl.defineHierarchyLevel(props);
+        return this.#impl.defineHierarchyLevel(props);
     }
-    async createSubjectChildrenQuery({ parentNodeInstanceIds: subjectIds, instanceFilter, }) {
+    async createSubjectChildrenQuery({ parentNodeInstanceIds: parentSubjectIds, instanceFilter, }) {
         const [subjectFilterClauses, modelFilterClauses] = await Promise.all([
-            this._selectQueryFactory.createFilterClauses({
+            this.#selectQueryFactory.createFilterClauses({
                 filter: instanceFilter,
-                contentClass: { fullName: "BisCore.Subject", alias: "this" },
+                contentClass: { fullName: CLASS_NAME_Subject, alias: "this" },
             }),
-            this._selectQueryFactory.createFilterClauses({
+            this.#selectQueryFactory.createFilterClauses({
                 filter: instanceFilter,
-                contentClass: { fullName: "BisCore.GeometricModel3d", alias: "this" },
+                contentClass: { fullName: CLASS_NAME_GeometricModel3d, alias: "this" },
             }),
         ]);
-        const [childSubjectIds, childModelIds] = await Promise.all([
-            this._idsCache.getChildSubjectIds(subjectIds),
-            this._idsCache.getChildSubjectModelIds(subjectIds),
-        ]);
+        const { childSubjectIds, childModelIds } = parentSubjectIds.length
+            ? await firstValueFrom(forkJoin({
+                childSubjectIds: this.#idsCache.getChildSubjectIds(parentSubjectIds),
+                childModelIds: this.#idsCache.getChildSubjectModelIds(parentSubjectIds),
+            }))
+            : { childSubjectIds: [IModel.rootSubjectId], childModelIds: [] };
         const defs = new Array();
         childSubjectIds.length &&
             defs.push({
-                fullClassName: "BisCore.Subject",
+                fullClassName: CLASS_NAME_Subject,
                 query: {
                     ecsql: `
             SELECT
-              ${await this._selectQueryFactory.createSelectClause({
+              ${await this.#selectQueryFactory.createSelectClause({
                         ecClassId: { selector: "this.ECClassId" },
                         ecInstanceId: { selector: "this.ECInstanceId" },
                         nodeLabel: {
-                            selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
+                            selector: await this.#nodeLabelSelectClauseFactory.createSelectClause({
                                 classAlias: "this",
-                                className: "BisCore.Subject",
+                                className: CLASS_NAME_Subject,
                             }),
                         },
                         hideIfNoChildren: true,
                         hasChildren: { selector: `InVirtualSet(?, this.ECInstanceId)` },
                         grouping: { byLabel: { action: "merge", groupId: "subject" } },
                         extendedData: {
-                            imageId: "icon-folder",
+                            imageId: { selector: `IIF(this.ECInstanceId = ${IModel.rootSubjectId}, 'icon-imodel-hollow-2', 'icon-folder')` },
                             isSubject: true,
                         },
-                        supportsFiltering: true,
+                        autoExpand: { selector: `IIF(this.ECInstanceId = ${IModel.rootSubjectId}, true, false)` },
+                        supportsFiltering: this.supportsFiltering(),
                     })}
             FROM ${subjectFilterClauses.from} this
             ${subjectFilterClauses.joins}
@@ -136,26 +157,26 @@ export class ModelsTreeDefinition {
               ${subjectFilterClauses.where ? `AND ${subjectFilterClauses.where}` : ""}
           `,
                     bindings: [
-                        { type: "idset", value: await this._idsCache.getParentSubjectIds() },
+                        { type: "idset", value: await firstValueFrom(this.#idsCache.getParentSubjectIds()) },
                         ...childSubjectIds.map((id) => ({ type: "id", value: id })),
                     ],
                 },
             });
         childModelIds.length &&
             defs.push({
-                fullClassName: "BisCore.GeometricModel3d",
+                fullClassName: CLASS_NAME_GeometricModel3d,
                 query: {
                     ecsql: `
             SELECT model.ECInstanceId AS ECInstanceId, model.*
             FROM (
               SELECT
-                ${await this._selectQueryFactory.createSelectClause({
+                ${await this.#selectQueryFactory.createSelectClause({
                         ecClassId: { selector: "m.ECClassId" },
                         ecInstanceId: { selector: "m.ECInstanceId" },
                         nodeLabel: {
-                            selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
+                            selector: await this.#nodeLabelSelectClauseFactory.createSelectClause({
                                 classAlias: "partition",
-                                className: "BisCore.InformationPartitionElement",
+                                className: CLASS_NAME_InformationPartitionElement,
                             }),
                         },
                         hideNodeInHierarchy: {
@@ -169,12 +190,12 @@ export class ModelsTreeDefinition {
                       END
                     `,
                         },
-                        hasChildren: this._hierarchyConfig.showEmptyModels
+                        hasChildren: this.#hierarchyConfig.showEmptyModels
                             ? {
                                 selector: `
                           IFNULL((
                             SELECT 1
-                            FROM ${this._hierarchyConfig.elementClassSpecification} e
+                            FROM ${this.#hierarchyConfig.elementClassSpecification} e
                             WHERE e.Model.Id = m.ECInstanceId
                             LIMIT 1
                           ), 0)
@@ -185,10 +206,10 @@ export class ModelsTreeDefinition {
                             imageId: "icon-model",
                             isModel: true,
                         },
-                        supportsFiltering: true,
+                        supportsFiltering: this.supportsFiltering(),
                     })}
-              FROM Bis.GeometricModel3d m
-              JOIN bis.InformationPartitionElement [partition] ON [partition].ECInstanceId = m.ModeledElement.Id
+              FROM ${CLASS_NAME_GeometricModel3d} m
+              JOIN ${CLASS_NAME_InformationPartitionElement} [partition] ON [partition].ECInstanceId = m.ModeledElement.Id
               WHERE
                 m.ECInstanceId IN (${childModelIds.map(() => "?").join(",")})
             ) model
@@ -206,21 +227,21 @@ export class ModelsTreeDefinition {
         // hidden - the filter will get applied on the child hierarchy levels
         return [
             {
-                fullClassName: "BisCore.GeometricModel3d",
+                fullClassName: CLASS_NAME_GeometricModel3d,
                 query: {
                     ecsql: `
             SELECT
-              ${await this._selectQueryFactory.createSelectClause({
+              ${await this.#selectQueryFactory.createSelectClause({
                         ecClassId: { selector: "this.ECClassId" },
                         ecInstanceId: { selector: "this.ECInstanceId" },
-                        nodeLabel: "",
+                        nodeLabel: "", // doesn't matter - the node is always hidden
                         hideNodeInHierarchy: true,
                     })}
-            FROM BisCore.GeometricModel3d this
+            FROM ${CLASS_NAME_GeometricModel3d} this
             WHERE
               this.ModeledElement.Id IN (${elementIds.map(() => "?").join(",")})
               AND NOT this.IsPrivate
-              AND this.ECInstanceId IN (SELECT Model.Id FROM ${this._hierarchyConfig.elementClassSpecification})
+              AND this.ECInstanceId IN (SELECT Model.Id FROM ${this.#hierarchyConfig.elementClassSpecification})
           `,
                     bindings: [...elementIds.map((id) => ({ type: "id", value: id }))],
                 },
@@ -228,23 +249,23 @@ export class ModelsTreeDefinition {
         ];
     }
     async createGeometricModel3dChildrenQuery({ parentNodeInstanceIds: modelIds, instanceFilter, }) {
-        const instanceFilterClauses = await this._selectQueryFactory.createFilterClauses({
+        const instanceFilterClauses = await this.#selectQueryFactory.createFilterClauses({
             filter: instanceFilter,
-            contentClass: { fullName: "BisCore.SpatialCategory", alias: "this" },
+            contentClass: { fullName: CLASS_NAME_SpatialCategory, alias: "this" },
         });
         return [
             {
-                fullClassName: "BisCore.SpatialCategory",
+                fullClassName: CLASS_NAME_SpatialCategory,
                 query: {
                     ecsql: `
             SELECT
-              ${await this._selectQueryFactory.createSelectClause({
+              ${await this.#selectQueryFactory.createSelectClause({
                         ecClassId: { selector: "this.ECClassId" },
                         ecInstanceId: { selector: "this.ECInstanceId" },
                         nodeLabel: {
-                            selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
+                            selector: await this.#nodeLabelSelectClauseFactory.createSelectClause({
                                 classAlias: "this",
-                                className: "BisCore.SpatialCategory",
+                                className: CLASS_NAME_SpatialCategory,
                             }),
                         },
                         grouping: { byLabel: { action: "merge", groupId: "category" } },
@@ -254,14 +275,14 @@ export class ModelsTreeDefinition {
                             isCategory: true,
                             modelIds: { selector: createIdsSelector(modelIds) },
                         },
-                        supportsFiltering: true,
+                        supportsFiltering: this.supportsFiltering(),
                     })}
             FROM ${instanceFilterClauses.from} this
             ${instanceFilterClauses.joins}
             WHERE
               EXISTS (
                 SELECT 1
-                FROM ${this._hierarchyConfig.elementClassSpecification} element
+                FROM ${this.#hierarchyConfig.elementClassSpecification} element
                 WHERE
                   element.Model.Id IN (${modelIds.map(() => "?").join(",")})
                   AND element.Category.Id = +this.ECInstanceId
@@ -279,40 +300,43 @@ export class ModelsTreeDefinition {
         if (modelIds.length === 0) {
             throw new Error(`Invalid category node "${parentNode.label}" - missing model information.`);
         }
-        const instanceFilterClauses = await this._selectQueryFactory.createFilterClauses({
+        const instanceFilterClauses = await this.#selectQueryFactory.createFilterClauses({
             filter: instanceFilter,
-            contentClass: { fullName: this._hierarchyConfig.elementClassSpecification, alias: "this" },
+            contentClass: { fullName: this.#hierarchyConfig.elementClassSpecification, alias: "this" },
         });
+        const modeledElements = await firstValueFrom(from(modelIds).pipe(mergeMap((modelId) => this.#idsCache.getCategoriesModeledElements(modelId, categoryIds)), reduce((acc, foundModeledElements) => {
+            return acc.concat(foundModeledElements);
+        }, new Array())));
         return [
             {
-                fullClassName: this._hierarchyConfig.elementClassSpecification,
+                fullClassName: this.#hierarchyConfig.elementClassSpecification,
                 query: {
                     ecsql: `
             SELECT
-              ${await this._selectQueryFactory.createSelectClause({
+              ${await this.#selectQueryFactory.createSelectClause({
                         ecClassId: { selector: "this.ECClassId" },
                         ecInstanceId: { selector: "this.ECInstanceId" },
                         nodeLabel: {
-                            selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
+                            selector: await this.#nodeLabelSelectClauseFactory.createSelectClause({
                                 classAlias: "this",
-                                className: this._hierarchyConfig.elementClassSpecification,
+                                className: this.#hierarchyConfig.elementClassSpecification,
                             }),
                         },
                         grouping: {
-                            byClass: this._hierarchyConfig.elementClassGrouping !== "disable",
+                            byClass: this.#hierarchyConfig.elementClassGrouping !== "disable",
                         },
                         hasChildren: {
                             selector: `
-                    IFNULL((
-                      SELECT 1
-                      FROM (
-                        SELECT Parent.Id ParentId FROM ${this._hierarchyConfig.elementClassSpecification}
-                        UNION ALL
-                        SELECT ModeledElement.Id ParentId FROM bis.GeometricModel3d
-                      )
-                      WHERE ParentId = this.ECInstanceId
-                      LIMIT 1
-                    ), 0)
+                    IIF(
+                      ${modeledElements.length ? `this.ECInstanceId IN (${modeledElements.join(",")})` : `FALSE`},
+                      1,
+                      IFNULL((
+                        SELECT 1
+                        FROM ${this.#hierarchyConfig.elementClassSpecification} ce
+                        WHERE ce.Parent.Id = this.ECInstanceId
+                        LIMIT 1
+                      ), 0)
+                    )
                   `,
                         },
                         extendedData: {
@@ -320,7 +344,7 @@ export class ModelsTreeDefinition {
                             categoryId: { selector: "IdToHex(this.Category.Id)" },
                             imageId: "icon-item",
                         },
-                        supportsFiltering: true,
+                        supportsFiltering: this.supportsFiltering(),
                     })}
             FROM ${instanceFilterClauses.from} this
             ${instanceFilterClauses.joins}
@@ -336,38 +360,35 @@ export class ModelsTreeDefinition {
         ];
     }
     async createGeometricElement3dChildrenQuery({ parentNodeInstanceIds: elementIds, instanceFilter, }) {
-        const instanceFilterClauses = await this._selectQueryFactory.createFilterClauses({
+        const instanceFilterClauses = await this.#selectQueryFactory.createFilterClauses({
             filter: instanceFilter,
-            contentClass: { fullName: this._hierarchyConfig.elementClassSpecification, alias: "this" },
+            contentClass: { fullName: this.#hierarchyConfig.elementClassSpecification, alias: "this" },
         });
         return [
             {
-                fullClassName: this._hierarchyConfig.elementClassSpecification,
+                fullClassName: this.#hierarchyConfig.elementClassSpecification,
                 query: {
                     ecsql: `
             SELECT
-              ${await this._selectQueryFactory.createSelectClause({
+              ${await this.#selectQueryFactory.createSelectClause({
                         ecClassId: { selector: "this.ECClassId" },
                         ecInstanceId: { selector: "this.ECInstanceId" },
                         nodeLabel: {
-                            selector: await this._nodeLabelSelectClauseFactory.createSelectClause({
+                            selector: await this.#nodeLabelSelectClauseFactory.createSelectClause({
                                 classAlias: "this",
-                                className: this._hierarchyConfig.elementClassSpecification,
+                                className: this.#hierarchyConfig.elementClassSpecification,
                             }),
                         },
                         grouping: {
-                            byClass: this._hierarchyConfig.elementClassGrouping !== "disable",
+                            byClass: this.#hierarchyConfig.elementClassGrouping !== "disable",
                         },
                         hasChildren: {
                             selector: `
                     IFNULL((
                       SELECT 1
-                      FROM (
-                        SELECT Parent.Id ParentId FROM ${this._hierarchyConfig.elementClassSpecification}
-                        UNION ALL
-                        SELECT ModeledElement.Id ParentId FROM bis.GeometricModel3d
-                      )
-                      WHERE ParentId = this.ECInstanceId
+                      FROM ${this.#hierarchyConfig.elementClassSpecification} ce
+                      JOIN ${CLASS_NAME_Model} m ON ce.Model.Id = m.ECInstanceId
+                      WHERE ce.Parent.Id = this.ECInstanceId OR (ce.Model.Id = this.ECInstanceId AND m.IsPrivate = false)
                       LIMIT 1
                     ), 0)
                   `,
@@ -377,7 +398,7 @@ export class ModelsTreeDefinition {
                             categoryId: { selector: "IdToHex(this.Category.Id)" },
                             imageId: "icon-item",
                         },
-                        supportsFiltering: true,
+                        supportsFiltering: this.supportsFiltering(),
                     })}
             FROM ${instanceFilterClauses.from} this
             ${instanceFilterClauses.joins}
@@ -391,16 +412,22 @@ export class ModelsTreeDefinition {
         ];
     }
     static async createInstanceKeyPaths(props) {
-        if (ModelsTreeInstanceKeyPathsProps.isLabelProps(props)) {
-            const labelsFactory = createBisInstanceLabelSelectClauseFactory({ classHierarchyInspector: props.imodelAccess });
-            return createInstanceKeyPathsFromInstanceLabel({ ...props, labelsFactory });
-        }
-        return createInstanceKeyPathsFromTargetItems(props);
+        return lastValueFrom(defer(() => {
+            const componentInfo = { componentId: props.componentId ?? Guid.createValue(), componentName: this.#componentName };
+            if (ModelsTreeInstanceKeyPathsProps.isLabelProps(props)) {
+                const labelsFactory = createBisInstanceLabelSelectClauseFactory({ classHierarchyInspector: props.imodelAccess });
+                return createInstanceKeyPathsFromInstanceLabelObs({ ...props, ...componentInfo, labelsFactory });
+            }
+            return createInstanceKeyPathsFromTargetItemsObs({ ...props, ...componentInfo });
+        }).pipe(props.abortSignal ? takeUntil(fromEvent(props.abortSignal, "abort")) : identity, defaultIfEmpty([])));
+    }
+    supportsFiltering() {
+        return this.#hierarchyConfig.hierarchyLevelFiltering === "enable";
     }
     async isSupported() {
-        const [schemaName, className] = this._hierarchyConfig.elementClassSpecification.split(/[\.:]/);
+        const [schemaName, className] = this.#hierarchyConfig.elementClassSpecification.split(/[\.:]/);
         if (!schemaName || !className) {
-            throw new Error(`Provided class specification ${this._hierarchyConfig.elementClassSpecification} should be in format {SchemaName}:{ClassName} or {SchemaName}.{ClassName}`);
+            throw new Error(`Provided class specification ${this.#hierarchyConfig.elementClassSpecification} should be in format {SchemaName}:{ClassName} or {SchemaName}.{ClassName}`);
         }
         const query = {
             ecsql: `
@@ -414,13 +441,16 @@ export class ModelsTreeDefinition {
                 { type: "string", value: className },
             ],
         };
-        for await (const _row of this._queryExecutor.createQueryReader(query)) {
+        for await (const _row of this.#queryExecutor.createQueryReader(query, {
+            restartToken: `${ModelsTreeDefinition.#componentName}/${this.#componentId}/is-class-supported`,
+        })) {
             return true;
         }
         return false;
     }
 }
-function createGeometricElementInstanceKeyPaths(imodelAccess, idsCache, hierarchyConfig, targetItems) {
+function createGeometricElementInstanceKeyPaths(props) {
+    const { targetItems, chunkIndex, componentId, componentName, hierarchyConfig, idsCache, imodelAccess } = props;
     const elementIds = targetItems.filter((info) => typeof info === "string");
     const groupInfos = targetItems.filter((info) => typeof info !== "string");
     const separator = ";";
@@ -455,8 +485,8 @@ function createGeometricElementInstanceKeyPaths(imodelAccess, idsCache, hierarch
           )
 
         FROM InstanceElementsWithClassGroupingNodes e
-         LEFT JOIN bis.GeometricModel3d m ON (e.ParentId IS NULL AND m.ECInstanceId = e.ModelId)
-         LEFT JOIN bis.SpatialCategory c ON (e.ParentId IS NULL AND c.ECInstanceId = e.CategoryId)
+         LEFT JOIN ${CLASS_NAME_GeometricModel3d} m ON (e.ParentId IS NULL AND m.ECInstanceId = e.ModelId)
+         LEFT JOIN ${CLASS_NAME_SpatialCategory} c ON (e.ParentId IS NULL AND c.ECInstanceId = e.CategoryId)
 
         UNION ALL
 
@@ -471,8 +501,8 @@ function createGeometricElementInstanceKeyPaths(imodelAccess, idsCache, hierarch
           )
         FROM ModelsCategoriesElementsHierarchy ce
         JOIN ${hierarchyConfig.elementClassSpecification} pe ON (pe.ECInstanceId = ce.ParentId OR pe.ECInstanceId = ce.ModelId AND ce.ParentId IS NULL)
-        LEFT JOIN bis.GeometricModel3d m ON (pe.Parent.Id IS NULL AND m.ECInstanceId = pe.Model.Id)
-        LEFT JOIN bis.SpatialCategory c ON (pe.Parent.Id IS NULL AND c.ECInstanceId = pe.Category.Id)
+        LEFT JOIN ${CLASS_NAME_GeometricModel3d} m ON (pe.Parent.Id IS NULL AND m.ECInstanceId = pe.Model.Id)
+        LEFT JOIN ${CLASS_NAME_SpatialCategory} c ON (pe.Parent.Id IS NULL AND c.ECInstanceId = pe.Category.Id)
       )`,
         ];
         const ecsql = `
@@ -480,21 +510,20 @@ function createGeometricElementInstanceKeyPaths(imodelAccess, idsCache, hierarch
       FROM ModelsCategoriesElementsHierarchy mce
       WHERE mce.ParentId IS NULL
     `;
-        return imodelAccess.createQueryReader({ ctes, ecsql }, { rowFormat: "Indexes", limit: "unbounded" });
-    }).pipe(releaseMainThreadOnItemsCount(300), map((row) => parseQueryRow(row, groupInfos, separator, hierarchyConfig.elementClassSpecification)), mergeMap(({ modelId, elementHierarchyPath, groupingNode }) => from(idsCache.createModelInstanceKeyPaths(modelId)).pipe(mergeAll(), map((modelPath) => {
-        // We dont want to modify the original path, we create a copy that we can modify
+        return imodelAccess.createQueryReader({ ctes, ecsql }, { rowFormat: "Indexes", limit: "unbounded", restartToken: `${componentName}/${componentId}/geometric-element-paths/${chunkIndex}` });
+    }).pipe(releaseMainThreadOnItemsCount(300), map((row) => parseQueryRow(row, groupInfos, separator, hierarchyConfig.elementClassSpecification)), mergeMap(({ modelId, elementHierarchyPath, groupingNode }) => idsCache.createModelInstanceKeyPaths(modelId).pipe(mergeAll(), map((modelPath) => {
+        // We don't want to modify the original path, we create a copy that we can modify
         const newModelPath = [...modelPath];
         newModelPath.pop(); // model is already included in the element hierarchy path
         const path = [...newModelPath, ...elementHierarchyPath];
         if (!groupingNode) {
-            return path;
+            return { path };
         }
         return {
             path,
             options: {
-                autoExpand: {
-                    key: groupingNode.key,
-                    depth: groupingNode.parentKeys.length,
+                reveal: {
+                    depthInHierarchy: groupingNode.parentKeys.length,
                 },
             },
         };
@@ -509,10 +538,10 @@ function parseQueryRow(row, groupInfos, separator, elementClassName) {
                 path.push({ className: elementClassName, id: rowElements[i + 1] });
                 break;
             case "c":
-                path.push({ className: "BisCore.SpatialCategory", id: rowElements[i + 1] });
+                path.push({ className: CLASS_NAME_SpatialCategory, id: rowElements[i + 1] });
                 break;
             case "m":
-                path.push({ className: "BisCore.GeometricModel3d", id: rowElements[i + 1] });
+                path.push({ className: CLASS_NAME_GeometricModel3d, id: rowElements[i + 1] });
                 break;
         }
     }
@@ -522,66 +551,74 @@ function parseQueryRow(row, groupInfos, separator, elementClassName) {
         groupingNode: row[2] === -1 ? undefined : groupInfos[row[2]].groupingNode,
     };
 }
-async function createInstanceKeyPathsFromTargetItems({ targetItems, imodelAccess, hierarchyConfig, idsCache, limit, }) {
+function createInstanceKeyPathsFromTargetItemsObs({ targetItems, imodelAccess, hierarchyConfig, idsCache, limit, componentId, componentName, }) {
     if (limit !== "unbounded" && targetItems.length > (limit ?? MAX_FILTERING_INSTANCE_KEY_COUNT)) {
         throw new FilterLimitExceededError(limit ?? MAX_FILTERING_INSTANCE_KEY_COUNT);
     }
-    return lastValueFrom(from(targetItems).pipe(releaseMainThreadOnItemsCount(2000), mergeMap(async (key) => {
+    return from(targetItems).pipe(releaseMainThreadOnItemsCount(2000), mergeMap(async (key) => {
         if ("parent" in key) {
             return { key, type: 0 };
         }
-        if (await imodelAccess.classDerivesFrom(key.className, "BisCore.Subject")) {
+        if (await imodelAccess.classDerivesFrom(key.className, CLASS_NAME_Subject)) {
             return { key: key.id, type: 1 };
         }
-        if (await imodelAccess.classDerivesFrom(key.className, "BisCore.Model")) {
+        if (await imodelAccess.classDerivesFrom(key.className, CLASS_NAME_Model)) {
             return { key: key.id, type: 2 };
         }
-        if (await imodelAccess.classDerivesFrom(key.className, "BisCore.SpatialCategory")) {
+        if (await imodelAccess.classDerivesFrom(key.className, CLASS_NAME_SpatialCategory)) {
             return { key: key.id, type: 3 };
         }
         return { key: key.id, type: 0 };
     }, 2), reduce((acc, value) => {
         if (value.type === 1) {
-            acc.subjects.push(value.key);
+            acc.subjectIds.push(value.key);
             return acc;
         }
         if (value.type === 2) {
-            acc.models.push(value.key);
+            acc.modelIds.push(value.key);
             return acc;
         }
         if (value.type === 3) {
-            acc.categories.push(value.key);
+            acc.categoryIds.push(value.key);
             return acc;
         }
-        acc.elements.push(value.key);
+        acc.elementIds.push(value.key);
         return acc;
     }, {
-        models: new Array(),
-        categories: new Array(),
-        subjects: new Array(),
-        elements: new Array(),
+        modelIds: new Array(),
+        categoryIds: new Array(),
+        subjectIds: new Array(),
+        elementIds: new Array(),
     }), switchMap(async (ids) => {
-        const elementsLength = ids.elements.length;
-        return collect(merge(from(ids.subjects).pipe(mergeMap((id) => from(idsCache.createSubjectInstanceKeysPath(id)))), from(ids.models).pipe(mergeMap((id) => from(idsCache.createModelInstanceKeyPaths(id)).pipe(mergeAll()))), from(ids.categories).pipe(mergeMap((id) => from(idsCache.createCategoryInstanceKeyPaths(id)).pipe(mergeAll()))), from(ids.elements).pipe(bufferCount(Math.ceil(elementsLength / Math.ceil(elementsLength / 5000))), releaseMainThreadOnItemsCount(1), mergeMap((block) => createGeometricElementInstanceKeyPaths(imodelAccess, idsCache, hierarchyConfig, block), 10))));
-    })));
+        const elementsLength = ids.elementIds.length;
+        return collect(merge(from(ids.subjectIds).pipe(mergeMap((id) => idsCache.createSubjectInstanceKeysPath(id).pipe(map(HierarchyFilteringPath.normalize)))), from(ids.modelIds).pipe(mergeMap((id) => idsCache.createModelInstanceKeyPaths(id).pipe(mergeAll(), map(HierarchyFilteringPath.normalize)))), from(ids.categoryIds).pipe(mergeMap((id) => idsCache.createCategoryInstanceKeyPaths(id).pipe(mergeAll(), map(HierarchyFilteringPath.normalize)))), from(ids.elementIds).pipe(bufferCount(getOptimalBatchSize({ totalSize: elementsLength, maximumBatchSize: 5000 })), releaseMainThreadOnItemsCount(1), mergeMap((block, chunkIndex) => createGeometricElementInstanceKeyPaths({
+            imodelAccess,
+            idsCache,
+            hierarchyConfig,
+            targetItems: block,
+            componentId,
+            componentName,
+            chunkIndex,
+        }), 10))));
+    }));
 }
-async function createInstanceKeyPathsFromInstanceLabel(props) {
-    const elementLabelSelectClause = await props.labelsFactory.createSelectClause({
-        classAlias: "e",
-        className: "BisCore.Element",
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        selectorsConcatenator: ECSql.createConcatenatedValueStringSelector,
-    });
-    const targetsReader = props.imodelAccess.createQueryReader({
-        ecsql: `
+function createInstanceKeyPathsFromInstanceLabelObs(props) {
+    const { labelsFactory, hierarchyConfig, label, imodelAccess, limit } = props;
+    return defer(async () => {
+        const elementLabelSelectClause = await labelsFactory.createSelectClause({
+            classAlias: "e",
+            className: CLASS_NAME_Element,
+            selectorsConcatenator: ECSql.createConcatenatedValueStringSelector,
+        });
+        const ecsql = `
         SELECT *
         FROM (
           SELECT
             ec_classname(e.ECClassId, 's.c'),
             e.ECInstanceId,
             ${elementLabelSelectClause} Label
-          FROM BisCore.Element e
-          WHERE e.ECClassId IS (BisCore.Subject, BisCore.SpatialCategory, ${props.hierarchyConfig.elementClassSpecification})
+          FROM ${CLASS_NAME_Element} e
+          WHERE e.ECClassId IS (${CLASS_NAME_Subject}, ${CLASS_NAME_SpatialCategory}, ${hierarchyConfig.elementClassSpecification})
 
           UNION ALL
 
@@ -589,22 +626,24 @@ async function createInstanceKeyPathsFromInstanceLabel(props) {
             ec_classname(m.ECClassId, 's.c'),
             m.ECInstanceId,
             ${elementLabelSelectClause} Label
-          FROM BisCore.GeometricModel3d m
-          JOIN BisCore.Element e ON e.ECInstanceId = m.ModeledElement.Id
+          FROM ${CLASS_NAME_GeometricModel3d} m
+          JOIN ${CLASS_NAME_Element} e ON e.ECInstanceId = m.ModeledElement.Id
           WHERE NOT m.IsPrivate
-            ${props.hierarchyConfig.showEmptyModels ? "" : `AND EXISTS (SELECT 1 FROM ${props.hierarchyConfig.elementClassSpecification} WHERE Model.Id = m.ECInstanceId)`}
+            ${hierarchyConfig.showEmptyModels ? "" : `AND EXISTS (SELECT 1 FROM ${hierarchyConfig.elementClassSpecification} WHERE Model.Id = m.ECInstanceId)`}
             AND json_extract(e.JsonProperties, '$.PhysicalPartition.Model.Content') IS NULL
             AND json_extract(e.JsonProperties, '$.GraphicalPartition3d.Model.Content') IS NULL
         )
         WHERE Label LIKE '%' || ? || '%' ESCAPE '\\'
         LIMIT ${MAX_FILTERING_INSTANCE_KEY_COUNT + 1}
-      `,
-        bindings: [{ type: "string", value: props.label.replace(/[%_\\]/g, "\\$&") }],
-    }, { rowFormat: "Indexes", restartToken: "tree-widget/models-tree/filter-by-label-query", limit: props.limit });
-    const targetKeys = new Array();
-    for await (const row of targetsReader) {
-        targetKeys.push({ className: row[0], id: row[1] });
-    }
-    return createInstanceKeyPathsFromTargetItems({ ...props, targetItems: targetKeys });
+      `;
+        const bindings = [{ type: "string", value: label.replace(/[%_\\]/g, "\\$&") }];
+        return { ecsql, bindings };
+    }).pipe(mergeMap((queryProps) => {
+        return imodelAccess.createQueryReader(queryProps, {
+            rowFormat: "Indexes",
+            restartToken: `${props.componentName}/${props.componentId}/filter-by-label`,
+            limit,
+        });
+    }), map((row) => ({ className: row[0], id: row[1] })), toArray(), mergeMap((targetKeys) => createInstanceKeyPathsFromTargetItemsObs({ ...props, targetItems: targetKeys })));
 }
 //# sourceMappingURL=ModelsTreeDefinition.js.map