Add definitionContainers to categories tree

change/@itwin-tree-widget-react-944faa0b-268a-40c9-9ae5-49d45b91b7c7.json

@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "`CategoriesTree` component rendered `Categories` as a flat list, where each `Category` had zero or more child `SubCategories`. Some iTwin.js applications started to group `Categories` under `DefinitionContainers` and wanted to see them displayed in `CategoriesTree` component. Added `DefinitionContainers` to `CategoriesTree` component. This change doesn't affect applications that don't have `DefinitionContainers`.",
+  "packageName": "@itwin/tree-widget-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

packages/itwin/tree-widget/src/test/trees/categories-tree/CategoriesTreeDefinition.test.ts

@@ -73,7 +73,7 @@ describe("Categories tree", () => {
       });
     });
 
-    it("does not show definitionContainer when it doesn't contain category", async function () {
+    it("does not show definition container when it doesn't contain category", async function () {
       const { imodel, ...keys } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });
@@ -97,7 +97,7 @@ describe("Categories tree", () => {
       });
     });
 
-    it("does not show definitionContainer when it contains definitionContainer without categories", async function () {
+    it("does not show definition container when it contains definition container without categories", async function () {
       const { imodel } = await buildIModel(this, async (builder) => {
         insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });
@@ -111,7 +111,7 @@ describe("Categories tree", () => {
       });
     });
 
-    it("does not show definitionContainer or category when category is private", async function () {
+    it("does not show definition container or category when category is private", async function () {
       const { imodel } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });
@@ -127,7 +127,7 @@ describe("Categories tree", () => {
       });
     });
 
-    it("does not show definitionContainer or category when definitionContainer is private", async function () {
+    it("does not show definition container or category when definition container is private", async function () {
       const { imodel } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer", isPrivate: true });
@@ -143,7 +143,7 @@ describe("Categories tree", () => {
       });
     });
 
-    it("does not show definitionContainers or categories when definitionContainer contains another definitionContainer that is private", async function () {
+    it("does not show definition containers or categories when definition container contains another definition container that is private", async function () {
       const { imodel } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });
@@ -166,7 +166,7 @@ describe("Categories tree", () => {
       });
     });
 
-    it("shows definitionContainer when it contains category", async function () {
+    it("shows definition container when it contains category", async function () {
       const { imodel, ...keys } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });
@@ -196,7 +196,7 @@ describe("Categories tree", () => {
       });
     });
 
-    it("shows all definitionContainers when they contain category directly or indirectly", async function () {
+    it("shows all definition containers when they contain category directly or indirectly", async function () {
       const { imodel, ...keys } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });
@@ -234,7 +234,7 @@ describe("Categories tree", () => {
       });
     });
 
-    it("shows root categories and definitionContainer", async function () {
+    it("shows root categories and definition container", async function () {
       const { imodel, ...keys } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });

packages/itwin/tree-widget/src/test/trees/categories-tree/CategoriesTreeFiltering.test.ts

@@ -46,7 +46,7 @@ describe("Categories tree", () => {
       await terminatePresentationTesting();
     });
 
-    it("finds definitionContainer by label", async function () {
+    it("finds definition container by label", async function () {
       const { imodel, keys } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer", userLabel: "Test" });
@@ -69,7 +69,7 @@ describe("Categories tree", () => {
       ).to.deep.eq([{ path: [keys.definitionContainer], options: { autoExpand: true } }]);
     });
 
-    it("finds definitionContainer by label when it is contained by another definitionContainer", async function () {
+    it("finds definition container by label when it is contained by another definition container", async function () {
       const { imodel, keys } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });
@@ -99,7 +99,7 @@ describe("Categories tree", () => {
       ).to.deep.eq([{ path: [keys.definitionContainer, keys.definitionContainerChild], options: { autoExpand: true } }]);
     });
 
-    it("does not find definitionContainer by label when it doesn't contain categories", async function () {
+    it("does not find definition container by label when it doesn't contain categories", async function () {
       const { imodel } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer", userLabel: "Test" });
@@ -122,7 +122,7 @@ describe("Categories tree", () => {
       ).to.deep.eq([]);
     });
 
-    it("finds category by label when it is contained by definitionContainer", async function () {
+    it("finds category by label when it is contained by definition container", async function () {
       const { imodel, keys } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });
@@ -145,7 +145,7 @@ describe("Categories tree", () => {
       ).to.deep.eq([{ path: [keys.definitionContainer, keys.category], options: { autoExpand: true } }]);
     });
 
-    it("finds subCategory by label when its parent category is contained by definitionContainer", async function () {
+    it("finds subCategory by label when its parent category is contained by definition container", async function () {
       const { imodel, keys } = await buildIModel(this, async (builder) => {
         const physicalModel = insertPhysicalModelWithPartition({ builder, codeValue: "TestPhysicalModel" });
         const definitionContainer = insertDefinitionContainer({ builder, codeValue: "DefinitionContainer" });