spring-cloudgh-714 Show DSL validation errors in the CTR UI

kalvarez2 · Apr 16, 2018 · 04760df · 04760df
1 parent b8ae583
commit 04760df
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/ui/src/app/tasks/flo/tools.service.ts b/ui/src/app/tasks/flo/tools.service.ts
@@ -80,7 +80,7 @@ export class ToolsService {
       graph = new Graph(nodes, links);
     }
 
-    return new TaskConversion(body.dsl, null, graph);
+    return new TaskConversion(body.dsl, body.errors, graph);
   }
 
 }
diff --git a/ui/src/app/tasks/task-create-composed-task/task-create-composed-task.component.spec.ts b/ui/src/app/tasks/task-create-composed-task/task-create-composed-task.component.spec.ts
@@ -12,8 +12,9 @@ import { NgBusyModule } from 'ng-busy';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MockSharedAppService } from '../../tests/mocks/shared-app';
 import { MockToolsService } from '../../tests/mocks/mock-tools';
+import { ToolsService } from '../flo/tools.service';
 
-/**
+/**cc
  * Test {@link TaskCreateComposedTaskComponent}.
  *
  * @author Janne Valkealahti
@@ -23,6 +24,7 @@ describe('TaskCreateComposedTaskComponent', () => {
   let fixture: ComponentFixture<TaskCreateComposedTaskComponent>;
   let activeRoute: MockActivatedRoute;
   const metamodelService = new MetamodelService(new MockSharedAppService(), new MockToolsService());
+  const toolsService = new MockToolsService();
 
   const commonTestParams = { id: '1' };
 
@@ -45,7 +47,8 @@ describe('TaskCreateComposedTaskComponent', () => {
         {provide: RenderService},
         {provide: EditorService},
         {provide: BsModalService},
-        {provide: ContentAssistService}
+        {provide: ContentAssistService},
+        {provide: ToolsService, useValue: toolsService}
       ]
     })
       .compileComponents();

diff --git a/ui/src/app/tasks/task-create-composed-task/task-create-composed-task.component.ts b/ui/src/app/tasks/task-create-composed-task/task-create-composed-task.component.ts
@@ -8,6 +8,7 @@ import { RenderService } from '../flo/render.service';
 import { EditorService } from '../flo/editor.service';
 import { TaskCreateComposedTaskDialogComponent } from './task-create-composed-task-dialog.component';
 import * as CodeMirror from 'codemirror';
+import {ToolsService} from "../flo/tools.service";
 
 /**
  * Component handling a creation of a composed task.
@@ -35,7 +36,8 @@ export class TaskCreateComposedTaskComponent implements OnInit, OnDestroy {
   constructor(public metamodelService: MetamodelService,
               public renderService: RenderService,
               public editorService: EditorService,
-              private bsModalService: BsModalService) {
+              private bsModalService: BsModalService,
+              private toolsService: ToolsService) {
 
     this.validationMarkers = new Map();
 
@@ -101,7 +103,34 @@ export class TaskCreateComposedTaskComponent implements OnInit, OnDestroy {
           severity: Flo.Severity[m.severity].toLowerCase()
         }))
       );
-    updateLintingCallback(editor, annotations);
+      const dslText = this.dsl;
+      this.toolsService.parseTaskTextToGraph(dslText).toPromise().then(taskConversion => {
+        if (taskConversion.errors) {
+          taskConversion.errors.forEach(e => annotations.push({
+            from: this.getPosition(dslText, e['position']),
+            to: e['length'] ? this.getPosition(dslText, e['position'] + e['length'])
+              : this.getPosition(dslText, e['position'] + 1),
+            message: e['message'],
+            severity: 'error'
+          }));
+        }
+        updateLintingCallback(editor, annotations);
+      }).catch(error => updateLintingCallback(editor, annotations));
+  }
+
+  getPosition(text: string, offset: number): CodeMirror.Position {
+    let lineStartPosition = 0;
+    let lineNumber = 0;
+    for (let p = 0; p < offset; p++) {
+      if (text.charAt(p) === '\n') {
+        lineNumber++;
+        lineStartPosition = p + 1;
+      }
+    }
+    return {
+      line: lineNumber,
+      ch: offset - lineStartPosition
+    };
   }
 
   get isCreateComposedTaskDisabled(): boolean {