Merge commit '0134f9aaaee2ec030f4d390d8025cce3632d9fef'

Tiledesk · Nov 9, 2023 · 9fff891 · 9fff891
2 parents c32b6d1 + 0134f9a
commit 9fff891
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 14 deletions.
diff --git a/.../cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.html b/.../cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.html
@@ -3,9 +3,9 @@
     <div  *ngIf="!isStart" class="previewContent"
         [class.isLast]="isLast">
 
-        <div *ngIf="isLast" class="icon-action">
+        <!-- <div *ngIf="isLast" class="icon-action">
             <img class="active-icon" [src]="element?.src" [title]="element?.name">
-        </div>
+        </div> -->
 
         <label *ngIf="!isLast" class="title-label">
             go to

diff --git a/.../cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.scss b/.../cds-dashboard/cds-canvas/actions/list/cds-action-intent/cds-action-intent.component.scss
@@ -28,6 +28,7 @@
     }
     &.isLast{
         padding: 0px;
+        min-height: 20px;
         .connector {
             right: -22px;
             top: calc(50% - 10px);

diff --git a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-canvas.component.ts b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-canvas.component.ts
@@ -532,7 +532,8 @@ export class CdsCanvasComponent implements OnInit {
   private openFloatMenuOnConnectorDraftReleased(detail){
     this.logger.log("[CDS CANVAS] ho rilasciato in un punto qualsiasi dello stage e quindi apro il float menu", detail);
     this.positionFloatMenu = this.stageService.physicPointCorrector(detail.menuPoint);
-    this.positionFloatMenu.x = this.positionFloatMenu.x + 300;
+    let marginLeft = this.IS_OPEN_INTENTS_LIST?290:60;
+    this.positionFloatMenu.x = this.positionFloatMenu.x+marginLeft;
     detail.menuPoint = this.positionFloatMenu;
     this.closeAllPanels();
     this.IS_OPEN_ADD_ACTIONS_MENU = true;

diff --git a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.html b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.html
@@ -253,25 +253,41 @@
                 class="cds-action-arrow">
             </cds-action-arrow>
 
-            <div *ngIf="last" class="csd-open-action-menu-btn-wpr">
+            <!-- <div *ngIf="last" class="csd-open-action-menu-btn-wpr">
                 <button #openActionMenuBtn (click)="$event.stopPropagation();openActionMenu(intent, 'add-action-btn')"
                     class="btn cds-add-action-btn">
                     <span class="material-icons">
                         add
                     </span>
                 </button>
-            </div>
+            </div> -->
 
         </div>
 
     </div>
 
     <cds-action-intent *ngIf="!isStart && intent && actionIntent"
-        class="panel-response action-intent" 
+        class="panel-response last-action-intent" 
         [intentSelected]="intent"
         [action]="actionIntent"
         [isLast]="true"
         (updateAndSaveAction)="onUpdateAndSaveAction($event)">
     </cds-action-intent>
 
+    <div class="footer-intent">
+
+        <div class="csd-open-action-menu-btn-wpr">
+            <button #openActionMenuBtn (click)="$event.stopPropagation();openActionMenu(intent, 'add-action-btn')"
+                class="btn cds-add-action-btn">
+                <span class="material-icons">
+                    add
+                </span>
+            </button>
+        </div>
+    </div>
+
+
+
+
+
 </div>
diff --git a/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss b/src/app/chatbot-design-studio/cds-dashboard/cds-canvas/cds-intent/cds-intent.component.scss
@@ -17,11 +17,7 @@
 
 
 
-.action-intent {
-  padding: 0 12px 0 0;
-  margin: 7px 0 -4px 0;
-  display: block;
-}
+
 
 .action-element{
   width: 100%;
@@ -301,23 +297,48 @@
   background-color: var(--action-no-featured-backgroud);
 }
 
+
+.footer-intent {
+  cursor: pointer;
+  margin-bottom: -10px;
+  min-height: 30px;
+}
+
+.last-action-intent {
+  display: block;
+  float: inline-end;
+  margin: 6px -12px 0 0;
+  padding: 0 24px 0 0;
+}
 /* Btn add action
 /* --------------------------------- */
 .csd-open-action-menu-btn-wpr {
   // height: 32px;
+  // bottom: -50px;
   text-align: center;
   position: absolute;
-  bottom: -50px;
+  display: block;
+  bottom: -36px;
+  left: 118px;
 }
 
-.cds-last-action>.csd-open-action-menu-btn-wpr {
+.footer-intent>.csd-open-action-menu-btn-wpr {
   opacity: 0;
 }
 
-.cds-last-action:hover>.csd-open-action-menu-btn-wpr {
+.footer-intent:hover>.csd-open-action-menu-btn-wpr {
   opacity: 1;
 }
 
+
+// .cds-last-action>.csd-open-action-menu-btn-wpr {
+//   opacity: 0;
+// }
+
+// .cds-last-action:hover>.csd-open-action-menu-btn-wpr {
+//   opacity: 1;
+// }
+
 .body-action {
   position: relative;
   display: flex;

diff --git a/src/styles.scss b/src/styles.scss
@@ -1 +1,17 @@
 /* You can add global styles to this file, and also import other style files */
+
+
+
+.isLast{
+
+    .connector .point-connector-empty {
+        border: 1px solid;
+        border-color: rgba(0, 0, 0, 0.5);
+        width: 12px;
+        height: 12px;
+        background: #ffffff;
+    }
+    .connector .point-connector-empty::before {
+        border: 0px;
+    }
+}