FIX: Use modling component from dmnjs to edit datatype of dmn input e…

…xpression
davidibl · Apr 4, 2020 · ca69b92 · ca69b92
1 parent 5616a6b
commit ca69b92
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/app/components/dmnModeller/dmnModeller.ts b/src/app/components/dmnModeller/dmnModeller.ts
@@ -43,7 +43,7 @@ import { DataModelService } from '../../services/dataModelService';
 import { DmnXmlService } from '../../services/dmnXmlService';
 import { EventService } from '../../services/eventService';
 import { distinctUntilChanged } from 'rxjs/internal/operators/distinctUntilChanged';
-import { DOCUMENT } from "@angular/common";
+import { DOCUMENT } from '@angular/common';
 import { DmnModelService } from '../../services/dmnModelService';
 import { SaveStateService } from '../../services/saveStateService';
 import { ExportService } from '../../services/exportService';
@@ -437,8 +437,14 @@ export class DmnModellerComponent implements AfterViewInit, OnInit {
             });
         this._dataModelService
             .getDatatypeByPath(literalExpression.text)
-            .pipe(take(1), map(type => this.getDmnByJsonType(type)), filter(type => !!type))
-            .subscribe(value => literalExpression.typeRef = value);
+            .pipe(
+                take(1),
+                map(type => this.getDmnByJsonType(type)),
+                filter(type => !!type),
+                filter(type => literalExpression.typeRef !== type))
+            .subscribe(value =>
+                this._modeller.getActiveViewer().get('modeling')
+                    .editInputExpressionTypeRef(literalExpression, value));
     }
 
     private initDrdListeners() {
@@ -542,7 +548,8 @@ export class DmnModellerComponent implements AfterViewInit, OnInit {
                 .pipe(
                     take(1),
                     map(type => this.getDmnByJsonType(type)),
-                    filter(type => !!type)
+                    filter(type => !!type),
+                    filter(type => column.inputExpression.typeRef !== type)
                 )
                 .subscribe(value => {
                     if (column.inputExpression.typeRef === value) { return; }