Rename from entity value to entity instance (#189)

* rename from entity value to entity instance

* fix e2e

Author: larisaVasile

core/apps/ame-e2e/src/integration/editor/edit-enumeration-entity-values.cy.ts

@@ -258,7 +258,7 @@ describe('Test enumeration entity value', () => {
       .then(() => cyHelp.clickSaveButton());
   });
 
-  it('import new model with entity values', () => {
+  it('import new model with entity instances', () => {
     cy.visitDefault();
     cy.intercept('POST', 'http://localhost:9091/ame/api/models/validate', {fixture: 'model-validation-response.json'});
     cy.fixture('entity-values-enumeration')
@@ -295,7 +295,7 @@ describe('Test enumeration entity value', () => {
       });
   });
 
-  it('search for entity value', () => {
+  it('search for entity instance', () => {
     cy.shapeExists('Characteristic1')
       .then(() => cy.dbClickShape('Characteristic1'))
       .then(() => cy.get(SELECTOR_searchEntityValueInputField).should('exist').type('test2', {force: true}))
@@ -305,7 +305,7 @@ describe('Test enumeration entity value', () => {
       .then(() => cyHelp.clickSaveButton());
   });
 
-  it('edit all entity values', () => {
+  it('edit all entity instances', () => {
     cy.shapeExists('test1')
       .then(() => cy.dbClickShape('test1').wait(200))
       .then(() => cy.get(FIELD_name).clear({force: true}).type('edit1', {force: true}))
@@ -360,7 +360,7 @@ describe('Test enumeration entity value', () => {
       .then(() => cy.get(SELECTOR_editorCancelButton).click({force: true}));
   });
 
-  it('edit one entity values', () => {
+  it('edit one entity instances', () => {
     cy.shapeExists('edit2')
       .then(() => cy.dbClickShape('edit2'))
       .then(() => cy.get(FIELD_name).should('exist').clear({force: true}).type('editOnlyOnEntityValue', {force: true}))
@@ -430,7 +430,7 @@ describe('Test enumeration entity value', () => {
       .then(() => cyHelp.clickSaveButton());
   });
 
-  it('delete all entity value one by one', () => {
+  it('delete all entity instance one by one', () => {
     cy.visitDefault();
     cy.intercept('POST', 'http://localhost:9091/ame/api/models/validate', {fixture: 'model-validation-response.json'});
     cy.fixture('entity-values-enumeration')
@@ -475,7 +475,7 @@ describe('Test enumeration entity value', () => {
       });
   });
 
-  it('it should add manually new entity value shape', () => {
+  it('it should add manually new entity instance shape', () => {
     cy.visitDefault();
     cy.startModelling()
       .wait(500)
@@ -493,7 +493,7 @@ describe('Test enumeration entity value', () => {
       .then(() => cyHelp.hasAddShapeOverlay('Characteristic1'))
       .then(() => {
         cyHelp.hasAddShapeOverlay('Characteristic1');
-        testEntityValuesExists(['EntityValue1']);
+        testEntityValuesExists(['EntityInstance1']);
       })
       .then(() => cy.getUpdatedRDF())
       .then(rdf =>
@@ -506,22 +506,22 @@ describe('Test enumeration entity value', () => {
             '    samm:characteristic :Characteristic1.\n' +
             ':Characteristic1 a samm-c:Enumeration;\n' +
             '    samm:dataType :Entity1;\n' +
-            '    samm-c:values (:FillGapEntityValue :EntityValue1).\n' +
+            '    samm-c:values (:FillGapEntityValue :EntityInstance1).\n' +
             ':Entity1 a samm:Entity;\n' +
             '    samm:properties ().\n' +
             ':FillGapEntityValue a :Entity1.\n' +
-            ':EntityValue1 a :Entity1.',
+            ':EntityInstance1 a :Entity1.',
         ),
       );
   });
 
   it('it should delete entity value', () => {
-    cy.getHTMLCell('EntityValue1')
+    cy.getHTMLCell('EntityInstance1')
       .click({force: true})
       .then(() => cy.get(SELECTOR_tbDeleteButton).click({force: true}))
       .then(() => {
         cyHelp.hasAddShapeOverlay('Characteristic1');
-        testEntityValuesDoesNotExist(['EntityValue1']);
+        testEntityValuesDoesNotExist(['EntityInstance1']);
       })
       .then(() => cy.getUpdatedRDF())
       .then(rdf => {

core/libs/aspect-exporter/src/lib/domain-model-to-rdf.module.ts

@@ -22,7 +22,7 @@ import {
   CharacteristicVisitor,
   CleanupVisitor,
   ConstraintVisitor,
-  EntityValueVisitor,
+  EntityInstanceVisitor,
   EntityVisitor,
   EventVisitor,
   OperationVisitor,
@@ -41,7 +41,7 @@ import {
     CleanupVisitor,
     ConstraintVisitor,
     DomainModelToRdfService,
-    EntityValueVisitor,
+    EntityInstanceVisitor,
     EntityVisitor,
     EntityVisitor,
     EventVisitor,

core/libs/aspect-exporter/src/lib/domain-model-to-rdf.service.ts

@@ -38,7 +38,7 @@ import {
   CharacteristicVisitor,
   CleanupVisitor,
   ConstraintVisitor,
-  EntityValueVisitor,
+  EntityInstanceVisitor,
   EntityVisitor,
   EventVisitor,
   OperationVisitor,
@@ -70,7 +70,7 @@ export class DomainModelToRdfService {
     private entityVisitorService: EntityVisitor,
     private abstractEntityVisitorService: AbstractEntityVisitor,
     private abstractPropertyVisitorService: AbstractPropertyVisitor,
-    private entityValueVisitor: EntityValueVisitor,
+    private entityInstanceVisitor: EntityInstanceVisitor,
     private eventVisitorService: EventVisitor,
     private unitVisitorService: UnitVisitor,
     private modelService: ModelService,
@@ -140,7 +140,7 @@ export class DomainModelToRdfService {
     } else if (metaModelElement instanceof DefaultAbstractEntity) {
       return this.abstractEntityVisitorService;
     } else if (metaModelElement instanceof DefaultEntityInstance) {
-      return this.entityValueVisitor;
+      return this.entityInstanceVisitor;
     } else if (metaModelElement instanceof DefaultEvent) {
       return this.eventVisitorService;
     } else if (metaModelElement instanceof DefaultUnit) {

…ntity-value/entity-value-visitor.spec.ts …instance/entity-instance-visitor.spec.tscore/libs/aspect-exporter/src/lib/visitor/entity-value/entity-value-visitor.spec.ts renamed to core/libs/aspect-exporter/src/lib/visitor/entity-instance/entity-instance-visitor.spec.ts core/libs/aspect-exporter/src/lib/visitor/entity-value/entity-value-visitor.spec.ts renamed to core/libs/aspect-exporter/src/lib/visitor/entity-instance/entity-instance-visitor.spec.ts

@@ -14,7 +14,7 @@
 import {TestBed} from '@angular/core/testing';
 import {DataFactory, Quad, Store} from 'n3';
 import {describe, expect, it} from '@jest/globals';
-import {EntityValueVisitor} from '@ame/aspect-exporter';
+import {EntityInstanceVisitor} from '@ame/aspect-exporter';
 import {Samm} from '@ame/vocabulary';
 import {ModelService, RdfService} from '@ame/rdf/services';
 import {provideMockObject} from '../../../../../../jest-helpers';
@@ -36,9 +36,9 @@ class MockRDFModel {
   SAMM = jest.fn((): Samm => new MockSamm() as any as Samm);
 }
 
-describe('Entity value visitor', () => {
+describe('Entity instance visitor', () => {
   let mockedRdfModel: MockRDFModel;
-  let service: EntityValueVisitor;
+  let service: EntityInstanceVisitor;
   let rdfService: jest.Mocked<RdfService>;
   const entity: any = {aspectModelUrn: 'entityUrn1'};
   const mockProperty1: any = {
@@ -80,7 +80,7 @@ describe('Entity value visitor', () => {
     mockedRdfModel = new MockRDFModel();
     TestBed.configureTestingModule({
       providers: [
-        EntityValueVisitor,
+        EntityInstanceVisitor,
         {
           provide: ModelService,
           useValue: {
@@ -95,7 +95,7 @@ describe('Entity value visitor', () => {
         },
       ],
     });
-    service = TestBed.inject(EntityValueVisitor);
+    service = TestBed.inject(EntityInstanceVisitor);
 
     rdfService = TestBed.inject(RdfService) as jest.Mocked<RdfService>;
     rdfService.currentRdfModel = mockedRdfModel.rdfModel;

…tor/entity-value/entity-value-visitor.ts …tity-instance/entity-instance-visitor.tscore/libs/aspect-exporter/src/lib/visitor/entity-value/entity-value-visitor.ts renamed to core/libs/aspect-exporter/src/lib/visitor/entity-instance/entity-instance-visitor.ts core/libs/aspect-exporter/src/lib/visitor/entity-value/entity-value-visitor.ts renamed to core/libs/aspect-exporter/src/lib/visitor/entity-instance/entity-instance-visitor.ts

@@ -12,7 +12,7 @@
  */
 
 import {Injectable} from '@angular/core';
-import {DefaultCollection, DefaultEntityInstance, EntityValueProperty} from '@ame/meta-model';
+import {DefaultCollection, DefaultEntityInstance, EntityInstanceProperty} from '@ame/meta-model';
 import {ModelService, RdfService} from '@ame/rdf/services';
 import {DataFactory, Literal, NamedNode} from 'n3';
 import {BaseVisitor} from '../base-visitor';
@@ -21,7 +21,7 @@ import {RdfListService} from '../../rdf-list';
 import {Samm} from '@ame/vocabulary';
 
 @Injectable()
-export class EntityValueVisitor extends BaseVisitor<DefaultEntityInstance> {
+export class EntityInstanceVisitor extends BaseVisitor<DefaultEntityInstance> {
   constructor(
     private rdfListService: RdfListService,
     public modelService: ModelService,
@@ -82,14 +82,14 @@ export class EntityValueVisitor extends BaseVisitor<DefaultEntityInstance> {
     }
   }
 
-  private createObjectForCollectionLangStringRDF(ev: EntityValueProperty): {predicate: NamedNode; literal: Literal} {
+  private createObjectForCollectionLangStringRDF(ev: EntityInstanceProperty): {predicate: NamedNode; literal: Literal} {
     return {
       predicate: DataFactory.namedNode(ev.key.property.aspectModelUrn),
       literal: DataFactory.literal(ev?.value?.toString(), ev?.language?.toString()),
     };
   }
 
-  private createObjectForRDF({key, value, language}: EntityValueProperty): NamedNode | Literal {
+  private createObjectForRDF({key, value, language}: EntityInstanceProperty): NamedNode | Literal {
     if (value instanceof DefaultEntityInstance) {
       return DataFactory.namedNode(value.aspectModelUrn);
     }

…er/src/lib/visitor/entity-value/index.ts …src/lib/visitor/entity-instance/index.tscore/libs/aspect-exporter/src/lib/visitor/entity-value/index.ts renamed to core/libs/aspect-exporter/src/lib/visitor/entity-instance/index.ts core/libs/aspect-exporter/src/lib/visitor/entity-value/index.ts renamed to core/libs/aspect-exporter/src/lib/visitor/entity-instance/index.ts

@@ -11,4 +11,4 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-export * from './entity-value-visitor';
+export * from './entity-instance-visitor';

core/libs/aspect-exporter/src/lib/visitor/index.ts

@@ -18,7 +18,7 @@ export * from './characteristic';
 export * from './entity';
 export * from './constraint';
 export * from './cleanup-visitor';
-export * from './entity-value';
+export * from './entity-instance';
 export * from './unit';
 export * from './event';
 export * from './abstract-entity';

core/libs/editor/src/lib/editor-dialog/components/entity-instance/entity-instance-modal-table/entity-instance-modal-table.component.ts

@@ -21,7 +21,7 @@ import {
   DefaultEntityInstance,
   DefaultEnumeration,
   DefaultProperty,
-  EntityValueProperty,
+  EntityInstanceProperty,
   OverWrittenProperty,
 } from '@ame/meta-model';
 import {DataType, EditorDialogValidators, FormFieldHelper} from '@ame/editor';
@@ -55,7 +55,7 @@ export class EntityInstanceModalTableComponent implements OnChanges, OnDestroy {
   protected readonly formFieldHelper = FormFieldHelper;
   protected readonly dataType = DataType;
 
-  sources: EntityValueProperty[] = [];
+  sources: EntityInstanceProperty[] = [];
 
   filteredEntityValues$: {[key: string]: Observable<any[]>} = {};
   filteredLanguageValues$: {[key: string]: Observable<any[]>} = {};
@@ -96,11 +96,11 @@ export class EntityInstanceModalTableComponent implements OnChanges, OnDestroy {
     return this.propertiesForm.get(value) as FormArray;
   }
 
-  private buildEntityValueArray(): EntityValueProperty[] {
+  private buildEntityValueArray(): EntityInstanceProperty[] {
     return this.entity.allProperties.map(prop => this.createEntityValueProp(prop));
   }
 
-  private createEntityValueProp(prop: OverWrittenProperty<DefaultProperty | DefaultAbstractProperty>): EntityValueProperty {
+  private createEntityValueProp(prop: OverWrittenProperty<DefaultProperty | DefaultAbstractProperty>): EntityInstanceProperty {
     const valueControl = this.createFormControl(prop);
     this.subscribeToEntityValueChanges(valueControl, prop);
 
@@ -156,7 +156,7 @@ export class EntityInstanceModalTableComponent implements OnChanges, OnDestroy {
     this.changeDetector.detectChanges();
   }
 
-  changeLanguageSelection(ev: EntityValueProperty, propertyValue: string, index: number): void {
+  changeLanguageSelection(ev: EntityInstanceProperty, propertyValue: string, index: number): void {
     EntityInstanceUtil.changeLanguageSelection(this.propertiesForm, ev, propertyValue, index);
     this.closeAllAutocompletePanels();
     this.changeDetector.detectChanges();
@@ -173,7 +173,7 @@ export class EntityInstanceModalTableComponent implements OnChanges, OnDestroy {
     this.changeDetector.detectChanges();
   }
 
-  addLanguage(entityValueProp: EntityValueProperty): void {
+  addLanguage(entityValueProp: EntityInstanceProperty): void {
     const fieldValidators = entityValueProp.optional ? null : EditorDialogValidators.requiredObject;
     const languagesFormArray = this.propertiesForm.get(entityValueProp.key.property.name) as FormArray;
 
@@ -200,7 +200,7 @@ export class EntityInstanceModalTableComponent implements OnChanges, OnDestroy {
     );
   }
 
-  removeLanguage(entityValueProp: EntityValueProperty, index: number): void {
+  removeLanguage(entityValueProp: EntityInstanceProperty, index: number): void {
     const languagesFormArray = this.propertiesForm.get(entityValueProp.key.property.name) as FormArray;
     languagesFormArray.removeAt(index);
   }

core/libs/editor/src/lib/editor-dialog/components/entity-instance/entity-instance-table/entity-instance-table.component.ts

@@ -29,7 +29,7 @@ import {
   DefaultCollection,
   DefaultEntityInstance,
   DefaultProperty,
-  EntityValueProperty,
+  EntityInstanceProperty,
   OverWrittenProperty,
 } from '@ame/meta-model';
 import {DataType, EditorDialogValidators, EntityInstanceUtil, FormFieldHelper} from '@ame/editor';
@@ -52,7 +52,7 @@ export class EntityInstanceTableComponent extends InputFieldComponent<DefaultEnt
   protected readonly dataType = DataType;
 
   propertiesForm: FormGroup;
-  sources: EntityValueProperty[] = [];
+  sources: EntityInstanceProperty[] = [];
   subscriptions = new Subscription();
 
   filteredEntityValues$: {[key: string]: Observable<any[]>} = {};
@@ -101,7 +101,7 @@ export class EntityInstanceTableComponent extends InputFieldComponent<DefaultEnt
     );
   }
 
-  private createEntityValueProp(prop: OverWrittenProperty<DefaultProperty | DefaultAbstractProperty>): EntityValueProperty {
+  private createEntityValueProp(prop: OverWrittenProperty<DefaultProperty | DefaultAbstractProperty>): EntityInstanceProperty {
     const property = prop.property as DefaultProperty;
     const propertyControl = this.propertiesForm.get(property.name);
 
@@ -132,7 +132,7 @@ export class EntityInstanceTableComponent extends InputFieldComponent<DefaultEnt
     return new FormControl('', prop.keys.optional ? null : EditorDialogValidators.requiredObject);
   }
 
-  private getValidators(entityValueProperty: EntityValueProperty): (control: AbstractControl) => ValidationErrors | null {
+  private getValidators(entityValueProperty: EntityInstanceProperty): (control: AbstractControl) => ValidationErrors | null {
     return entityValueProperty.key.keys.optional ? null : Validators.required;
   }
 
@@ -231,7 +231,7 @@ export class EntityInstanceTableComponent extends InputFieldComponent<DefaultEnt
     this.changeDetector.detectChanges();
   }
 
-  changeLanguageSelection(ev: EntityValueProperty, propertyValue: string, index: number): void {
+  changeLanguageSelection(ev: EntityInstanceProperty, propertyValue: string, index: number): void {
     EntityInstanceUtil.changeLanguageSelection(this.propertiesForm, ev, propertyValue, index);
     this.closeAllAutocompletePanels();
     this.changeDetector.detectChanges();
@@ -248,7 +248,7 @@ export class EntityInstanceTableComponent extends InputFieldComponent<DefaultEnt
     this.changeDetector.detectChanges();
   }
 
-  addLanguage(entityValueProp: EntityValueProperty): void {
+  addLanguage(entityValueProp: EntityInstanceProperty): void {
     const fieldValidators = entityValueProp.optional ? null : EditorDialogValidators.requiredObject;
     const languagesFormArray = this.propertiesForm.get(entityValueProp.key.property.name) as FormArray;
 
@@ -268,7 +268,7 @@ export class EntityInstanceTableComponent extends InputFieldComponent<DefaultEnt
     languagesFormArray.push(languageFormGroup);
   }
 
-  removeLanguage(entityValueProp: EntityValueProperty, index: number): void {
+  removeLanguage(entityValueProp: EntityInstanceProperty, index: number): void {
     const languagesFormArray = this.propertiesForm.get(entityValueProp.key.property.name) as FormArray;
     languagesFormArray.removeAt(index);
   }

core/libs/editor/src/lib/editor-dialog/components/entity-instance/entity-instance-view/entity-instance-view.component.ts

@@ -15,7 +15,7 @@ import {SelectionModel} from '@angular/cdk/collections';
 import {Component, EventEmitter, Input, OnDestroy, OnInit, Output} from '@angular/core';
 import {filter} from 'rxjs/operators';
 import {EntityInstanceModalComponent} from '..';
-import {DefaultEntityInstance, DefaultEnumeration, EntityValueProperty} from '@ame/meta-model';
+import {DefaultEntityInstance, DefaultEnumeration, EntityInstanceProperty} from '@ame/meta-model';
 import {FormControl, FormGroup} from '@angular/forms';
 import {MatDialog} from '@angular/material/dialog';
 import {DataType, FormFieldHelper} from '../../../../helpers/form-field.helper';
@@ -33,7 +33,7 @@ export class EntityInstanceViewComponent implements OnInit, OnDestroy {
   protected readonly dataType = DataType;
 
   public searchFilter: string;
-  public selection: SelectionModel<EntityValueProperty> = new SelectionModel<EntityValueProperty>();
+  public selection: SelectionModel<EntityInstanceProperty> = new SelectionModel<EntityInstanceProperty>();
 
   readonly displayedColumns = ['key', 'value'];
 
@@ -81,7 +81,7 @@ export class EntityInstanceViewComponent implements OnInit, OnDestroy {
     this.complexValues = [];
   }
 
-  trackProperty(_index: number, item: EntityValueProperty): string {
+  trackProperty(_index: number, item: EntityInstanceProperty): string {
     return `${item?.key.property.name}`;
   }