Adress comment

Author: JonasDov

packages/itwin/tree-widget/src/tree-widget-react/components/trees/models-tree/internal/ModelsTreeIdsCache.ts

@@ -400,18 +400,17 @@ export class ModelsTreeIdsCache {
           }
           return acc;
         }, new Map<Id64String, Id64Set>()),
-        mergeMap((modelCategoryMap) =>
-          from(modelCategoryMap.entries()).pipe(
-            map(([modelId, categoryIds]) => `Model.Id = ${modelId} AND Category.Id IN (${[...categoryIds].join(", ")})`),
-            // Maximum Depth Of An Expression Tree is set to 3000:
-            // https://github.com/iTwin/imodel-native/blob/f0f36d97fe10fd441b8bf760c331d299615a42b9/iModelCore/BeSQLite/SQLite/bentley-sqlite.c#L22
-            // 2900 makes sure that this limit is not reached
-            bufferCount(Math.ceil(modelCategoryMap.size / Math.ceil(modelCategoryMap.size / 2900))),
-            mergeMap(async (whereClauses) => {
-              const reader = this._queryExecutor.createQueryReader(
-                {
-                  ctes: [
-                    `
+        mergeMap((modelCategoryMap) => modelCategoryMap.entries()),
+        map(([modelId, categoryIds]) => `Model.Id = ${modelId} AND Category.Id IN (${[...categoryIds].join(", ")})`),
+        // Maximum Depth Of An Expression Tree is set to 3000:
+        // https://github.com/iTwin/imodel-native/blob/f0f36d97fe10fd441b8bf760c331d299615a42b9/iModelCore/BeSQLite/SQLite/bentley-sqlite.c#L22
+        // 2900 makes sure that this limit is not reached
+        bufferCount(2900),
+        mergeMap(async (whereClauses) => {
+          const reader = this._queryExecutor.createQueryReader(
+            {
+              ctes: [
+                `
                     CategoryElements(id, modelId, categoryId) AS (
                       SELECT ECInstanceId, Model.Id, Category.Id
                       FROM ${this._hierarchyConfig.elementClassSpecification}
@@ -428,25 +427,23 @@ export class ModelsTreeIdsCache {
                       JOIN CategoryElements p ON c.Parent.Id = p.id
                     )
                   `,
-                  ],
-                  ecsql: `
+              ],
+              ecsql: `
                   SELECT modelId, categoryId, COUNT(id) elementsCount
                   FROM CategoryElements
                   GROUP BY modelId, categoryId
                 `,
-                },
-                { rowFormat: "ECSqlPropertyNames", limit: "unbounded" },
-              );
-
-              const result = new Array<{ modelId: number; categoryId: number; elementsCount: number }>();
-              for await (const row of reader) {
-                result.push({ modelId: row.modelId, categoryId: row.categoryId, elementsCount: row.elementsCount });
-              }
-              return result;
-            }),
-            mergeAll(),
-          ),
-        ),
+            },
+            { rowFormat: "ECSqlPropertyNames", limit: "unbounded" },
+          );
+
+          const result = new Array<{ modelId: number; categoryId: number; elementsCount: number }>();
+          for await (const row of reader) {
+            result.push({ modelId: row.modelId, categoryId: row.categoryId, elementsCount: row.elementsCount });
+          }
+          return result;
+        }),
+        mergeAll(),
       ),
     );
   }