bug-fixes

frontend/angular/src/app/components/edit-message-template/edit-message-template.component.html

@@ -4,7 +4,7 @@
         <div class="ui-g ui-fluid">
             <div class="page-title mb-0">
                 <a [routerLink]="['/admin/list-message-templates']" class="arrow-btn-blue ml-0">
-                    <img src="/assets/images/arrow-left-prev_blue.svg">
+                    <img src="assets/images/arrow-left-prev_blue.svg">
                 </a>
                 {{editMode ? "Edit" : "Add"}} Message Template
             </div>

frontend/angular/src/app/components/edit-workflow-template/edit-workflow-template.component.scss

@@ -69,16 +69,23 @@ p-inputMask {
 }
 
 .ml-0 {
-    margin-left: 0px;
+    margin-left: 0;
 }
 
 .templateName {
     font-size: 24px;
 }
 
+.interactive {
+    cursor: pointer;
+}
+
 label {
     font-family: "Usual-Regular";
     font-weight: 300;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
 }
 
 .calcField {

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

 import { Component, OnInit, ViewChild } from '@angular/core';
 import { NgForm } from '@angular/forms';
 import { ActivatedRoute, Params, Router } from '@angular/router';
+import { DndDropEvent } from 'ngx-drag-drop';
 import { ConfirmationService } from 'primeng/api';
 import { Dialog } from 'primeng/dialog';
 import { combineLatest } from 'rxjs/observable/combineLatest';
@@ -21,7 +22,6 @@ import { UtilsService } from '../../oneit/services/utils.service';
 import { AdminPortalLayoutService } from '../admin-portal/admin-portal-layout/admin-portal-layout.service';
 import { BaseComponent } from '../base/base.component';
 import { EditWorkflowTemplateService } from './edit-workflow-template.service';
-import { DndDropEvent } from "ngx-drag-drop";
 
 @Component({
     selector: 'app-edit-workflow-template',
@@ -51,6 +51,8 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
     showLoader = false;
     editMode = false;
     displayNewMessageTemplate = false;
+    draggingItem: any = null;
+    draggingId = null;
     selectedTemplateID = null;
     selectedMessageTemplate = null; // object id of type WorkflowMessageModel
 
@@ -154,6 +156,12 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
         this.filterStages();
     }
 
+    reOrderSteps(): void {
+        this.workflow.WorkFlowStages.forEach(stage => {
+            stage.Steps.sort((a, b) => a.SortOrder < b.SortOrder ? -1 : a.SortOrder > b.SortOrder ? 1 : 0);
+        });
+    }
+
     isGeneric(stage: WorkflowStageModel): boolean {
         return !stage.StageType.IsPostStage && !stage.StageType.IsPreStage;
     }
@@ -174,8 +182,11 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
     }
 
     showSaveCopyBtn(): boolean {
-        return this.workflow && this.workflow.ObjectID ?
-                (!!this.workflow.HiringTeam) : false;
+        if (this.workflow && this.workflow.ObjectID) {
+            return this.workflow.HiringTeam === null;
+        }
+
+        return false;
     }
 
     getStageHeader(stage: WorkflowStageModel): string {
@@ -188,11 +199,11 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
 
     filteredStages(isPreStage: boolean, isPostStage: boolean): Array<WorkflowStageModel> {
         if (isPreStage) {
-            return this.workflow.WorkFlowStages.filter(stage => stage.StageType.IsPreStage)
+            return this.workflow.WorkFlowStages.filter(stage => stage.StageType.IsPreStage);
         } else if (isPostStage) {
-            return this.workflow.WorkFlowStages.filter(stage => stage.StageType.IsPostStage)
+            return this.workflow.WorkFlowStages.filter(stage => stage.StageType.IsPostStage);
         } else {
-            return this.workflow.WorkFlowStages.filter(stage => !stage.StageType.IsPreStage && !stage.StageType.IsPostStage)
+            return this.workflow.WorkFlowStages.filter(stage => !stage.StageType.IsPreStage && !stage.StageType.IsPostStage);
         }
     }
 
@@ -236,6 +247,11 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
     }
 
     generateDelayString(message: WorkflowMessageModel): void {
+
+        if (!message.Delay) {
+            return;
+        }
+
         const delay = message.Delay.replace(/_/g, '')
             .split(':');
 
@@ -355,11 +371,20 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
     }
 
     removeStep(step: WorkflowStepModel, stage: WorkflowStageModel): void {
+        this.confirmationService.confirm({
+            message: 'Are you sure you want to delete this record?',
+            header: 'Delete Confirmation',
+            icon: 'fa fa-trash',
+            key: 'RemoveRow',
+            accept: () => {
                 const stepType = step.StepType;
+
                 this.utilsService.removeMultiRefObject(step, stage, 'Steps', this.createdObjs, this.updatedObjs, this.deletedObjs);
                 this.reAssignStepOrders(stage);
                 this.addStepType(stepType);
             }
+        });
+    }
 
     removeStepType(step: StepTypeEnum): void {
         this.stepTypes.splice(this.stepTypes.findIndex(elem => elem.Value === step.Value), 1);
@@ -458,19 +483,18 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
                     this.utilsService.addObjsToJSONByObjectID(this.updatedObjs, this.workflow.WorkFlowStages);
                     this.workflow.WorkFlowStages = this.workflow.WorkFlowStages || [];
                     this.workflow.WorkFlowStages.forEach(stage => {
-                                this.updatedObjs[stage.ObjectID] = stage
-
+                        this.updatedObjs[stage.ObjectID] = stage;
 
                         stage.Steps = stage.Steps || [];
                         stage.WorkFlowMessages = stage.WorkFlowMessages || [];
 
                         stage.WorkFlowMessages.forEach(msg => {
-                                    this.generateDelayString(msg)
+                            this.generateDelayString(msg);
                         });
 
                         stage.Steps.forEach(step => {
                             this.removeStepType(step.StepType);
-                                })
+                        });
 
                         this.utilsService.addObjsToJSONByObjectID(this.updatedObjs, stage.WorkFlowMessages);
                         this.utilsService.addObjsToJSONByObjectID(this.updatedObjs, stage.Steps);
@@ -478,6 +502,7 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
                     });
 
                     this.reOrderStages();
+                    this.reOrderSteps();
                     this.showLoader = false;
                 },
                 error => {
@@ -516,15 +541,11 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
         }
     }
 
-
     onDragStart(item, list, listId): void {
         this.draggingItem = list.find(listItem => listItem.ObjectID === item.ObjectID);
         this.draggingId = listId;
     }
 
-    draggingItem: any = null;
-    draggingId = null;
-
     onDragEnd(event): void {
         setTimeout(() => {
             this.draggingItem = null;
@@ -532,13 +553,13 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
         });
     }
 
-    onDrop(event: DndDropEvent, list?: any[], draggingId?: any): void {
+    onDrop(event: DndDropEvent, list?: Array<any>, draggingId?: any): void {
         if (draggingId !== this.draggingId) {
             return;
         }
         let index = event.index;
 
-        if (typeof index === "undefined") {
+        if (typeof index === 'undefined') {
 
             index = list.length;
         }
@@ -553,10 +574,9 @@ export class EditWorkflowTemplateComponent extends BaseComponent implements OnIn
             list.splice(index, 0, this.draggingItem);
         }
 
-
-        list.forEach((item, index) => {
-            item.SortOrder = index;
-        })
+        list.forEach((item, i) => {
+            item.SortOrder = i;
+        });
     }
 
 // tslint:disable-next-line:max-file-line-count

frontend/angular/src/assets/css/custom.scss

@@ -108,6 +108,16 @@
 /* End listing of message and workflow template styling */
 
 /* Panel Styling */
+
+.messaging {
+    .ui-panel {
+        .ui-panel-content {
+            padding-left: 0 !important;
+            padding-right: 0 !important;
+        }
+    }
+}
+
 .ui-panel {
     margin-right: auto;
     margin-left: auto;
@@ -202,6 +212,16 @@
     }
 }
 
+/* End styling select button*/
+
+.ui-multiselect {
+    border-bottom: 0 !important;
+}
+
+.dropdown-text {
+    width: 75% !important;
+}
+
 .h-80 {
     height: 80px;
 }