bug-fixes

frontend/angular/src/app/components/admin-portal/edit-workflow-template/edit-workflow-template.component.html

@@ -527,5 +527,10 @@
         </p-panel>
         <!-- End displaying messages -->
         <hr/>
+        <div class="ui-g-12 ui-md-6">
+            <button (click)="removeStage(stage)" [disabled]="showLoader"
+                    class="btn btn-primary add-more-btn">Remove Stage
+            </button>
+        </div>
     </div>
 </ng-template>

frontend/angular/src/app/components/admin-portal/edit-workflow-template/edit-workflow-template.component.ts

@@ -238,10 +238,16 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
     toggleInput(event, fieldName, value): void {
         this.utilsService.clearErrorMessages();
         if (value === false) {
-            if (!this.form.controls[fieldName].invalid) {
-                this.editField[fieldName] = false;
+            if (this.form.controls[fieldName]) {
+                if (!this.form.controls[fieldName].invalid) {
+                    this.editField[fieldName] = false;
+                } else {
+                    this.utilsService.showAllErrorMessages();
+                }
             } else {
-                this.utilsService.showAllErrorMessages();
+                if (event.target.value !== '') {
+                    this.editField[fieldName] = false;
+                }
             }
         } else {
             this.editField[fieldName] = true;
@@ -501,12 +507,13 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
         this.utilsService.resetCounter();
         this.utilsService.clearErrorMessages();
 
-        const assoc = [ASSOCS.WORKFLOW_STAGE, [ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_MESSAGE].join('.'),
+        const assoc = [ASSOCS.WORKFLOW_STAGE, [ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_MESSAGE, ASSOCS.MESSAGE_TEMPLATE].join('.'),
             [ASSOCS.WORKFLOW_STAGE, ASSOCS.WORKFLOW_STEP].join('.')];
 
         this.subscriptions.push(this.editWorkflowTemplateService.getWorkflowTemplateByID(id, assoc)
             .subscribe(
                 data => {
+                    console.log(data);
                     this.workflow = data;
                     this.updatedObjs[this.workflow.ObjectID] = this.workflow;
                     this.utilsService.addObjsToJSONByObjectID(this.updatedObjs, this.workflow.WorkFlowStages);
@@ -527,6 +534,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
                         this.utilsService.addObjsToJSONByObjectID(this.updatedObjs, stage.WorkFlowMessages);
                         this.utilsService.addObjsToJSONByObjectID(this.updatedObjs, stage.Steps);
                     });
+                    console.log(this.workflow);
 
                     this.reOrderStages();
                     this.reOrderSteps();

frontend/angular/src/app/constants.ts

@@ -26,5 +26,6 @@ export const SEARCH = {
 export const ASSOCS = {
     WORKFLOW_STAGE: 'WorkFlowStages',
     WORKFLOW_MESSAGE: 'WorkFlowMessages',
-    WORKFLOW_STEP: 'Steps'
+    WORKFLOW_STEP: 'Steps',
+    MESSAGE_TEMPLATE: 'MessageTemplate'
 };

frontend/angular/src/app/models/workflow-message.model.ts

@@ -13,7 +13,7 @@ export class WorkflowMessageModel {
     BusinessHoursOnly: boolean;
     IsWithdrawalMessage: boolean;
     ApplicantSources: Array<ApplicantSourcesEnum>;
-    MessageTemplate: MessageTemplateModel | string;
+    MessageTemplate: MessageTemplateModel;
     WorkFlowStage: string;
 
     constructor(wfStageID: string) {