feature(402683): resolved conflict

SyncfusionExamples · Dec 27, 2024 · 59276ed · 59276ed
2 parents 646d833 + f61b381
commit 59276ed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/src/app/components/workflow-diagram/workflow-diagram.component.html b/src/app/components/workflow-diagram/workflow-diagram.component.html
@@ -39,7 +39,7 @@
 
     <ng-template #nodeTemplate let-data>
       @if(data.data.chatWorkflowBlockId !== chatWorkflowBlockTypeEnum.SendTextMessage && data.data.chatWorkflowBlockId !== chatWorkflowBlockTypeEnum.GetCustomerDetails) {
-        <div><label style="padding: 5px;">{{ data.data.fieldDetails.label }}</label></div>
+        <div><label style="padding: 5px;">{{ data.data.fieldDetails.description }}</label></div>
       }
       @switch (data.data.chatWorkflowBlockId){
         @case(chatWorkflowBlockTypeEnum.SendTextMessage){

diff --git a/src/app/components/workflow-sidebar/workflow-sidebar.component.html b/src/app/components/workflow-sidebar/workflow-sidebar.component.html
@@ -5,15 +5,12 @@
             <div class="form-header"> {{sidebarHeader}}</div>
             <div [hidden]="nodeBlockType === chatWorkflowBlockTypeEnum.GetCustomerDetails">
                 <label>
-                    Label: <input type="text" [(ngModel)]="sideBarLabel" name="sideBarLabel" placeholder="Enter label..." class="description-box" required />
+                    Description: <input type="text" [(ngModel)]="sideBarDescription" name="singleDescription" placeholder="Enter description..." class="description-box" />
                 </label>
-            </div>
-
-            <ng-template #sideBarDescriptionTemplate>
                 <label>
-                    Description: <input type="text" [(ngModel)]="sideBarDescription" name="singleDescription" placeholder="Enter description..." class="description-box" />
+                    Label: <input type="text" [(ngModel)]="sideBarLabel" name="sideBarLabel" placeholder="Enter label..." class="description-box" required />
                 </label>
-            </ng-template>
+            </div>
 
             <ng-template #sideBarPlaceholderTemplate>
                 <label>
@@ -86,15 +83,13 @@
                         }
                         @case(chatWorkflowEditorTypeEnum.DropDown){
                         <div>
-                            <div *ngTemplateOutlet="sideBarDescriptionTemplate"></div>
                             <div *ngTemplateOutlet="sideBarPlaceholderTemplate"></div>
                             <div class="button-list"  *ngTemplateOutlet="removeButtonTemplate"></div>
                             <div class="add-button-form" *ngTemplateOutlet="addOptionTemplate"></div>
                         </div>
                         }
                         @case(chatWorkflowEditorTypeEnum.MultiSelect){
                         <div>
-                            <div *ngTemplateOutlet="sideBarDescriptionTemplate"></div>
                             <div *ngTemplateOutlet="sideBarPlaceholderTemplate"></div>
                             <div class="button-list" *ngTemplateOutlet="removeButtonTemplate"></div>
                             <div class="add-button-form" *ngTemplateOutlet="addOptionTemplate"></div>
@@ -104,7 +99,6 @@
                         }
                         @case(chatWorkflowEditorTypeEnum.List){
                         <div>
-                            <div *ngTemplateOutlet="sideBarDescriptionTemplate"></div>
                             <div *ngTemplateOutlet="sideBarPlaceholderTemplate"></div>
                             <div class="button-list"  *ngTemplateOutlet="removeButtonTemplate"></div>
                             <div class="add-button-form" *ngTemplateOutlet="addOptionTemplate; context: { visibility: true }"></div>
@@ -128,37 +122,32 @@
                         }
                         @case(chatWorkflowEditorTypeEnum.Number){
                         <div>
-                            <div *ngTemplateOutlet="sideBarDescriptionTemplate"></div>
                             <div *ngTemplateOutlet="sideBarPlaceholderTemplate"></div>
                             <div *ngTemplateOutlet="fieldOptionMinValueTemplate"></div>
                             <div *ngTemplateOutlet="fieldOptionMaxValueTemplate"></div>
                         </div>
                         }
                         @case(chatWorkflowEditorTypeEnum.Decimal){
                         <div>
-                            <div *ngTemplateOutlet="sideBarDescriptionTemplate"></div>
                             <div *ngTemplateOutlet="sideBarPlaceholderTemplate"></div>
                             <div *ngTemplateOutlet="fieldOptionMinValueTemplate"></div>
                             <div *ngTemplateOutlet="fieldOptionMaxValueTemplate"></div>
                         </div>
                         }
                         @case(chatWorkflowEditorTypeEnum.Text){
                         <div>
-                            <div *ngTemplateOutlet="sideBarDescriptionTemplate"></div>
                             <div *ngTemplateOutlet="sideBarPlaceholderTemplate"></div>
                             <div *ngTemplateOutlet="fieldOptionMaxValueTemplate"></div>
                         </div>
                         }
                         @case(chatWorkflowEditorTypeEnum.TextArea){
                         <div>
-                            <div *ngTemplateOutlet="sideBarDescriptionTemplate"></div>
                             <div *ngTemplateOutlet="sideBarPlaceholderTemplate"></div>
                             <div *ngTemplateOutlet="fieldOptionMaxValueTemplate"></div>
                         </div>
                         }
                         @case(chatWorkflowEditorTypeEnum.Regex){
                         <div>
-                            <div *ngTemplateOutlet="sideBarDescriptionTemplate"></div>
                             <div *ngTemplateOutlet="sideBarPlaceholderTemplate"></div>
                             <label>
                                 Regex: <input type="text" [(ngModel)]="fieldOptionRegexValue" name="fieldOptionRegexValue" placeholder="Enter regex here" class="description-box" />

diff --git a/src/app/components/workflow-sidebar/workflow-sidebar.component.ts b/src/app/components/workflow-sidebar/workflow-sidebar.component.ts
@@ -208,7 +208,7 @@ export class WorkflowSidebarComponent {
     switch (this.nodeBlockType) {
       case (this.chatWorkflowBlockTypeEnum.SendTextMessage): {
         let messageInfo: MessageDetails = {
-          text: this.sideBarLabel,
+          text: this.sideBarDescription,
           isPrivate: this.checkedIsPrivate,
           textFormat: this.ddlTextFormat.value as TextFormatEnum
         }