-
Notifications
You must be signed in to change notification settings - Fork 34
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add definitionContainers to categories tree #1172
base: master
Are you sure you want to change the base?
Add definitionContainers to categories tree #1172
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Impressive set of tests - great work!
...et/src/tree-widget-react/components/trees/categories-tree/internal/CategoriesTreeIdsCache.ts
Outdated
Show resolved
Hide resolved
...et/src/tree-widget-react/components/trees/categories-tree/internal/CategoriesTreeIdsCache.ts
Outdated
Show resolved
Hide resolved
...et/src/tree-widget-react/components/trees/categories-tree/internal/CategoriesTreeIdsCache.ts
Outdated
Show resolved
Hide resolved
...et/src/tree-widget-react/components/trees/categories-tree/internal/CategoriesTreeIdsCache.ts
Outdated
Show resolved
Hide resolved
...et/src/tree-widget-react/components/trees/categories-tree/internal/CategoriesTreeIdsCache.ts
Outdated
Show resolved
Hide resolved
...twin/tree-widget/src/test/trees/categories-tree/internal/CategoriesVisibilityHandler.test.ts
Show resolved
Hide resolved
...twin/tree-widget/src/test/trees/categories-tree/internal/CategoriesVisibilityHandler.test.ts
Outdated
Show resolved
Hide resolved
...twin/tree-widget/src/test/trees/categories-tree/internal/CategoriesVisibilityHandler.test.ts
Outdated
Show resolved
Hide resolved
packages/itwin/tree-widget/src/test/trees/categories-tree/internal/VisibilityValidation.ts
Outdated
Show resolved
Hide resolved
...twin/tree-widget/src/test/trees/categories-tree/internal/CategoriesVisibilityHandler.test.ts
Outdated
Show resolved
Hide resolved
…ees/categories-tree/internal/CategoriesTreeIdsCache.ts Co-authored-by: Grigas <35135765+grigasp@users.noreply.github.com>
…ees/categories-tree/internal/CategoriesTreeIdsCache.ts Co-authored-by: Grigas <35135765+grigasp@users.noreply.github.com>
…ees/categories-tree/internal/CategoriesTreeIdsCache.ts Co-authored-by: Grigas <35135765+grigasp@users.noreply.github.com>
…ees/categories-tree/internal/CategoriesTreeNode.ts Co-authored-by: Grigas <35135765+grigasp@users.noreply.github.com>
…ees/categories-tree/internal/CategoriesTreeNode.ts Co-authored-by: Grigas <35135765+grigasp@users.noreply.github.com>
…rnal/CategoriesTreeIdsCache.test.ts Co-authored-by: Grigas <35135765+grigasp@users.noreply.github.com>
…ttps://github.com/iTwin/viewer-components-react into JonasD/categories-tree-with-definition-containers
…ees/categories-tree/CategoriesTreeDefinition.ts Co-authored-by: Grigas <35135765+grigasp@users.noreply.github.com>
…ttps://github.com/iTwin/viewer-components-react into JonasD/categories-tree-with-definition-containers
const getCategoriesTreeIdsCache = useCallback(() => { | ||
if (!idsCacheRef.current) { | ||
idsCacheRef.current = new CategoriesTreeIdsCache(createECSqlQueryExecutor(iModel), viewType); | ||
} | ||
return idsCacheRef.current; | ||
}, [viewType, iModel]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see where idsCacheRef.current
is reset when view type or iModel changes so it will always return same cache.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, missed that, removed the condition, changed to useMemo
...c/tree-widget-react/components/trees/categories-tree/internal/CategoriesVisibilityHandler.ts
Outdated
Show resolved
Hide resolved
...win/tree-widget/src/tree-widget-react/components/trees/categories-tree/UseCategoriesTree.tsx
Outdated
Show resolved
Hide resolved
packages/itwin/tree-widget/src/test/trees/categories-tree/internal/Utils.ts
Outdated
Show resolved
Hide resolved
packages/itwin/tree-widget/src/test/trees/categories-tree/internal/VisibilityValidation.ts
Outdated
Show resolved
Hide resolved
...ee-widget/src/tree-widget-react/components/trees/categories-tree/CategoriesTreeDefinition.ts
Outdated
Show resolved
Hide resolved
...et/src/tree-widget-react/components/trees/categories-tree/internal/CategoriesTreeIdsCache.ts
Outdated
Show resolved
Hide resolved
packages/itwin/tree-widget/src/test/trees/categories-tree/internal/VisibilityValidation.ts
Outdated
Show resolved
Hide resolved
packages/itwin/tree-widget/src/test/trees/categories-tree/internal/VisibilityValidation.ts
Outdated
Show resolved
Hide resolved
I created a test iModel to check query performance and noticed some worrying things. The code to create a test iModel: await buildIModel(this, async (builder) => {
const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
for (let i = 0; i < 1000; ++i) {
const definitionContainer = insertDefinitionContainer({ builder, codeValue: `Definition container ${i + 1}` });
const definitionModel = insertSubModel({ builder, classFullName: "BisCore.DefinitionModel", modeledElementId: definitionContainer.id });
if (i === 0) {
for (let j = 0; j < 1000; ++j) {
const definitionContainerChild = insertDefinitionContainer({
builder,
codeValue: `Child definition container ${j + 1}`,
modelId: definitionModel.id,
});
const definitionModelChild = insertSubModel({ builder, classFullName: "BisCore.DefinitionModel", modeledElementId: definitionContainerChild.id });
const category = insertSpatialCategory({ builder, codeValue: "Child category", modelId: definitionModelChild.id });
insertPhysicalElement({ builder, modelId: physicalModel.id, categoryId: category.id });
}
} else if (i === 1) {
for (let j = 0; j < 1000; ++j) {
const category = insertSpatialCategory({ builder, codeValue: `Child category ${j + 1}`, modelId: definitionModel.id });
insertPhysicalElement({ builder, modelId: physicalModel.id, categoryId: category.id });
}
} else if (i % 2 === 0) {
const definitionContainerChild = insertDefinitionContainer({ builder, codeValue: "Child definition container", modelId: definitionModel.id });
const definitionModelChild = insertSubModel({ builder, classFullName: "BisCore.DefinitionModel", modeledElementId: definitionContainerChild.id });
const category = insertSpatialCategory({ builder, codeValue: "Child category", modelId: definitionModelChild.id });
insertPhysicalElement({ builder, modelId: physicalModel.id, categoryId: category.id });
} else {
const category = insertSpatialCategory({ builder, codeValue: "Child category", modelId: definitionModel.id });
insertPhysicalElement({ builder, modelId: physicalModel.id, categoryId: category.id });
}
}
}); Observations:
|
closes #1126