From 5487b976a1d9899a92937e80cbe9aeb92a68c1e2 Mon Sep 17 00:00:00 2001
From: VijayalakshmiSF4471
 <164475295+VijayalakshmirSF4471@users.noreply.github.com>
Date: Fri, 27 Dec 2024 10:31:00 +0530
Subject: [PATCH 1/2] feature(405222): integrate add API to workflow designer

---
 src/app/api/workflowDesignerAPI.ts            |  2 +
 .../workflow-diagram.component.html           |  2 +-
 .../workflow-diagram.component.ts             |  4 +-
 .../workflow-sidebar.component.ts             | 54 +++++++++++++------
 src/app/models/appModel.ts                    | 25 ++++++---
 src/app/services/workflow.service.ts          |  8 ++-
 6 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/src/app/api/workflowDesignerAPI.ts b/src/app/api/workflowDesignerAPI.ts
index 789b5eb..bde24c5 100644
--- a/src/app/api/workflowDesignerAPI.ts
+++ b/src/app/api/workflowDesignerAPI.ts
@@ -1,11 +1,13 @@
 export interface WorkflowListPathsType {
     readonly updateWorkflowRules: string;
     readonly deleteWorkflowRules: string;
+    readonly addWorkflowRules: string;
 }
 
 const apiPaths: WorkflowListPathsType = {
     updateWorkflowRules: `{baseUrl}/{workflowId}/rules/{ruleId}/update`,
     deleteWorkflowRules: `{baseUrl}/{ruleId}/rules`,
+    addWorkflowRules: `{baseUrl}`
 }
 
 export const WorkflowApiPaths: WorkflowListPathsType = apiPaths;
\ No newline at end of file
diff --git a/src/app/components/workflow-diagram/workflow-diagram.component.html b/src/app/components/workflow-diagram/workflow-diagram.component.html
index e0dfbfa..3e5b318 100644
--- a/src/app/components/workflow-diagram/workflow-diagram.component.html
+++ b/src/app/components/workflow-diagram/workflow-diagram.component.html
@@ -135,7 +135,7 @@
 
 </div>
 
-<app-workflow-sidebar #workflowSidebar [nodeEditType]="nodeEditType" [nodeBlockType]="nodeBlockType" [sidebarHeader]="sidebarHeader" [selectedBlockId]="selectedBlockId" [selectedWorkFlowId]="selectedWorkFlowId" (addNodeAndConnect)="onaddNodeAndConnect($event)" (updateNode)="onUpdateNode($event)"></app-workflow-sidebar>
+<app-workflow-sidebar #workflowSidebar [nodeEditType]="nodeEditType" [nodeBlockType]="nodeBlockType" [sidebarHeader]="sidebarHeader" [clickedNodeRuleId]="clickedNodeRuleId" [selectedWorkFlowId]="selectedWorkFlowId" (diagramRefresh)="onDiagramRefresh()" (updateNode)="onUpdateNode($event)"></app-workflow-sidebar>
 
 <!-- <div style="display: none;">
   <ejs-uploader #defaultupload id='fileupload' (success)='onUploadSuccess($event)' [asyncSettings]='asyncSettings'></ejs-uploader>
diff --git a/src/app/components/workflow-diagram/workflow-diagram.component.ts b/src/app/components/workflow-diagram/workflow-diagram.component.ts
index 7167071..fbee57f 100644
--- a/src/app/components/workflow-diagram/workflow-diagram.component.ts
+++ b/src/app/components/workflow-diagram/workflow-diagram.component.ts
@@ -97,6 +97,7 @@ export class WorkflowDiagramComponent implements AfterViewInit {
   public nodeEditType!: number;
   public selectedBlockId!: string;
   public selectedWorkFlowId!: number;
+  public clickedNodeRuleId: number;
 
   public dataSourceSettings!: DataSourceModel;
 
@@ -197,6 +198,7 @@ export class WorkflowDiagramComponent implements AfterViewInit {
         this.diagram.selectedItems.userHandles[2].visible = false;
       }
        this.selectedBlockId = clickedBlock.id;
+       this.clickedNodeRuleId = (clickedBlock.data as RuleData2).id;
        this.selectedWorkFlowId = this.workflowID;
     }
   }
@@ -206,7 +208,7 @@ export class WorkflowDiagramComponent implements AfterViewInit {
   }
 
   // Method to add a new node and connect it
-  public onaddNodeAndConnect([sourceNodeId, newNode]: [string, NodeModel]): void {
+  public onDiagramRefresh(): void {
     this.diagram.setProperties({ nodes: [], connectors: [] }, true);
     this.diagram.refresh();
   }
diff --git a/src/app/components/workflow-sidebar/workflow-sidebar.component.ts b/src/app/components/workflow-sidebar/workflow-sidebar.component.ts
index ded2f3b..a85bf01 100644
--- a/src/app/components/workflow-sidebar/workflow-sidebar.component.ts
+++ b/src/app/components/workflow-sidebar/workflow-sidebar.component.ts
@@ -3,11 +3,13 @@ import { SidebarComponent, SidebarModule } from '@syncfusion/ej2-angular-navigat
 import { TextFormatEnum, ChatWorkflowEditorTypeEnum, ChatWorkflowBlockTypeEnum } from '../../models/enum';
 import { FormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
-import { FieldDetails, FieldOptionDetail, FieldValidation, MessageDetails, RuleData2 } from '../../models/appModel';
+import { ChatWorkflowAddRuleRequest, FieldDetails, FieldOptionDetail, FieldValidation, MessageDetails, RuleData2 } from '../../models/appModel';
 import { NodeModel } from '@syncfusion/ej2-angular-diagrams';
 import { DropDownListComponent, DropDownListModule } from '@syncfusion/ej2-angular-dropdowns';
 import { DatePickerModule, DateTimePickerModule } from '@syncfusion/ej2-angular-calendars';
 import { ButtonModule, SwitchModule } from '@syncfusion/ej2-angular-buttons';
+import { WorkflowService } from '../../services/workflow.service';
+import { HttpErrorResponse } from '@angular/common/http';
 
 
 @Component({
@@ -50,7 +52,6 @@ export class WorkflowSidebarComponent {
   public isEdit: boolean = false;
   public isEditButton: boolean = false;
   public editIndex: number = -1;
-  public soureId: string = "";
   public addOption: boolean = false;
   public newNodeInfo: any;
   private updatePending = false;
@@ -62,13 +63,12 @@ export class WorkflowSidebarComponent {
   @Input() nodeEditType!: number;
   @Input() nodeBlockType!: number;
   @Input() sidebarHeader!: string;
-  @Input() selectedBlockId!: string;
+  @Input() clickedNodeRuleId!: number;
   @Input() selectedWorkFlowId!: number;
-  @Output() addNodeAndConnect = new EventEmitter<[string, NodeModel]>();
-  @Output() updateNode = new EventEmitter<[string, RuleData2]>();
+  @Output() diagramRefresh = new EventEmitter();
+  @Output() updateNode = new EventEmitter<[number, RuleData2]>();
 
-
-  constructor() {
+  constructor(private workflowService: WorkflowService) {
     this.textFormatDDLOptions = this.enumToArray(TextFormatEnum);
   }
 
@@ -96,12 +96,12 @@ export class WorkflowSidebarComponent {
   // Add the new block
   onAddCloseSideBarClick(): void {
     this.sidebar?.hide();
-    this.addOrUpdateBlock(this.selectedBlockId);
+    this.addOrUpdateBlock(this.clickedNodeRuleId);
     this.removeSetBlockValues();
   }
   // Update the existing block
   onUpdateCloseSideBarClick(): void {
-    this.addOrUpdateBlock(this.soureId)
+    this.addOrUpdateBlock(this.clickedNodeRuleId)
     this.sidebar?.hide();
     this.removeSetBlockValues();
   }
@@ -171,7 +171,7 @@ export class WorkflowSidebarComponent {
   setBlockValues(nodeInfo: NodeModel) {
     this.isEdit = true;
     let nodeDetails = nodeInfo.data as RuleData2;
-    this.soureId = nodeInfo?.id ?? "";
+    this.clickedNodeRuleId = nodeDetails.id;
     this.nodeBlockType = nodeDetails.chatWorkflowBlockId;
     this.nodeEditType = nodeDetails.chatWorkflowEditorTypeId ?? 0;
     this.sideBarLabel = nodeDetails.fieldDetails?.label as string;
@@ -198,10 +198,9 @@ export class WorkflowSidebarComponent {
     this.addOption = false;
     this.editIndex = -1;
     this.checkedIsPrivate = false;
-    this.ddlTextFormat.value = TextFormatEnum.Text
   }
   // Construct the add or update block details
-  addOrUpdateBlock(sourceNodeId: string) {
+  addOrUpdateBlock(clickedNodeRuleId: number) {
     switch (this.nodeBlockType) {
       case (this.chatWorkflowBlockTypeEnum.SendTextMessage): {
         let messageInfo: MessageDetails = {
@@ -309,14 +308,38 @@ export class WorkflowSidebarComponent {
       }
     }
     if (this.isEdit) {
-      this.updateNode.emit([sourceNodeId, this.newNodeInfo]);
+      this.updateNode.emit([this.clickedNodeRuleId, this.newNodeInfo]);
     }
     else {
-      this.newNode = this.createNode(this.newNodeWidth, this.newNodeHeight, this.newNodeInfo);
-      this.addNodeAndConnect.emit([sourceNodeId, this.newNode]);
+      this.onAddRule();
+        // this.newNode = this.createNode(this.newNodeWidth, this.newNodeHeight, this.newNodeInfo);
     }
   }
 
+  public onAddRule(): void {
+    var addRuleRequest : ChatWorkflowAddRuleRequest = {
+      previousWorkflowRuleId: this.clickedNodeRuleId,
+      chatWorkflowId: this.selectedWorkFlowId,
+      chatWorkflowBlockId: this.newNodeInfo.chatWorkflowBlockId,
+      chatWorkflowEditorTypeId : this.newNodeInfo.chatWorkflowEditorTypeId,
+      fieldDetails: this.newNodeInfo.fieldDetails,
+      messageDetails: this.newNodeInfo.messageDetails,
+      branchDetails: this.newNodeInfo.branchDetails,
+      fieldOptionDetails : this.newNodeInfo.fieldOptionDetails
+    };
+    this.workflowService.addRule(addRuleRequest).then((result) => {
+      console.log(result.message);
+      if (result) {
+        this.diagramRefresh.emit();
+        this.newNodeInfo.id = result.workflowRuleId;
+      }
+    }).catch((e : HttpErrorResponse) => {
+      if(e && e.error?.Message){
+        console.log("Add failed");
+      }
+    });
+  }
+
   public createNodeInfo(editorTypeId: number | null, blockId: number, workflowId: number, fieldInfo: FieldDetails | null, fieldOptionInfo: FieldOptionDetail[] | null, messageInfo: MessageDetails | null): RuleData2 {
     let ruleDataId = this.isEdit ? 0 : WorkflowSidebarComponent.nodeLength++; // Need to set value dynamically from db
     return {
@@ -324,7 +347,6 @@ export class WorkflowSidebarComponent {
       chatWorkflowId: workflowId,
       successWorkflowId: null,
       successRuleId: null,
-      isActive: true,
       chatWorkflowBlockId: blockId,
       chatWorkflowEditorTypeId: editorTypeId,
       fieldDetails: fieldInfo,
diff --git a/src/app/models/appModel.ts b/src/app/models/appModel.ts
index 2a7510c..b03416f 100644
--- a/src/app/models/appModel.ts
+++ b/src/app/models/appModel.ts
@@ -73,7 +73,7 @@ export interface RuleData2 {
   chatWorkflowId: number;
   successWorkflowId?: number | null;
   successRuleId?: number | null;
-  isActive: boolean;
+  isActive?: boolean;
   chatWorkflowBlockId: number;
   chatWorkflowEditorTypeId?: number | null;
   fieldDetails?: FieldDetails | null;
@@ -83,10 +83,20 @@ export interface RuleData2 {
 }
 
 // Define the main Workflow interface
-export interface ChatWorkflowRulesData {
+export interface ChatWorkflowRulesData extends ChatWorkflowCommonObject {
   id: number;
   successWorkflowId?: number | null;
   successRuleId?: number | null;
+}
+
+export interface ChatWorkflowRulesData2 {
+  chatWorkflowEditorTypeId?: number | null;
+  fieldDetails?: FieldDetails | null;
+  fieldOptionDetails?: FieldOptionDetail[] | null;
+}
+
+export interface ChatWorkflowCommonObject {
+  chatWorkflowId: number;
   chatWorkflowBlockId: number;
   chatWorkflowEditorTypeId?: number | null;
   fieldDetails?: FieldDetails | null;
@@ -96,8 +106,11 @@ export interface ChatWorkflowRulesData {
   parentId?: number | null;
 }
 
-export interface ChatWorkflowRulesData2 {
-  chatWorkflowEditorTypeId?: number | null;
-  fieldDetails?: FieldDetails | null;
-  fieldOptionDetails?: FieldOptionDetail[] | null;
+export interface ChatWorkflowAddRuleRequest extends ChatWorkflowCommonObject {
+  previousWorkflowRuleId?: number;
+}
+
+export interface AddWorkflowRulesResponse {
+  workflowRuleId: number;
+  successMessage: string;
 }
\ No newline at end of file
diff --git a/src/app/services/workflow.service.ts b/src/app/services/workflow.service.ts
index 94ac924..a05296a 100644
--- a/src/app/services/workflow.service.ts
+++ b/src/app/services/workflow.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { WorkflowApiPaths } from '../api/workflowDesignerAPI';
-import { ChatWorkflowRulesData2 } from '../models/appModel';
+import { ChatWorkflowAddRuleRequest, ChatWorkflowRulesData2 } from '../models/appModel';
 
 @Injectable({
   providedIn: 'root'
@@ -31,4 +31,10 @@ export class WorkflowService {
 
     return this.http.delete<{ message: string }>(url, this.httpOptions).toPromise();
   }
+
+  addRule(addRuleRequest: ChatWorkflowAddRuleRequest, ): Promise<{ workflowRuleId: number, message: string }> {
+    const url = WorkflowApiPaths.addWorkflowRules.replace('{baseUrl}', this.baseUrl);
+
+    return this.http.post<{ workflowRuleId: number, message: string }>(url, addRuleRequest, this.httpOptions).toPromise();
+  }
 }

From dca2cf579d38fa86975b10d873b0de4369ab8a05 Mon Sep 17 00:00:00 2001
From: VijayalakshmiSF4471
 <164475295+VijayalakshmirSF4471@users.noreply.github.com>
Date: Tue, 31 Dec 2024 15:14:33 +0530
Subject: [PATCH 2/2] feature(405222): removed unused interfaces and made api
 route changes

---
 src/app/api/workflowDesignerAPI.ts            |   2 +-
 .../workflow-diagram.component.html           |   2 +-
 .../workflow-diagram.component.ts             |  39 +-
 .../workflow-sidebar.component.ts             |  32 +-
 src/app/data/rule-data.ts                     | 670 ------------------
 src/app/models/appModel.ts                    |  25 +-
 src/app/services/workflow.service.ts          |   6 +-
 7 files changed, 41 insertions(+), 735 deletions(-)
 delete mode 100644 src/app/data/rule-data.ts

diff --git a/src/app/api/workflowDesignerAPI.ts b/src/app/api/workflowDesignerAPI.ts
index c2c51b7..1504501 100644
--- a/src/app/api/workflowDesignerAPI.ts
+++ b/src/app/api/workflowDesignerAPI.ts
@@ -10,7 +10,7 @@ const workflowRulesPath = `{baseUrl}/{workflowId}/rules/{ruleId}`;
 const apiPaths: WorkflowListPathsType = {
     updateWorkflowRules: workflowRulesPath,
     deleteWorkflowRules: workflowRulesPath,
-    addWorkflowRules: `{baseUrl}`
+    addWorkflowRules: `{baseUrl}/rules`
 }
 
 export const WorkflowApiPaths: WorkflowListPathsType = apiPaths;
\ No newline at end of file
diff --git a/src/app/components/workflow-diagram/workflow-diagram.component.html b/src/app/components/workflow-diagram/workflow-diagram.component.html
index 4497d0d..e8136dc 100644
--- a/src/app/components/workflow-diagram/workflow-diagram.component.html
+++ b/src/app/components/workflow-diagram/workflow-diagram.component.html
@@ -146,7 +146,7 @@
 
 </div>
 
-<app-workflow-sidebar #workflowSidebar [nodeEditType]="nodeEditType" [nodeBlockType]="nodeBlockType" [sidebarHeader]="sidebarHeader" [clickedNodeRuleId]="clickedNodeRuleId" [selectedWorkFlowId]="selectedWorkFlowId" (diagramRefresh)="onDiagramRefresh()" (updateNode)="onUpdateNode($event)"></app-workflow-sidebar>
+<app-workflow-sidebar #workflowSidebar [nodeEditType]="nodeEditType" [nodeBlockType]="nodeBlockType" [sidebarHeader]="sidebarHeader" [clickedNodeRuleId]="clickedNodeRuleId" [selectedWorkFlowId]="selectedWorkFlowId" (diagramRefresh)="onDiagramRefresh()"></app-workflow-sidebar>
 
 <!-- <div style="display: none;">
   <ejs-uploader #defaultupload id='fileupload' (success)='onUploadSuccess($event)' [asyncSettings]='asyncSettings'></ejs-uploader>
diff --git a/src/app/components/workflow-diagram/workflow-diagram.component.ts b/src/app/components/workflow-diagram/workflow-diagram.component.ts
index 1e71e7b..bfe933d 100644
--- a/src/app/components/workflow-diagram/workflow-diagram.component.ts
+++ b/src/app/components/workflow-diagram/workflow-diagram.component.ts
@@ -3,8 +3,7 @@ import { ComplexHierarchicalTree, ConnectionPointOrigin, ConnectorConstraints, C
   HierarchicalTree, HierarchicalTreeService, HtmlModel, IClickEventArgs, IExportOptions, LayoutModel, LineDistribution, Node, NodeModel, PrintAndExport, 
   SelectorConstraints, SelectorModel, SnapSettingsModel, TextModel, UserHandleEventsArgs, UserHandleModel, DataSourceModel, 
   DataBindingService} from '@syncfusion/ej2-angular-diagrams';
-import { ChatWorkflowRulesData, ChatWorkflowRulesData2, FieldDetails, FieldOptionDetail, FieldValidation, MessageDetails, RuleData2 } from '../../models/appModel';
-import { RULE_DATA3 } from '../../data/rule-data';
+import { ChatWorkflowRulesData, FieldDetails, FieldOptionDetail, FieldValidation, MessageDetails } from '../../models/appModel';
 import { DialogModule } from '@syncfusion/ej2-angular-popups';
 import { BeforeOpenCloseMenuEventArgs, DropDownButtonComponent, DropDownButtonModule, ItemModel, OpenCloseMenuEventArgs } from '@syncfusion/ej2-angular-splitbuttons';
 import { CommonModule } from '@angular/common';
@@ -47,7 +46,6 @@ export class WorkflowDiagramComponent implements AfterViewInit {
 
   public chatWorkflowEditorTypeEnum = ChatWorkflowEditorTypeEnum; 
   public chatWorkflowBlockTypeEnum = ChatWorkflowBlockTypeEnum;
-  public data: RuleData2[] = RULE_DATA3;
   public nodes: NodeModel[] = [];
   public connectors: ConnectorModel[] = [];
   public closeOnDocumentClick: boolean = true;
@@ -90,7 +88,7 @@ export class WorkflowDiagramComponent implements AfterViewInit {
 
   private nodeIdCounter: number = 0;
   private connectorIdCounter: number = 0;
-  public newNodeData: RuleData2[] = [];
+  public newNodeData: ChatWorkflowRulesData[] = [];
 
   public sidebarHeader!: string;
   public nodeBlockType!: number;
@@ -199,7 +197,7 @@ export class WorkflowDiagramComponent implements AfterViewInit {
         this.diagram.selectedItems.userHandles[2].visible = false;
       }
        this.selectedBlockId = clickedBlock.id;
-       this.clickedNodeRuleId = (clickedBlock.data as RuleData2).id;
+       this.clickedNodeRuleId = (clickedBlock.data as ChatWorkflowRulesData).id;
        this.selectedWorkFlowId = this.workflowID;
     }
   }
@@ -209,35 +207,20 @@ export class WorkflowDiagramComponent implements AfterViewInit {
   }
 
   // Method to add a new node and connect it
+  // public onDiagramRefresh(): void {
+  //   this.diagram.setProperties({ nodes: [], connectors: [] }, true);
+  //   this.diagram.refresh();
+  // }
+
   public onDiagramRefresh(): void {
     this.diagram.setProperties({ nodes: [], connectors: [] }, true);
-    this.diagram.refresh();
-  }
-
-  // Update the Node and reload
-  public onUpdateNode([sourceNodeId, newNode]: [string, RuleData2]) : void {
-    const index = this.diagram.nodes.findIndex(node => node.id === sourceNodeId);
-    newNode.id  = (this.diagram.nodes[index].data as RuleData2).id;
-    var workBody : ChatWorkflowRulesData2 = {
-      chatWorkflowEditorTypeId : newNode.chatWorkflowEditorTypeId,
-      fieldDetails: newNode.fieldDetails,
-      fieldOptionDetails : newNode.fieldOptionDetails
-    };
-    this.workflowService.updateRule(newNode.chatWorkflowId, newNode.id, workBody).then((result) => {
-      console.log(result.message);
-      this.diagram.setProperties({ nodes: [], connectors: [] }, true);
       this.diagram.refresh();
-    }).catch((e : HttpErrorResponse) => {
-      if(e && e.error?.Message){
-        console.log("Update failed");
-      }
-    });
   }
 
   // on node delete 
-  public onDeleteNode(nodeObject) : void{
-    let ruleData : RuleData2 = nodeObject.data as RuleData2;
-    const index = this.diagram.nodes.findIndex(node => (node.data as RuleData2).successRuleId === ruleData.id);
+  public onDeleteNode(nodeObject) : void {
+    let ruleData : ChatWorkflowRulesData = nodeObject.data as ChatWorkflowRulesData;
+    const index = this.diagram.nodes.findIndex(node => (node.data as ChatWorkflowRulesData).successRuleId === ruleData.id);
     this.workflowService.deleteRule(ruleData.chatWorkflowId, ruleData.id).then((result) => {
       console.log(result.message);
       this.diagram.setProperties({ nodes: [], connectors: [] }, true);
diff --git a/src/app/components/workflow-sidebar/workflow-sidebar.component.ts b/src/app/components/workflow-sidebar/workflow-sidebar.component.ts
index 29f63db..4bb9e40 100644
--- a/src/app/components/workflow-sidebar/workflow-sidebar.component.ts
+++ b/src/app/components/workflow-sidebar/workflow-sidebar.component.ts
@@ -3,7 +3,7 @@ import { SidebarComponent, SidebarModule } from '@syncfusion/ej2-angular-navigat
 import { TextFormatEnum, ChatWorkflowEditorTypeEnum, ChatWorkflowBlockTypeEnum } from '../../models/enum';
 import { FormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
-import { ChatWorkflowAddRuleRequest, CustomerBlockFieldDetails, FieldDetails, FieldOptionDetail, FieldValidation, MessageDetails, RuleData2 } from '../../models/appModel';
+import { ChatWorkflowCommonObject, ChatWorkflowRulesData, ChatWorkflowRulesUpdateRequest, CustomerBlockFieldDetails, FieldDetails, FieldOptionDetail, FieldValidation, MessageDetails } from '../../models/appModel';
 import { NodeModel } from '@syncfusion/ej2-angular-diagrams';
 import { DropDownListComponent, DropDownListModule } from '@syncfusion/ej2-angular-dropdowns';
 import { DatePickerModule, DateTimePickerModule } from '@syncfusion/ej2-angular-calendars';
@@ -70,7 +70,6 @@ export class WorkflowSidebarComponent {
   @Input() clickedNodeRuleId!: number;
   @Input() selectedWorkFlowId!: number;
   @Output() diagramRefresh = new EventEmitter();
-  @Output() updateNode = new EventEmitter<[number, RuleData2]>();
 
   constructor(private workflowService: WorkflowService) {
     this.textFormatDDLOptions = this.enumToArray(TextFormatEnum);
@@ -174,7 +173,7 @@ export class WorkflowSidebarComponent {
   // Set the node(block) values
   setBlockValues(nodeInfo: NodeModel) {
     this.isEdit = true;
-    let nodeDetails = nodeInfo.data as RuleData2;
+    let nodeDetails = nodeInfo.data as ChatWorkflowRulesData;
     this.clickedNodeRuleId = nodeDetails.id;
     this.nodeBlockType = nodeDetails.chatWorkflowBlockId;
     this.nodeEditType = nodeDetails.chatWorkflowEditorTypeId ?? 0;
@@ -321,17 +320,16 @@ export class WorkflowSidebarComponent {
       }
     }
     if (this.isEdit) {
-      this.updateNode.emit([this.clickedNodeRuleId, this.newNodeInfo]);
+      this.onUpdateRule();
     }
     else {
       this.onAddRule();
-        // this.newNode = this.createNode(this.newNodeWidth, this.newNodeHeight, this.newNodeInfo);
     }
   }
 
   public onAddRule(): void {
-    var addRuleRequest : ChatWorkflowAddRuleRequest = {
-      previousWorkflowRuleId: this.clickedNodeRuleId,
+    var addRuleRequest : ChatWorkflowCommonObject = {
+      parentRuleId: this.clickedNodeRuleId,
       chatWorkflowId: this.selectedWorkFlowId,
       chatWorkflowBlockId: this.newNodeInfo.chatWorkflowBlockId,
       chatWorkflowEditorTypeId : this.newNodeInfo.chatWorkflowEditorTypeId,
@@ -353,7 +351,23 @@ export class WorkflowSidebarComponent {
     });
   }
 
-  public createNodeInfo(editorTypeId: number | null, blockId: number, workflowId: number, fieldInfo: FieldDetails | null, fieldOptionInfo: FieldOptionDetail[] | null, messageInfo: MessageDetails | null, customerBlockFieldInfo: CustomerBlockFieldDetails | null): RuleData2 {
+  public onUpdateRule(): void {
+    var updateRuleRequest : ChatWorkflowRulesUpdateRequest = {
+      chatWorkflowEditorTypeId : this.newNodeInfo.chatWorkflowEditorTypeId,
+      fieldDetails: this.newNodeInfo.fieldDetails,
+      fieldOptionDetails : this.newNodeInfo.fieldOptionDetails
+    };
+    this.workflowService.updateRule(this.selectedWorkFlowId, this.clickedNodeRuleId, updateRuleRequest).then((result) => {
+      console.log(result.message);
+      this.diagramRefresh.emit();
+    }).catch((e : HttpErrorResponse) => {
+      if(e && e.error?.Message){
+        console.log("Update failed");
+      }
+    });
+  }
+
+  public createNodeInfo(editorTypeId: number | null, blockId: number, workflowId: number, fieldInfo: FieldDetails | null, fieldOptionInfo: FieldOptionDetail[] | null, messageInfo: MessageDetails | null, customerBlockFieldInfo: CustomerBlockFieldDetails | null): ChatWorkflowRulesData {
     let ruleDataId = this.isEdit ? 0 : WorkflowSidebarComponent.nodeLength++; // Need to set value dynamically from db
     return {
       id: ruleDataId,
@@ -395,7 +409,7 @@ export class WorkflowSidebarComponent {
     }
   }
 
-  public createNode(width: number, height: number, nodeInfo: RuleData2): NodeModel {
+  public createNode(width: number, height: number, nodeInfo: ChatWorkflowRulesData): NodeModel {
     return {
       id: `node${nodeInfo.id}`,
       style: { fill: '#FFFFFF', strokeColor: '#0f2c60', strokeWidth: 5 },
diff --git a/src/app/data/rule-data.ts b/src/app/data/rule-data.ts
deleted file mode 100644
index 0efbe09..0000000
--- a/src/app/data/rule-data.ts
+++ /dev/null
@@ -1,670 +0,0 @@
-import { RuleData2 } from "../models/appModel";
-
-export const RULE_DATA2: RuleData2[] = [
-    {
-      "id": 1,
-      "chatWorkflowId": 1,
-      "successWorkflowId": 1,
-      "successRuleId": 2,
-      "isActive": true,
-      "chatWorkflowBlockId": 3,
-      "chatWorkflowEditorTypeId": 18,
-      "fieldDetails": {
-        "description": "Enter valid name",
-        "label": "Enter name",
-        "placeholder": "Enter name",
-        "apiName": "visitorName",
-        "maskForAgent": false
-      },
-      "branchDetails": null,
-      "messageDetails": null,
-      "fieldOptionDetails": null
-    },
-    {
-      "id": 2,
-      "chatWorkflowId": 1,
-      "successWorkflowId": 1,
-      "successRuleId": 3,
-      "isActive": true,
-      "chatWorkflowBlockId": 3,
-      "chatWorkflowEditorTypeId": 19,
-      "fieldDetails": {
-        "description": "Enter valid email",
-        "label": "Enter email",
-        "placeholder": "Enter email",
-        "apiName": "visitorEmail",
-        "maskForAgent": false
-      },
-      "branchDetails": null,
-      "messageDetails": null,
-      "fieldOptionDetails": null
-    },
-    {
-      "id": 3,
-      "chatWorkflowId": 1,
-      "successWorkflowId": 1,
-      "successRuleId": 4,
-      "isActive": true,
-      "chatWorkflowBlockId": 3,
-      "chatWorkflowEditorTypeId": 20,
-      "fieldDetails": {
-        "description": "Enter valid phone number",
-        "label": "Enter phone number",
-        "placeholder": "Enter email phone number",
-        "apiName": "visitorPhoneNo",
-        "maskForAgent": false
-      },
-      "branchDetails": null,
-      "messageDetails": null,
-      "fieldOptionDetails": null
-    },
-    {
-      "id": 4,
-      "chatWorkflowId": 1,
-      "successWorkflowId": 1,
-      "successRuleId": 5,
-      "isActive": true,
-      "chatWorkflowBlockId": 3,
-      "chatWorkflowEditorTypeId": 21,
-      "fieldDetails": null,
-      "branchDetails": null,
-      "messageDetails": null,
-      "fieldOptionDetails": null
-    },
-    {
-      "id": 5,
-      "chatWorkflowId": 1,
-      "successWorkflowId": 1,
-      "successRuleId": 6,
-      "isActive": true,
-      "chatWorkflowBlockId": 6,
-      "chatWorkflowEditorTypeId": null,
-      "messageDetails": {
-        "text": "Share your query",
-        "isPrivate": false,
-        "textFormat": 2
-      },
-      "fieldDetails": null,
-      "branchDetails": null,
-      "fieldOptionDetails": null
-    },
-    {
-      "id": 6,
-      "chatWorkflowId": 1,
-      "successWorkflowId": 1,
-      "successRuleId": 7,
-      "isActive": true,
-      "chatWorkflowBlockId": 4,
-      "chatWorkflowEditorTypeId": 1,
-      "fieldDetails": {
-        "description": "description for boolean",
-        "label": "Select yes/no for custom field",
-        "apiName": "cf_",
-        "maskForAgent": false,
-        "isOptional": false
-      },
-      "branchDetails": null,
-      "messageDetails": null,
-      "fieldOptionDetails": null
-    },
-    {
-      "id": 7,
-      "chatWorkflowId": 1,
-      "successWorkflowId": 1,
-      "successRuleId": 8,
-      "isActive": true,
-      "chatWorkflowBlockId": 4,
-      "chatWorkflowEditorTypeId": 2,
-      "fieldDetails": {
-        "description": "description for buttons",
-        "label": "Select any of the buttons to update custom field",
-        "placeholder": "description for buttons",
-        "apiName": "cf_",
-        "maskForAgent": false,
-        "isOptional": false
-      },
-      "branchDetails": null,
-      "messageDetails": null,
-      "fieldOptionDetails": [
-        {
-          "label": "Button 1",
-          "value": "1"
-        },
-        {
-          "label": "Button 2",
-          "value": "2"
-        }
-      ]
-    },
-    {
-      "id": 8,
-      "chatWorkflowId": 1,
-      "successWorkflowId": 1,
-      "successRuleId": 9,
-      "isActive": true,
-      "chatWorkflowBlockId": 4,
-    "chatWorkflowEditorTypeId": 3,
-    "fieldDetails": {
-      "description": "description for dropdown",
-      "label": "Select an item from dropdown",
-      "placeholder": "placeholder for dropdown",
-      "apiName": "cf_",
-      "maskForAgent": false,
-      "useAPI": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": [
-      {
-        "label": "Item 1",
-        "value": "1"
-      },
-      {
-        "label": "Item 2",
-        "value": "2"
-      }
-    ]
-  },
-  {
-    "id": 9,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 10,
-    "isActive": true,
-    "chatWorkflowBlockId": 4,
-    "chatWorkflowEditorTypeId": 4,
-    "fieldDetails": {
-      "description": "description for multi select",
-      "label": "Select multi-select items to update field",
-      "placeholder": "placeholder for multi select",
-      "apiName": "cf_",
-      "fieldValidation": {
-        "max": "2",
-        "min": "1"
-      },
-      "maskForAgent": false,
-      "useAPI": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": [
-      {
-        "label": "Item 1",
-        "value": "1"
-      },
-      {
-        "label": "Item 2",
-        "value": "2"
-      }
-    ]
-  },
-  {
-    "id": 10,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 11,
-    "isActive": true,
-    "chatWorkflowBlockId": 5,
-    "chatWorkflowEditorTypeId": 9,
-    "fieldDetails": {
-      "description": "description for date",
-      "label": "Pick a date for field update",
-      "placeholder": "placeholder for date",
-      "apiName": "cf_",
-      "fieldValidation": {
-        "max": "2024-10-25T00:00:00Z",
-        "min": "2000-10-25T00:00:00Z"
-      },
-      "maskForAgent": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 11,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 12,
-    "isActive": true,
-    "chatWorkflowBlockId": 5,
-    "chatWorkflowEditorTypeId": 10,
-    "fieldDetails": {
-      "description": "description for date",
-      "label": "Pick a date with time for field update",
-      "placeholder": "placeholder for date",
-      "apiName": "cf_",
-      "fieldValidation": {
-        "max": "2024-10-25T14:30:00Z",
-        "min": "2000-10-25T14:30:00Z"
-      },
-      "maskForAgent": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 12,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 13,
-    "isActive": true,
-    "chatWorkflowBlockId": 5,
-    "chatWorkflowEditorTypeId": 11,
-    "fieldDetails": {
-      "description": "description for number",
-      "label": "Provide a number to update field",
-      "placeholder": "placeholder for number",
-      "apiName": "cf_",
-      "fieldValidation": {
-        "max": "100",
-        "min": "1"
-      },
-      "maskForAgent": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 13,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 14,
-    "isActive": true,
-    "chatWorkflowBlockId": 5,
-    "chatWorkflowEditorTypeId": 12,
-    "fieldDetails": {
-      "description": "description for decimal",
-      "label": "Enter decimal value",
-      "placeholder": "placeholder for decimal",
-      "apiName": "cf_",
-      "fieldValidation": {
-        "max": "100",
-        "min": "1"
-      },
-      "maskForAgent": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 14,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 15,
-    "isActive": true,
-    "chatWorkflowBlockId": 5,
-    "chatWorkflowEditorTypeId": 7,
-    "fieldDetails": {
-      "description": "description for text",
-      "label": "Enter a valid text",
-      "placeholder": "placeholder for text",
-      "apiName": "cf_",
-      "fieldValidation": {
-        "max": "100"
-      },
-      "maskForAgent": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 15,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 16,
-    "isActive": true,
-    "chatWorkflowBlockId": 5,
-    "chatWorkflowEditorTypeId": 8,
-    "fieldDetails": {
-      "description": "description for text area",
-      "label": "Enter the description about your requirement",
-      "placeholder": "placeholder for text area",
-      "apiName": "cf_",
-      "fieldValidation": {
-        "max": "100"
-      },
-      "maskForAgent": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 16,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 17,
-    "isActive": true,
-    "chatWorkflowBlockId": 5,
-    "chatWorkflowEditorTypeId": 13,
-    "fieldDetails": {
-      "description": "Enter regex format",
-      "label": "Label for regex",
-      "placeholder": "Enter regex",
-      "apiName": "cf_regex",
-      "fieldValidation": {
-        "regex": "^abc"
-      },
-      "maskForAgent": false,
-      "isOptional": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 17,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 18,
-    "isActive": true,
-    "chatWorkflowBlockId": 7,
-    "chatWorkflowEditorTypeId": null,
-    "fieldDetails": {
-      "apiName": "chatPriority",
-      "value": "1"
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 18,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 19,
-    "isActive": true,
-    "chatWorkflowBlockId": 8,
-    "chatWorkflowEditorTypeId": null,
-    "fieldDetails": {
-      "groupId": 1,
-      "ruleType": 2
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 19,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 9,
-    "chatWorkflowEditorTypeId": null,
-    "fieldDetails": null,
-    "branchDetails": [
-      {
-        "id": 1,
-        "type": "if",
-        "name": "QBCondition1",
-        "successRuleId": 20,
-        "successWorkflowId": 1
-      },
-      {
-        "id": 2,
-        "type": "else if",
-        "name": "QBCondition2",
-        "successRuleId": 28,
-        "successWorkflowId": 1
-      },
-      {
-        "id": 3,
-        "type": "else",
-        "name": "QBCondition3",
-        "successRuleId": 29,
-        "successWorkflowId": 1
-      }
-    ],
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 20,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 10,
-    "chatWorkflowEditorTypeId": 14,
-    "fieldDetails": null,
-    "branchDetails": [
-      {
-        "successRuleId": 21,
-        "successWorkflowId": 1,
-        "value": "1"
-      },
-      {
-        "successRuleId": 27,
-        "successWorkflowId": 1,
-        "value": "2"
-      }
-    ],
-    "messageDetails": null,
-    "fieldOptionDetails": [
-      {
-        "label": "Sales",
-        "value": "1"
-      },
-      {
-        "label": "Marketing",
-        "value": "2"
-      }
-    ]
-  },
-  {
-    "id": 21,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 10,
-    "chatWorkflowEditorTypeId": 16,
-    "fieldDetails": null,
-    "branchDetails": [
-      {
-        "successRuleId": 22,
-        "successWorkflowId": 1,
-        "value": "1"
-      },
-      {
-        "successRuleId": 26,
-        "successWorkflowId": 1,
-        "value": "2"
-      }
-    ],
-    "messageDetails": null,
-    "fieldOptionDetails": [
-      {
-        "label": "Sales",
-        "value": "1"
-      },
-      {
-        "label": "Marketing",
-        "value": "2"
-      }
-    ]
-  },
-  {
-    "id": 22,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 10,
-    "chatWorkflowEditorTypeId": 15,
-    "fieldDetails": null,
-    "branchDetails": [
-      {
-        "successRuleId": 23,
-        "successWorkflowId": 1,
-        "value": "2"
-      },
-      {
-        "successRuleId": 25,
-        "successWorkflowId": 1,
-        "value": "1"
-      }
-    ],
-    "messageDetails": null,
-    "fieldOptionDetails": [
-      {
-        "label": "Sales",
-        "value": "1"
-      },
-      {
-        "label": "Marketing",
-        "value": "2"
-      }
-    ]
-  },
-  {
-    "id": 23,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": 24,
-    "isActive": true,
-    "chatWorkflowBlockId": 6,
-    "chatWorkflowEditorTypeId": null,
-    "messageDetails": {
-      "text": "Marketing item selected in dropdown branching",
-      "isPrivate": false,
-      "textFormat": 2
-    },
-    "fieldDetails": null,
-    "branchDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 24,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 12,
-    "chatWorkflowEditorTypeId": null,
-    "fieldDetails": null,
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 25,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 6,
-    "chatWorkflowEditorTypeId": null,
-    "messageDetails": {
-      "text": "Sales item selected in dropdown branching",
-      "isPrivate": false,
-      "textFormat": 2
-    },
-    "fieldDetails": null,
-    "branchDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 26,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 6,
-    "chatWorkflowEditorTypeId": null,
-    "messageDetails": {
-      "text": "Marketing item selected in list branching",
-      "isPrivate": false,
-      "textFormat": 2
-    },
-    "fieldDetails": null,
-    "branchDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 27,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 6,
-    "chatWorkflowEditorTypeId": null,
-    "messageDetails": {
-      "text": "Marketing item selected in button branching",
-      "isPrivate": false,
-      "textFormat": 2
-    },
-    "fieldDetails": null,
-    "branchDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 28,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 6,
-    "chatWorkflowEditorTypeId": null,
-    "messageDetails": {
-      "text": "QBCondition2 condition becomes true",
-      "isPrivate": false,
-      "textFormat": 2
-    },
-    "fieldDetails": null,
-    "branchDetails": null,
-    "fieldOptionDetails": null
-  },
-  {
-    "id": 29,
-    "chatWorkflowId": 1,
-    "successWorkflowId": null,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 6,
-    "chatWorkflowEditorTypeId": null,
-    "messageDetails": {
-      "text": "QBCondition3 condition becomes true",
-      "isPrivate": false,
-      "textFormat": 2
-    },
-    "fieldDetails": null,
-    "branchDetails": null,
-    "fieldOptionDetails": null
-  }
-];
-
-export const RULE_DATA3: RuleData2[] = [
-  {
-    "id": 1,
-    "chatWorkflowId": 1,
-    "successWorkflowId": 1,
-    "successRuleId": null,
-    "isActive": true,
-    "chatWorkflowBlockId": 3,
-    "chatWorkflowEditorTypeId": 18,
-    "fieldDetails": {
-      "description": "Enter valid name",
-      "label": "Enter name",
-      "placeholder": "Enter name",
-      "apiName": "visitorName",
-      "maskForAgent": false
-    },
-    "branchDetails": null,
-    "messageDetails": null,
-    "fieldOptionDetails": null
-  }]
\ No newline at end of file
diff --git a/src/app/models/appModel.ts b/src/app/models/appModel.ts
index 4f417e9..69100ea 100644
--- a/src/app/models/appModel.ts
+++ b/src/app/models/appModel.ts
@@ -52,23 +52,6 @@ export interface CustomerBlockFieldDetails {
   isPhoneEditorEnabled?: boolean;
 }
 
-// Define the main Workflow interface
-export interface RuleData2 {
-  id: number;
-  chatWorkflowId: number;
-  successWorkflowId?: number | null;
-  successRuleId?: number | null;
-  isActive?: boolean;
-  chatWorkflowBlockId: number;
-  chatWorkflowEditorTypeId?: number | null;
-  fieldDetails?: FieldDetails | null;
-  branchDetails?: BranchDetail[] | null;
-  messageDetails?: MessageDetails | null;
-  fieldOptionDetails?: FieldOptionDetail[] | null;
-  customerBlockFieldInfo?: CustomerBlockFieldDetails | null;
-  parentId?: number | null;
-}
-
 // Define the main Workflow interface
 export interface ChatWorkflowRulesData extends ChatWorkflowCommonObject {
   id: number;
@@ -76,7 +59,7 @@ export interface ChatWorkflowRulesData extends ChatWorkflowCommonObject {
   successRuleId?: number | null;
 }
 
-export interface ChatWorkflowRulesData2 {
+export interface ChatWorkflowRulesUpdateRequest {
   chatWorkflowEditorTypeId?: number | null;
   fieldDetails?: FieldDetails | null;
   fieldOptionDetails?: FieldOptionDetail[] | null;
@@ -91,11 +74,7 @@ export interface ChatWorkflowCommonObject {
   messageDetails?: MessageDetails | null;
   fieldOptionDetails?: FieldOptionDetail[] | null;
   customerBlockFieldInfo?: CustomerBlockFieldDetails | null;
-  parentId?: number | null;
-}
-
-export interface ChatWorkflowAddRuleRequest extends ChatWorkflowCommonObject {
-  previousWorkflowRuleId?: number;
+  parentRuleId?: number | null;
 }
 
 export interface AddWorkflowRulesResponse {
diff --git a/src/app/services/workflow.service.ts b/src/app/services/workflow.service.ts
index 5c4507b..5de32a6 100644
--- a/src/app/services/workflow.service.ts
+++ b/src/app/services/workflow.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { WorkflowApiPaths } from '../api/workflowDesignerAPI';
-import { ChatWorkflowAddRuleRequest, ChatWorkflowRulesData2 } from '../models/appModel';
+import { ChatWorkflowCommonObject, ChatWorkflowRulesUpdateRequest } from '../models/appModel';
 
 @Injectable({
   providedIn: 'root'
@@ -15,7 +15,7 @@ export class WorkflowService {
     headers: new HttpHeaders({ 'Content-Type': 'application/json' })
   };
 
-  updateRule(workflowId :number , ruleId: number, body : ChatWorkflowRulesData2) :  Promise<{ message: string }> {
+  updateRule(workflowId :number , ruleId: number, body : ChatWorkflowRulesUpdateRequest) :  Promise<{ message: string }> {
     const url = WorkflowApiPaths.updateWorkflowRules
     .replace('{baseUrl}', this.baseUrl)
     .replace('{workflowId}', workflowId.toString())
@@ -33,7 +33,7 @@ export class WorkflowService {
     return this.http.delete<{ message: string }>(url, this.httpOptions).toPromise();
   }
 
-  addRule(addRuleRequest: ChatWorkflowAddRuleRequest, ): Promise<{ workflowRuleId: number, message: string }> {
+  addRule(addRuleRequest: ChatWorkflowCommonObject): Promise<{ workflowRuleId: number, message: string }> {
     const url = WorkflowApiPaths.addWorkflowRules.replace('{baseUrl}', this.baseUrl);
 
     return this.http.post<{ workflowRuleId: number, message: string }>(url, addRuleRequest, this.httpOptions).toPromise();