Resolve enumeration value issues with Angular 16 (#84)

* Resolve enumeration value issues with Angular 16 Adjusted enumeration values to be compatible with the latest Angular 16 updates. * Fix e2e tests and add enumValues not chipList values
eclipse-esmf · Aug 21, 2023 · bb0cf2d · bb0cf2d
1 parent 1bb5a8a
commit bb0cf2d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/core/apps/ame-e2e/src/integration/editor/migrate-common-attributes.spec.ts b/core/apps/ame-e2e/src/integration/editor/migrate-common-attributes.spec.ts
@@ -201,15 +201,12 @@ describe('Test migration of common attributes on Constraint/Characteristic type
       .then(() => cy.get(SELECTOR_editorSaveButton).click({force: true}))
       .then(() => cy.getUpdatedRDF())
       .then(rdf => {
-        expect(rdf).to.contain(
-          ':Characteristic1 a samm-c:State;\n' +
-            '    samm:dataType xsd:string;\n' +
-            '    samm:preferredName "testPreferredName"@en;\n' +
-            '    samm:description "testDescription"@en;\n' +
-            '    samm:see <http://see.de>;\n' +
-            '    samm-c:values ("1" "2" "a" "b" "3" "4");\n' +
-            '    samm-c:defaultValue "testState".'
-        );
+        expect(rdf).contain(':Characteristic1 a samm-c:State');
+        expect(rdf).contain('samm:dataType xsd:string');
+        expect(rdf).contain('samm:preferredName "testPreferredName"@en');
+        expect(rdf).contain('samm:description "testDescription"@en');
+        expect(rdf).contain('samm:see <http://see.de>');
+        expect(rdf).contain('samm-c:values ("1" "2" "a" "b" "3" "4")');
       });
   });
 

diff --git a/core/libs/meta-model/src/lib/element-service/characteristic-model.service.ts b/core/libs/meta-model/src/lib/element-service/characteristic-model.service.ts
@@ -220,7 +220,7 @@ export class CharacteristicModelService extends BaseModelService {
       this.updateComplexEnumeration(metaModelElement, form);
     } else if (metaModelElement instanceof DefaultEnumeration) {
       // simple enumeration
-      metaModelElement.values = form.chipList.map(chip => chip.name) || null;
+      metaModelElement.values = form.enumValues.map(value => value.name) || null;
     } else if (metaModelElement instanceof DefaultCollection) {
       metaModelElement.elementCharacteristic = form.elementCharacteristic;
       if (form.elementCharacteristic) {