BaseClass Differencing Validation fix (backport #7224) [release/4.9.x] (

#7290) Co-authored-by: Stefan Apfel <[email protected]>
iTwin · Oct 22, 2024 · 2bc4906 · 2bc4906
1 parent b8093f9
commit 2bc4906
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/...ges/@itwin/ecschema-editing/schema-editing-baseclass-validation-fix_2024-10-02-10-13.json b/...ges/@itwin/ecschema-editing/schema-editing-baseclass-validation-fix_2024-10-02-10-13.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/ecschema-editing",
+      "comment": "",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/ecschema-editing"
+}
diff --git a/core/ecschema-editing/src/Differencing/SchemaDifferenceValidator.ts b/core/ecschema-editing/src/Differencing/SchemaDifferenceValidator.ts
@@ -100,7 +100,7 @@ class SchemaDifferenceValidationVisitor implements ISchemaDifferenceVisitor {
    * Shared base-class validation for all types of ClassItemDifference union.
    */
   private async visitBaseClassDifference(entry: ClassItemDifference, targetClassItem: ECClass) {
-    if (entry.difference.baseClass === undefined && targetClassItem.baseClass !== undefined) {
+    if ("baseClass" in entry.difference && entry.difference.baseClass === undefined && targetClassItem.baseClass !== undefined) {
       return this.addConflict({
         code: ConflictCode.RemovingBaseClass,
         schemaType: targetClassItem.schemaItemType,

diff --git a/core/ecschema-editing/src/test/Differencing/Conflicts.test.ts b/core/ecschema-editing/src/test/Differencing/Conflicts.test.ts
@@ -1248,6 +1248,41 @@ describe("Schema Difference Conflicts", () => {
       await expect(findConflictItem(differences, "ActualBaseClassEntity")).to.be.eventually.undefined;
     });
 
+    it("should not find a conflict if other properties but baseclass change", async () => {
+      const sourceSchema = {
+        ...schemaHeader,
+        name: "ConflictSchema2",
+        items: {
+          BaseEntity: {
+            schemaItemType: "EntityClass",
+            modifier: "Abstract",
+          },
+          ActualBaseClassEntity: {
+            schemaItemType: "EntityClass",
+            label: "ActualBaseClassEntity",
+            description: "This describes the actual base class entity",
+            baseClass: "ConflictSchema2.BaseEntity",
+          },
+        },
+      };
+
+      const targetSchema = {
+        ...schemaHeader,
+        items: {
+          BaseEntity: {
+            schemaItemType: "EntityClass",
+            modifier: "Abstract",
+          },
+          ActualBaseClassEntity: {
+            schemaItemType: "EntityClass",
+            baseClass: "ConflictSchema.BaseEntity",
+          },
+        },
+      };
+      const differences = await runDifferences(sourceSchema, targetSchema);
+      await expect(findConflictItem(differences, "ActualBaseClassEntity")).to.eventually.not.exist;
+    });
+
     it("should  not find a conflict if the new base class derives from target baseclass from referenced schemas", async () => {
       const sourceSchemaJson = {
         ...schemaHeader,