Merge pull request #877 from TIBCOSoftware/fix-run-error-handler

Fix run from root activity and error handler issue

src/client/flogo/core/services/restapi/run-api.service.ts

@@ -1,3 +1,4 @@
+import { get, filter as _filter } from 'lodash';
 import { Inject, Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 
@@ -102,10 +103,10 @@ export class RunApiService {
   //  the using this.runState.processInstanceId to restart
   restartFrom(processInstanceId: string, step: number, interceptor: Interceptor, updateProcessId?: string): Observable<RestartResponse> {
     // get the state of the last step
-    const snapshotId = step - 1;
-    if (snapshotId < 0) {
+    if (step < 0) {
       return _throw(new Error(`Invalid step ${step} to start from.`));
     }
+    const snapshotId = step !== 0 ? step : 1;
 
     return this.getSnapshot(processInstanceId, snapshotId)
       .pipe(
@@ -115,7 +116,7 @@ export class RunApiService {
           return this.fetch(`flows/run/flows/${updateProcessId}`)
             .pipe(
               map(flowInfo => {
-                const links = _.get(flowInfo, 'rootTask.links', []);
+                const links = get(flowInfo, 'rootTask.links', []);
                 return { snapshot, links };
               })
             );
@@ -173,12 +174,12 @@ export class RunApiService {
     let taskData = snapshot.rootTaskEnv.taskDatas || [];
 
     // filter out the tasks that are not in the path
-    workQueue = _.filter(workQueue, (queueItem: any) => {
+    workQueue = _filter(workQueue, (queueItem: any) => {
       return taskIds.indexOf(queueItem.taskID) !== -1;
     });
 
     // filter out the tasks that are not in the path
-    taskData = _.filter(taskData, (taskDatum: any) => {
+    taskData = _filter(taskData, (taskDatum: any) => {
       return taskDatum.taskId === '1' || taskDatum.taskId === 1 || taskIds.indexOf(taskDatum.taskId) !== -1;
     });
 
@@ -192,7 +193,7 @@ export class RunApiService {
   // TODO: left algorithm as it was when refactored, need to make it clearer
   private findTaskIdsInLinkPath(tasks: InterceptorTask[], links: flowToJSON_Link[]) {
     // TODO: icpt, what does it mean?? for icpTaskIds
-    const tasksIdsInPath: string[] = _.map(tasks, (task: any) => task.id);
+    const tasksIdsInPath: string[] = (tasks || []).map((task: any) => task.id);
     let linksToGo = links.slice();
     let lastLinksToGoLength = linksToGo.length;
 
@@ -209,7 +210,7 @@ export class RunApiService {
 
     // once the linksToGo stay the same or empty, then finish
     while (linksToGo.length) {
-      linksToGo = _.filter(linksToGo, filterLinksAndAccumulateTasks);
+      linksToGo = _filter(linksToGo, filterLinksAndAccumulateTasks);
       if (lastLinksToGoLength === linksToGo.length) {
         break;
       }

src/client/flogo/flow/core/state/flow/flow.selectors.ts

@@ -60,7 +60,7 @@ export const getCurrentHandlerId = createSelector(
 );
 
 export const getCurrentGraph = createSelector(selectFlowState, getCurrentHandlerId, (flowState, currentHandlerId) => {
-  return flowState[getGraphName(currentHandlerId)];
+  return flowState[getGraphName(currentHandlerId)] as FlowGraph;
 });
 
 export const getSelectionForCurrentHandler = createSelector(
@@ -155,6 +155,18 @@ export const getIsRunDisabledForSelectedActivity = createSelector(
   },
 );
 
+export const isCurrentSelectionRoot = createSelector(
+  getSelectedActivity,
+  getCurrentGraph,
+  (activity, currentGraph): boolean => activity && currentGraph && currentGraph.rootId === activity.id
+);
+
+export const getIsRestartableTask = createSelector(
+  getCurrentHandlerType,
+  isCurrentSelectionRoot,
+  (handlerType, isRoot) => handlerType !== HandlerType.Error && !isRoot,
+);
+
 export const getCurrentActivityExecutionErrors = createSelector(
   getSelectedActivity,
   getCurrentNodes,

src/client/flogo/flow/core/test-runner/run-orchestrator.service.spec.ts

@@ -186,6 +186,37 @@ describe('Service: RunOrchestratorService', function (this: {
 
     });
 
+    it('Should not send error handler if empty', () => {
+      spyOn(flowUtils, 'flogoFlowToJSON').and.returnValue({ id: 'transformed-flow', flow: { errorHandlerTask: { tasks: {} } } });
+      const storeProcessMock = <jasmine.Spy> this.runServiceMock.storeProcess;
+      storeProcessMock.and.returnValue(of({ id: '456' }));
+
+      const testFlow = <any> { name: 'test-flow' };
+      return this.service.registerFlowIfNeeded({ useFlow: <UiFlow>testFlow })
+        .toPromise()
+        .then(() => {
+          expect(storeProcessMock.calls.mostRecent().args[0].flow.errorHandlerTask)
+            .toBeUndefined('Was not expecting error handler to be present');
+        });
+    });
+
+    it('Should send error flow if not empty', () => {
+      spyOn(flowUtils, 'flogoFlowToJSON').and.returnValue({
+        id: 'transformed-flow',
+        flow: { errorHandlerTask: { tasks: { 'hi': { id: 'hi' } } } } }
+      );
+      const storeProcessMock = <jasmine.Spy> this.runServiceMock.storeProcess;
+      storeProcessMock.and.returnValue(of({ id: '456' }));
+
+      const testFlow = <any> { name: 'test-flow' };
+      return this.service.registerFlowIfNeeded({ useFlow: <UiFlow>testFlow })
+        .toPromise()
+        .then(() => {
+          expect(storeProcessMock.calls.mostRecent().args[0].flow.errorHandlerTask)
+            .toBeDefined('Was expecting error handler to be present but it was not present');
+        });
+    });
+
   });
 
   describe('::streamSteps', () => {

src/client/flogo/flow/core/test-runner/run-orchestrator.service.ts

@@ -5,7 +5,7 @@ import {
 import { Injectable } from '@angular/core';
 import { Observable, combineLatest, merge, timer, of, throwError as _throw } from 'rxjs';
 
-import { isEqual, defaults } from 'lodash';
+import { isEqual, isEmpty, defaults } from 'lodash';
 
 import { Interceptor, Step, UiFlow } from '@flogo/core';
 import {
@@ -313,6 +313,10 @@ export class RunOrchestratorService {
     if (opts.useFlow) {
       // generate process based on the current flow
       const process = flogoFlowToJSON(opts.useFlow);
+      const errorHandler = process.flow && process.flow.errorHandlerTask;
+      if (errorHandler && isEmpty(errorHandler.tasks)) {
+        delete process.flow.errorHandlerTask;
+      }
 
       //  delete the id of the flow,
       //  since the same process ID returns 204 No Content response and cannot be updated,

src/client/flogo/flow/core/test-runner/test-runner.service.ts

@@ -93,8 +93,8 @@ export class TestRunnerService implements OnDestroy {
             throw new Error('Cannot find proper step to restart from, skipping...');
           }
 
-          const step = this.getStepNumberFromSteps(taskId);
-          if (!step) {
+          const stepNumber = this.getStepNumberFromSteps(taskId);
+          if (stepNumber < 0) {
             // TODO
             //  handling the case that trying to start from the middle of a path without run from the trigger for the first time.
             throw new Error(`Cannot start from task ${(<any>selectedTask).name} (${selectedTask.id})`);
@@ -112,7 +112,7 @@ export class TestRunnerService implements OnDestroy {
           return this.orchestrator.rerun({
             useFlow: flowState,
             interceptor: dataOfInterceptor,
-            step: step,
+            step: stepNumber,
             instanceId: flowState.lastFullExecution.instanceId,
           });
         }),
@@ -139,20 +139,11 @@ export class TestRunnerService implements OnDestroy {
   //  get step index logic should be based on the selected snapshot,
   //  hence need to be refined in the future
   private getStepNumberFromSteps(taskId: string) {
-    let stepNumber = 0;
-    // firstly try to get steps from the last process instance running from the beginning,
-    // otherwise use some defauts
+    // try to get steps from the last process instance running from the beginning,
+    // otherwise use some defaults
     const steps = get(this.runState.lastProcessInstanceFromBeginning, 'steps', this.runState.steps || []);
-
-    steps.forEach((step: any, index: number) => {
-      // allowing double equals for legacy ids that were of type number
-      /* tslint:disable-next-line:triple-equals */
-      if (step.taskId == taskId) {
-        stepNumber = index + 1;
-      }
-    });
-
-    return stepNumber;
+    /* tslint:disable-next-line:triple-equals - allowing double equals for legacy ids that were of type number */
+    return steps.findIndex(step => step.taskId == taskId);
   }
 
 

src/client/flogo/flow/debug-panel/debug-panel.component.html

@@ -23,6 +23,7 @@
       [executionErrors]="executionErrrors$ | async"
       [activityHasRun]="activityHasRun$ | async"
       [flowHasRun]="flowHasRun$ | async"
+      [canRestart]="isRestartableTask$ | async"
       [runDisabled]="isRunDisabled$ | async"
       [isEndOfFlow]="isEndOfFlow$ | async"
       (runFromHere)="run()"></flogo-flow-debug-panel-content>

src/client/flogo/flow/debug-panel/debug-panel.component.ts

@@ -52,6 +52,7 @@ export class DebugPanelComponent implements OnInit, OnDestroy {
   activityHasRun$: Observable<boolean>;
   executionErrrors$: Observable<Array<string>>;
   isEndOfFlow$: Observable<boolean>;
+  isRestartableTask$: Observable<boolean>;
 
   private destroy$ = SingleEmissionSubject.create();
 
@@ -67,6 +68,7 @@ export class DebugPanelComponent implements OnInit, OnDestroy {
     this.activity$ = selectAndShare(FlowSelectors.getSelectedActivity);
     this.isRunDisabled$ = selectAndShare(FlowSelectors.getIsRunDisabledForSelectedActivity);
     this.executionErrrors$ = selectAndShare(FlowSelectors.getCurrentActivityExecutionErrors);
+    this.isRestartableTask$ =  selectAndShare(FlowSelectors.getIsRestartableTask);
 
     const schema$ = selectAndShare(FlowSelectors.getSelectedActivitySchema);
 

src/client/flogo/flow/debug-panel/error/error.component.html

@@ -1,7 +1,7 @@
 <div class="fields-title" translate="DEBUGGER:ERROR-TITLE"></div>
 <div class="form-group">
-  <ng-container *ngIf="!renderableError?.translate; else emptyError">
-    <textarea disabled class="form-control tc-text-areas tc-text-area field" value="{{ renderableError.msg | translate }}"></textarea>
+  <ng-container *ngIf="renderableError?.translate; else emptyError">
+    <textarea disabled class="form-control tc-text-areas tc-text-area field">{{ renderableError.msg | translate }}</textarea>
   </ng-container>
   <ng-template #emptyError>
     <textarea disabled class="form-control tc-text-areas tc-text-area field" [value]="renderableError.msg"></textarea>

src/client/flogo/flow/debug-panel/panel-content/panel-content.component.html

@@ -4,7 +4,8 @@
       <div class="activity__name">{{ activity.name }}</div>
       <div class="activity__id">ID: {{ activity.id }}</div>
       <div class="activity__description">{{ activity.description }}</div>
-      <button class="flogo-button--secondary btn-run" [disabled]="runDisabled" (click)="onRun()">{{ 'DEBUGGER:BUTTON-RUN-FROM-TILE' | translate }}</button>
+      <button *ngIf="canRestart" class="flogo-button--secondary btn-run"
+              [disabled]="runDisabled" (click)="onRun()">{{ 'DEBUGGER:BUTTON-RUN-FROM-TILE' | translate }}</button>
     </div>
     <ng-container *ngIf="executionErrors?.length > 0; then errorDisplay else activityFields"></ng-container>
   </div>

src/client/flogo/flow/debug-panel/panel-content/panel-content.component.ts

@@ -13,6 +13,7 @@ export class PanelContentComponent implements OnChanges {
   @Input() activity: ItemActivityTask;
   @Input() fields: FieldsInfo;
   @Input() executionErrors?: Array<string>;
+  @Input() canRestart: boolean;
   @Input() runDisabled: boolean;
   @Input() isEndOfFlow: boolean;
   @Input() activityHasRun: boolean;