bug fix create connector

Tiledesk · Oct 31, 2023 · b299a78 · b299a78
1 parent edfbcd1
commit b299a78
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 47 deletions.
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
@@ -34,8 +34,6 @@ export class CdsCanvasComponent implements OnInit {
   @ViewChild('drawer_of_items_to_zoom_and_drag', { static: false }) drawerOfItemsToZoomAndDrag: ElementRef;
 
   @Output() testItOut = new EventEmitter();
-  // @Output() closePanelWidget = new EventEmitter();
-
   @Input() onHeaderTestItOut: Observable<Intent | boolean>
 
   id_faq_kb: string;
@@ -117,9 +115,6 @@ export class CdsCanvasComponent implements OnInit {
     this.stageService.setDrawer();
     this.connectorService.initializeConnectors();
     this.addEventListener();
-    // setTimeout(()=> {
-    //   let newPos = scaleAndcenterStageOnCenterPosition(this.listOfIntents) 
-    // }, 1000)
   }
 
   private async setStartIntent(){
@@ -135,8 +130,6 @@ export class CdsCanvasComponent implements OnInit {
       if(startElement){
         this.stageService.centerStageOnHorizontalPosition(startElement);
       }
-      // let startElement = document.getElementById(intentSelected.intent_id);
-      // }
     }
   }
 
@@ -235,12 +228,9 @@ export class CdsCanvasComponent implements OnInit {
   private initListOfIntents() {
     this.listOfIntents.forEach(intent => {
       if (intent.actions) {
-        intent.actions = intent.actions.filter(obj => obj !== null); //patch if action is null
+        intent.actions = intent.actions.filter(obj => obj !== null);
       }
     });
-    // this.updatePanelIntentList = !this.updatePanelIntentList;
-    /* variabile booleana aggiunta per far scattare l'onchange nei componenti importati dalla dashboard
-    * ngOnChanges funziona bene solo sugli @import degli elementi primitivi!!!  */
     this.refreshIntents();
   }
 

diff --git a/src/app/chatbot-design-studio/services/connector.service.ts b/src/app/chatbot-design-studio/services/connector.service.ts
@@ -77,39 +77,13 @@ export class ConnectorService {
    * 
    */
   public createConnectors(intents){
-    this.logger.log('[CONNECTOR-SERV] -----> createConnectors::: ', intents);
+    // this.logger.log('[CONNECTOR-SERV] -----> createConnectors::: ', intents);
     intents.forEach(intent => {
       this.createConnectorsOfIntent(intent);
     });
   }
 
-  // /**
-  //  * createConnectorFromId
-  //  * @param fromId 
-  //  * @param toId 
-  //  * @returns 
-  //  */
-  // public async createConnectorFromId_old(fromId, toId, save=false, undo=false) {
-  //   this.logger.log('[CONNECTOR-SERV] createConnectorFromId fromId ', fromId, ' toId ', toId);
-  //   const connectorID = fromId+'/'+toId;
-  //   // let connector = await isElementOnTheStage(connectorID); // sync
-  //   const isConnector = document.getElementById(connectorID);
-  //   if (isConnector) {
-  //     this.logger.log('[CONNECTOR-SERV] il connettore esiste già', connectorID);
-  //     // this.deleteConnector(connectorID);
-  //     // return true;
-  //   }
-  //   let isOnTheStageFrom = await isElementOnTheStage(fromId); // sync
-  //   this.logger.log('[CONNECTOR-SERV] isOnTheStageFrom', isOnTheStageFrom);
-  //   let isOnTheStageTo = await isElementOnTheStage(toId); // sync
-  //   this.logger.log('[CONNECTOR-SERV] isOnTheStageFrom', isOnTheStageFrom);
-  //   if(isOnTheStageFrom && isOnTheStageTo){
-  //     const result = await this.tiledeskConnectors.createConnectorFromId(fromId, toId, save, undo);
-  //    return result;
-  //   } else {
-  //     return false;
-  //   }
-  // }
+
 
   /**
    * createConnectorFromId
@@ -127,13 +101,22 @@ export class ConnectorService {
       this.tiledeskConnectors.updateConnectorsOutOfItent(connectorID);
       return true;
     } 
-    let isOnTheStageFrom = await isElementOnTheStage(fromId); // sync
-    this.logger.log('[CONNECTOR-SERV] isOnTheStageFrom', isOnTheStageFrom);
-    let isOnTheStageTo = await isElementOnTheStage(toId); // sync
-    this.logger.log('[CONNECTOR-SERV] isOnTheStageFrom', isOnTheStageFrom);
-    if(isOnTheStageFrom && isOnTheStageTo){
-      const fromEle = document.getElementById(fromId);
-      const toEle = document.getElementById(toId);
+
+    let fromEle = document.getElementById(fromId);
+    if(!fromEle) {
+      fromEle = await isElementOnTheStage(fromId); // sync
+      this.logger.log('[CONNECTOR-SERV] isOnTheStageFrom', fromEle);
+    }
+
+    let toEle = document.getElementById(toId);
+    if(!toEle) {
+      toEle = await isElementOnTheStage(toId); // sync
+      this.logger.log('[CONNECTOR-SERV] isOnTheStageFrom', toEle);
+    }
+
+    if(fromEle && toEle){
+      // const fromEle = document.getElementById(fromId);
+      // const toEle = document.getElementById(toId);
       const fromPoint = this.tiledeskConnectors.elementLogicCenter(fromEle);
       const toPoint = this.tiledeskConnectors.elementLogicTopLeft(toEle);
       this.tiledeskConnectors.createConnector(fromId, toId, fromPoint, toPoint, save, undo);
@@ -144,6 +127,29 @@ export class ConnectorService {
   }
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   /**
    * refreshConnectorsOfIntent
    * @param intent 

diff --git a/src/app/chatbot-design-studio/utils.ts b/src/app/chatbot-design-studio/utils.ts
@@ -385,7 +385,7 @@ export function convertJsonToArray(jsonData:any){
 }
 
 export async function isElementOnTheStage(elementId:string): Promise<any>{
-    // if(document.getElementById(elementId)) return true;
+
     return new Promise((resolve) => {
         let intervalId = setInterval(async () => {
             const result = document.getElementById(elementId);