Fix problem when creating new instance on overlay (#188)

* Fix problem when creating new instance on overlay

* Update entity-instance-table.component.ts

Author: michelu89

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

@@ -37,6 +37,7 @@ import {InputFieldComponent} from '../../fields';
 import {map, Observable, of, startWith, Subscription} from 'rxjs';
 import * as locale from 'locale-codes';
 import {MatAutocompleteTrigger} from '@angular/material/autocomplete';
+import {isDataTypeLangString} from '@ame/shared';
 
 @Component({
   selector: 'ame-entity-instance-table',
@@ -164,14 +165,28 @@ export class EntityInstanceTableComponent extends InputFieldComponent<DefaultEnt
     return propertiesFormArray;
   }
 
-  private createValueControl(propertyValue: string | number | boolean | DefaultEntityInstance, validators): FormControl {
+  private createValueControl(
+    propertyValue: string | number | boolean | DefaultEntityInstance,
+    validators: ValidationErrors | null,
+  ): FormControl {
     const isEntityValue = propertyValue instanceof DefaultEntityInstance;
     return new FormControl({value: propertyValue, disabled: isEntityValue}, validators);
   }
 
-  private addLanguageControl(group: UntypedFormGroup, propertyLanguage: string, validators, property): void {
-    if (propertyLanguage) {
-      const languageControl = new FormControl({value: propertyLanguage, disabled: true}, validators);
+  private addLanguageControl(
+    group: UntypedFormGroup,
+    propertyLanguage: string,
+    validators: ValidationErrors | null,
+    property: DefaultProperty,
+  ): void {
+    if ((propertyLanguage || propertyLanguage === '') && isDataTypeLangString(property)) {
+      const languageControl = new FormControl(
+        {
+          value: propertyLanguage,
+          disabled: propertyLanguage !== '',
+        },
+        validators,
+      );
       this.subscribeToLangValueChanges(languageControl, property);
       group.addControl('language', languageControl);
     }

core/libs/editor/src/lib/editor-dialog/editor-dialog.module.ts

@@ -98,7 +98,14 @@ import {SharedSettingsTitleComponent} from './components/shape-settings/shared-s
 import {LanguageTranslateModule} from '@ame/translation';
 import {ElementIconComponent} from '../../../../shared/src/lib/components/element/element.component';
 import {MatDividerModule} from '@angular/material/divider';
-import { EntityInstanceComponent, EntityInstanceModalComponent, EntityInstanceModalTableComponent, EntityInstanceSearchBarComponent, EntityInstanceTableComponent, EntityInstanceViewComponent } from './components/entity-instance';
+import {
+  EntityInstanceComponent,
+  EntityInstanceModalComponent,
+  EntityInstanceModalTableComponent,
+  EntityInstanceSearchBarComponent,
+  EntityInstanceTableComponent,
+  EntityInstanceViewComponent,
+} from './components/entity-instance';
 
 @NgModule({
   providers: [EditorModelService],

core/libs/meta-model/src/lib/aspect-meta-model/default-entity-value.ts

@@ -54,7 +54,7 @@ export class DefaultEntityInstance extends Base implements EntityValue {
     this.properties = properties?.map(key => ({key, value: ''})) || [];
   }
 
-  public addProperty(overWrittenProperty: OverWrittenProperty<any>, value: string | DefaultEntityInstance = '', language?: string) {
+  public addProperty(overWrittenProperty: OverWrittenProperty<any>, value: string | DefaultEntityInstance = '', language = '') {
     this.properties.push({key: overWrittenProperty, value, language});
   }
 

core/libs/meta-model/src/lib/element-service/entity-model.service.ts

@@ -23,7 +23,14 @@ import {
   MxGraphShapeOverlayService,
   MxGraphVisitorHelper,
 } from '@ame/mx-graph';
-import {Base, BaseMetaModelElement, DefaultEntity, DefaultEntityInstance, DefaultEnumeration, OverWrittenPropertyKeys} from '@ame/meta-model';
+import {
+  Base,
+  BaseMetaModelElement,
+  DefaultEntity,
+  DefaultEntityInstance,
+  DefaultEnumeration,
+  OverWrittenPropertyKeys,
+} from '@ame/meta-model';
 import {SammLanguageSettingsService} from '@ame/settings-dialog';
 import {BaseEntityModelService} from './base-entity-model.service';
 

core/libs/mx-graph/src/lib/services/mx-graph.service.ts

@@ -551,7 +551,9 @@ export class MxGraphService {
   public updateEntityValuesWithCellReference(deletedEntityValueCells: Array<mxgraph.mxCell>): void {
     deletedEntityValueCells
       .filter(entityValueCell => entityValueCell.isVertex())
-      .forEach(entityValueCell => this.updateEntityValuesWithReference(MxGraphHelper.getModelElement<DefaultEntityInstance>(entityValueCell)));
+      .forEach(entityValueCell =>
+        this.updateEntityValuesWithReference(MxGraphHelper.getModelElement<DefaultEntityInstance>(entityValueCell)),
+      );
   }
 
   private applyDelta(cell: mxgraph.mxCell, deltaX: number, deltaY: number, formattedCells: mxgraph.mxCell[]) {