Hotfix - APP + API - Corrección paneles SQL y autorelaciones

eda/eda_api/lib/module/updateModel/updateModel.controller.ts

@@ -68,6 +68,7 @@ export class updateModel {
                     SELECT target_table as source_table, target_column as source_column , 
                     source_table as target_table , source_column as target_column, label as label , 1 as direccion
                     FROM sda_def_relationships 
+                    where source_table != target_table
                     union 
                     SELECT source_table , source_column  , 
                             master_table  , master_id as target_column, 'xx-bridge|xx-bridge' , 2 as direccion
@@ -514,7 +515,8 @@ export class updateModel {
               "display_name": {
                 "default": relations[i].direccion === 0 ? relations[i].label.split('|')[0] : relations[i].label.split('|')[1] ,
                  "localized": []
-        },
+              },
+              "autorelation" : relations[i].source_table === relations[i].target_table ? true : false
             }
             destRelations.push(rr);
 

eda/eda_api/lib/services/query-builder/qb-systems/mySql-builder.service.ts

@@ -1,6 +1,5 @@
 import { QueryBuilderService } from './../query-builder.service';
 import * as _ from 'lodash';
-import { filter, values } from 'lodash';
 
  /*SDA CUSTOM*/ import * as custom from '../../custom/custom';
 
@@ -35,8 +34,6 @@ export class MySqlBuilderService extends QueryBuilderService {
       joinString = this.getJoins(joinTree, dest, tables, joinType,  valueListJoins, schema);
     }
 
-
-
     joinString.forEach(x => {
       myQuery = myQuery + '\n' + x;
     });
@@ -209,21 +206,35 @@ export class MySqlBuilderService extends QueryBuilderService {
         if (!joinExists.has(`${sourceJoin}=${targetJoin}`)) {
             joinExists.add(`${sourceJoin}=${targetJoin}`);
 
+
+            let aliasSource;
+            if (sourceJoin.split('.')[0] == targetJoin.split('.')[0]) {
+                aliasSource = `\`${sourceTable}.${sourceColumn}\``;
+            }
+
             // Construcción de los alias
-            const alias = `\`${targetTable}.${targetColumn}\``;
+            let alias = `\`${targetTable}.${targetColumn}.${sourceColumn}\``;
+
+            if (aliasSource) {
+                alias = aliasSource;
+            }
+
             aliasTables[alias] = targetTable;
+            // aliasTables[sourceJoin] = targetTable;
 
             let aliasTargetTable: string;
             // targetTable and sourceTable can be the same table (autorelation)
             if (targetTableJoin.includes(targetTable) || targetTable == sourceTable) {
-                aliasTargetTable = `${targetTable}${targetTableJoin.indexOf(targetTable)}`;
+                // aliasTargetTable = `${targetTable}${targetTableJoin.indexOf(targetTable)}`;
+                aliasTargetTable = `${targetTable}${sourceColumn}`;
                 aliasTables[alias] = aliasTargetTable;
             }
 
             let joinStr: string;
 
             joinType = valueListJoins.includes(targetTable) ? 'LEFT' : joinType;
 
+
             if (aliasTargetTable) {
                 targetJoin = `\`${aliasTargetTable}\`.\`${targetColumn}\``;
                 joinStr = `${joinType} JOIN \`${targetTable}\` \`${aliasTargetTable}\` ON  ${sourceJoin}  =  ${targetJoin} `;
@@ -261,7 +272,12 @@ export class MySqlBuilderService extends QueryBuilderService {
     this.queryTODO.fields.forEach(el => {
       el.order !== 0 && el.table_id !== origin && !dest.includes(el.table_id) ? dest.push(el.table_id) : false;
 
-      const table_column = `\`${el.table_id}\`.\`${el.column_name}\``;
+      let table_column;
+      if (el.autorelation && !el.valueListSource) {
+        table_column = `\`${el.joins[el.joins.length-1][0]}\`.\`${el.column_name}\``;
+      } else {
+        table_column = `\`${el.table_id}\`.\`${el.column_name}\``;
+      }
 
       let whatIfExpression = '';
       if (el.whatif_column) whatIfExpression = `${el.whatif.operator} ${el.whatif.value}`;

eda/eda_api/lib/services/query-builder/query-builder.service.ts

@@ -131,13 +131,12 @@ export abstract class QueryBuilderService {
                 }
             });
         }
-
+        
 
         /** SEPAREM ENTRE AGGREGATION COLUMNS/GROUPING COLUMNS */
         let separedCols = this.getSeparedColumns(origin, dest);
         let columns = separedCols[0];
         let grouping = separedCols[1];
-
 
         let joinTree = [];
         let tree = [];
@@ -208,10 +207,18 @@ export abstract class QueryBuilderService {
 
                         field.valueListSource.source_column = field.column_name?field.column_name:field.filter_column;
                         // field.valueListSource.source_table = field.table_id?field.table_id.split('.')[0]:field.filter_table.split('.')[0];
-                        field.valueListSource.source_table = field.table_id?field.table_id:field.filter_table;
+
+                        const sourceTable = (field.table_id||field.filter_table)
+                        // const sourceTable = table.substring(0, table.lastIndexOf('.'));
+                        field.valueListSource.source_table = sourceTable;
 
                         field.table_id = field.valueListSource.target_table;
                         field.column_name = field.valueListSource.target_description_column;
+
+                        if (field.autorelation) {
+                            field.valueListSource.source_table = field.joins[field.joins.length-1][0]; //, join[0].substring(sourceLastDotInx + 1)];
+                        }
+
 
                         if (field.valueListSource.bridge_table?.length > 0) {
                             const j = {
@@ -251,7 +258,7 @@ export abstract class QueryBuilderService {
                 }
             }
             valueListJoins = [...new Set(valueListJoins.map((value) => value.target_table))];
-            
+
             tree = [...new Set(tree)];
             joinTree = tree;
             this.queryTODO.joined = true;

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/eda-blank-panel.component.ts

@@ -161,7 +161,7 @@ export class EdaBlankPanelComponent implements OnInit {
     public filterValue: any = {};
 
     public loadingNodes: boolean = false;
-    public rootTreeTable: any;
+    public rootTable: any;
     public tableNodes: any = [];
     public selectedTableNode: any;
     public nodeJoins: any[] = [];
@@ -226,10 +226,9 @@ export class EdaBlankPanelComponent implements OnInit {
                 this.selectedQueryMode = queryMode;
 
                 if (queryMode == 'EDA2') {
-                    this.rootTreeTable = contentQuery.query.rootTreeTable;
+                    this.rootTable = contentQuery.query.rootTable;
                 }
 
-
                 if (modeSQL || queryMode=='SQL') {
                     this.currentSQLQuery = contentQuery.query.SQLexpression;
 
@@ -265,7 +264,7 @@ export class EdaBlankPanelComponent implements OnInit {
 
         if (this.currentQuery.length == 0) {
             this.nodeJoins = [];
-            this.rootTreeTable = undefined;
+            this.rootTable = undefined;
         }
 
         const node = event?.node;
@@ -446,6 +445,7 @@ export class EdaBlankPanelComponent implements OnInit {
 
             try {
                 if (queryMode == 'EDA2') {
+                    this.rootTable = this.tables.find((t) => t.table_name == this.rootTable);
                     // Assert Relation Tables
                     const currentQuery = panelContent.query.query.fields;
                     for (const column of currentQuery) {
@@ -489,7 +489,7 @@ export class EdaBlankPanelComponent implements OnInit {
 
         if (this.panel?.content) {
             this.panel.content.query.query.queryMode = this.selectedQueryMode;
-            this.panel.content.query.query.rootTreeTable = this.rootTreeTable;
+            this.panel.content.query.query.rootTable = this.rootTable;
         }
 
         if (!_.isEmpty(this.graficos) || this.selectedQueryMode == 'SQL') {
@@ -699,7 +699,7 @@ export class EdaBlankPanelComponent implements OnInit {
     public openColumnDialog(column: Column, isFilter?: boolean): void {
         this.disableBtnSave();
 
-        if (column.table_id !== this.rootTreeTable?.table_name) {
+        if (column.table_id !== this.rootTable?.table_name) {
             column.joins = (column.joins||[]).length == 0 ? this.nodeJoins[this.nodeJoins.length-1] : column.joins;
         }
 
@@ -845,7 +845,7 @@ export class EdaBlankPanelComponent implements OnInit {
             const modeSQL = this.panelDeepCopy.query.query.modeSQL;
 
             this.selectedQueryMode = _.isNil(queryMode) ? (modeSQL ? 'SQL' : 'EDA') : queryMode;
-            this.rootTreeTable = this.panelDeepCopy.rootTreeTable;
+            this.rootTable = this.panelDeepCopy.rootTable;
         }
 
         this.loadChartsData(this.panelDeepCopy);
@@ -1156,7 +1156,7 @@ export class EdaBlankPanelComponent implements OnInit {
         this.currentQuery = [];
         this.filtredColumns = [];
         this.display_v.btnSave = true;
-        this.rootTreeTable = undefined;
+        this.rootTable = undefined;
         this.action.emit({ code: 'QUERYMODE', data: { queryMode: this.selectedQueryMode, panel: this.panel } })
     }
 

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/panel-utils/panel-interaction-utils.ts

@@ -72,7 +72,8 @@ export const PanelInteractionUtils = {
   loadTableNodes: (ebp: EdaBlankPanelComponent) => {
     if (ebp.currentQuery.length > 0) {
       const idTables = [...new Set(ebp.currentQuery.map((q) => q.table_id))];
-      const rootTable = idTables.find((idTable: string) => ebp.rootTreeTable?.table_name == idTable);
+      const rootTable = idTables.find((idTable: string) => ebp.rootTable?.table_name == idTable);
+
       if (rootTable) {
         const dataSource = ebp.inject.dataSource.model.tables;
 
@@ -105,7 +106,7 @@ export const PanelInteractionUtils = {
       const rootTable = (rootJoin[0]||'').split('.')[0];
       const sourceTable = ebp.tables.find((table: any) => table.table_name == rootTable);
 
-      const relation = sourceTable?.relations.find((rel) => `${rel.target_table}.${rel.target_column[0]}` == column.table_id);
+      const relation = sourceTable?.relations.find((rel) => `${rel.target_table}.${rel.target_column[0]}.${rel.source_column[0]}` == column.table_id);
       if (relation) {
         let assertTable = _.cloneDeep(ebp.tables.find((t) => t.table_name == relation.target_table));
 
@@ -155,7 +156,7 @@ export const PanelInteractionUtils = {
       table.relations = table.relations.filter(f=>f.bridge==false );
       for (const relation of table.relations) {
         // Init child_id
-        const child_id = relation.target_table+'.'+relation.target_column[0];
+        const child_id = `${relation.target_table}.${relation.target_column[0]}.${relation.source_column[0]}`;
 
         /** Checks if the current child_node is included before.
          * This prevents duplicated paths. */
@@ -168,7 +169,8 @@ export const PanelInteractionUtils = {
           /** This creates the path to relate this node with the previous tables.
            * It will be used later to generate the query. */
           let sourceJoin = relation.source_table+'.'+relation.source_column[0];
-          let joins = expandNode.joins ? [].concat(expandNode.joins, [[sourceJoin, child_id]]) : [[sourceJoin, child_id]];
+          const joinChildId = child_id.substring(0, child_id.lastIndexOf('.'));
+          let joins = expandNode.joins ? [].concat(expandNode.joins, [[sourceJoin, joinChildId]]) : [[sourceJoin, joinChildId]];
 
           if (!ebp.tables.some((t) => t.table_name == child_id)) {
             let assertTable = _.cloneDeep(ebp.tables.find((t) => t.table_name == relation.target_table))
@@ -197,7 +199,7 @@ export const PanelInteractionUtils = {
           });
 
           // If it's expandable, we add properties to expand the node. 
-          if (isexpandible) {
+          if (isexpandible && !relation.autorelation) {
             childNode.expandedIcon = "pi pi-folder-open";
             childNode.collapsedIcon = "pi pi-folder";
             childNode.children = [{}];
@@ -326,8 +328,8 @@ export const PanelInteractionUtils = {
         const table = ebp.tables.find((table) => table.table_name == contentColumn.table_id);
 
         if (table && table?.columns) {
-          if (!ebp.rootTreeTable && contentColumn.joins.length == 0) {
-            ebp.rootTreeTable = table;
+          if (!ebp.rootTable && contentColumn.joins.length == 0) {
+            ebp.rootTable = table;
           }
 
           const columns = table.columns;
@@ -359,6 +361,7 @@ export const PanelInteractionUtils = {
                   duplicatedColumn.whatif_column = contentColumn.whatif_column || false;
                   duplicatedColumn.whatif = contentColumn.whatif || {};
                   duplicatedColumn.joins = contentColumn.joins || [];
+                  duplicatedColumn.autorelation = contentColumn.autorelation || false;
                   PanelInteractionUtils.handleAggregationType4DuplicatedColumns(ebp, duplicatedColumn);
                   // Moc la columna directament perque es una duplicada.... o no....
                   ebp.currentQuery.push(duplicatedColumn);
@@ -375,7 +378,8 @@ export const PanelInteractionUtils = {
             handleColumn.whatif = contentColumn.whatif || {};
             handleColumn.joins = contentColumn.joins || [];
             handleColumn.ordenation_type = contentColumn.ordenation_type;
-
+            handleColumn.autorelation = contentColumn.autorelation || false;
+
             const existsAgg = handleColumn.aggregation_type.find((agg) => agg.value === contentColumn.aggregation_type);
             if (existsAgg) existsAgg.selected = true;
 
@@ -593,11 +597,11 @@ export const PanelInteractionUtils = {
     if (match) match.isdeleted = true; // Marco la columna com a borrada
 
 
-    if (!ebp.rootTreeTable) {
-      ebp.rootTreeTable = ebp.tables.find((table) => table.table_name == c.table_id);
+    if (!ebp.rootTable) {
+      ebp.rootTable = ebp.tables.find((table) => table.table_name == c.table_id);
     }
 
-    if (c.table_id !== ebp.rootTreeTable?.table_name) {
+    if (c.table_id !== ebp.rootTable?.table_name) {
       c.joins = (c.joins||[]).length == 0 ? ebp.nodeJoins[ebp.nodeJoins.length-1] : c.joins;
     }
 
@@ -693,7 +697,7 @@ export const PanelInteractionUtils = {
     if (list === 'select') {
       if (ebp.selectedQueryMode == 'EDA2') {
 
-        const rootTable = ebp.rootTreeTable.table_name;
+        const rootTable = ebp.rootTable.table_name;
 
         // Remove column is from rootTable then check currentQuery columns to allow or not.
         if (c.table_id === rootTable) {
@@ -706,7 +710,7 @@ export const PanelInteractionUtils = {
           }
         }
 
-        if (ebp.rootTreeTable && ebp.rootTreeTable.column_name == c.column_name && rootTable == c.table_id) {
+        if (ebp.rootTable && ebp.rootTable.column_name == c.column_name && rootTable == c.table_id) {
           // ebp.selectedQueryMode = 'EDA';
           ebp.currentQuery.forEach((query) => query.table_id = query.table_id.split('.')[0]);
           ebp.reloadTablesData();
@@ -729,7 +733,7 @@ export const PanelInteractionUtils = {
 
     // Buscar relacións per tornar a mostrar totes les taules
     if (ebp.currentQuery.length === 0 && ebp.filtredColumns.length === 0) {
-      ebp.rootTreeTable = undefined;
+      ebp.rootTable = undefined;
       ebp.tablesToShow = ebp.tables;
 
     } else {

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/panel-utils/panel-menu-options.ts

@@ -13,7 +13,7 @@ export const PanelOptions = {
 /* SDA CUSTOM */ panelComponent.showHiddenColumn = false;
           panelComponent.panelDeepCopy = _.cloneDeep(panelComponent.panel.content, true);
           if (panelComponent.selectedQueryMode == 'EDA2') {
-            panelComponent.panelDeepCopy.rootTreeTable = _.cloneDeep(panelComponent.rootTreeTable);
+            panelComponent.panelDeepCopy.rootTable = _.cloneDeep(panelComponent.rootTable);
           }
           panelComponent.display_v.disablePreview = false;
 

eda/eda_app/src/app/module/components/eda-panels/eda-blank-panel/panel-utils/query-utils.ts

@@ -67,14 +67,14 @@ export const QueryUtils = {
             break;
           }
         }
+
         ebp.currentQuery = [];
         types.forEach((type, i) => {
           ebp.currentQuery.push(QueryUtils.createColumn(response[0][i], type, ebp.sqlOriginTable));
         });
         return response;
       }
     } catch (err) {
-      console.log(err);
       throw err;
     }
   },
@@ -229,7 +229,7 @@ export const QueryUtils = {
       config: config.getConfig(),
       queryLimit: ebp.queryLimit,
       joinType: ebp.joinType,
-      rootTable: ebp.rootTreeTable?.table_name,
+      rootTable: ebp.rootTable?.table_name,
     };
     return ebp.queryBuilder.normalQuery(ebp.currentQuery, params, ebp.selectedQueryMode);
   },