Merge branch 'connectionProp'

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

@@ -787,7 +787,11 @@ export class DashboardController {
   static async execQuery(req: Request, res: Response, next: NextFunction) {
 
     try {
-      const connection = await ManagerConnectionService.getConnection(req.body.model_id);
+      let connectionProps: any;
+      if (req.body.dashboard.connectionProperties) connectionProps = req.body.dashboard.connectionProperties;
+
+      const connection = await ManagerConnectionService.getConnection(req.body.model_id, connectionProps);
+
       const dataModel = await connection.getDataSource(req.body.model_id, req.qs.properties)
       /**--------------------------------------------------------------------------------------------------------- */
       /**Security check */
@@ -1004,9 +1008,10 @@ export class DashboardController {
    */
   static async execSqlQuery(req: Request, res: Response, next: NextFunction) {
     try {
-      const connection = await ManagerConnectionService.getConnection(
-        req.body.model_id
-      )
+      let connectionProps: any;
+      if (req.body.dashboard.connectionProperties) connectionProps = req.body.dashboard.connectionProperties;
+
+      const connection = await ManagerConnectionService.getConnection(req.body.model_id, connectionProps);
       const dataModel = await connection.getDataSource(req.body.model_id)
 
       /**Security check */
@@ -1255,9 +1260,10 @@ export class DashboardController {
    */
   static async getQuery(req: Request, res: Response, next: NextFunction) {
     try {
-      const connection = await ManagerConnectionService.getConnection(
-        req.body.model_id
-      )
+      let connectionProps: any;
+      if (req.body.dashboard.connectionProperties) connectionProps = req.body.dashboard.connectionProperties;
+
+      const connection = await ManagerConnectionService.getConnection(req.body.model_id, connectionProps);
       const dataModel = await connection.getDataSource(req.body.model_id)
       const dataModelObject = JSON.parse(JSON.stringify(dataModel))
       const query = await connection.getQueryBuilded(
@@ -1274,9 +1280,10 @@ export class DashboardController {
 
   static async execView(req: Request, res: Response, next: NextFunction) {
     try {
-      const connection = await ManagerConnectionService.getConnection(
-        req.body.model_id
-      )
+      let connectionProps: any;
+      if (req.body.dashboard.connectionProperties) connectionProps = req.body.dashboard.connectionProperties;
+
+      const connection = await ManagerConnectionService.getConnection(req.body.model_id, connectionProps);
       const query = req.body.query
       connection.client = await connection.getclient()
       const getResults = await connection.execQuery(query)
@@ -1356,14 +1363,11 @@ export class DashboardController {
     }
   }
 
-  static async cleanDashboardCache(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const connection = await ManagerConnectionService.getConnection(
-      req.body.model_id
-    )
+  static async cleanDashboardCache(req: Request, res: Response, next: NextFunction) {
+    let connectionProps: any;
+    if (req.body.dashboard.connectionProperties) connectionProps = req.body.dashboard.connectionProperties;
+
+    const connection = await ManagerConnectionService.getConnection(req.body.model_id, connectionProps);
     const dataModel = await connection.getDataSource(req.body.model_id)
 
     if (dataModel.ds.metadata.cache_config.enabled) {

eda/eda_api/lib/services/connection/manager-connection.service.ts

@@ -25,11 +25,17 @@ export const
 
 export class ManagerConnectionService {
 
-    static async getConnection(id: string): Promise<AbstractConnection> {
+    static async getConnection(id: string, properties?: any): Promise<AbstractConnection> {
         const datasource = await this.getDataSource(id);
         const config = datasource.ds.connection;
         config.password = EnCrypterService.decode(config.password || ' ');
 
+        if (properties) {
+            for (const prop in properties) {
+                config[prop] = properties[prop];
+            }
+        }
+
         switch (config.type) {
             case MS_CONNECTION:
             // return new MsConnection(config, secondary);

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

@@ -499,6 +499,7 @@ export class ColumnDialogComponent extends EdaDialogAbstract {
                 dataSource: this.controller.params.inject.dataSource._id,
                 dashboard: this.controller.params.inject.dashboard_id,
                 panel: this.controller.params.panel._id,
+                connectionProperties: this.controller.params.connectionProperties,
                 forSelector: true,
                 filters: []
             };

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

@@ -28,6 +28,7 @@ import { QueryUtils } from './panel-utils/query-utils';
 import { EbpUtils } from './panel-utils/ebp-utils';
 import { ChartsConfigUtils } from './panel-utils/charts-config-utils';
 import { PanelInteractionUtils } from './panel-utils/panel-interaction-utils'
+import { ActivatedRoute } from '@angular/router';
 
 export interface IPanelAction {
     code: string;
@@ -167,8 +168,11 @@ export class EdaBlankPanelComponent implements OnInit {
 
     /**panel chart component configuration */
     public panelChartConfig: PanelChart = new PanelChart();
+
+    public connectionProperties: any;
 
     constructor(
+        private route: ActivatedRoute,
         public queryBuilder: QueryBuilderService,
         public fileUtiles: FileUtiles,
         private formBuilder: UntypedFormBuilder,
@@ -182,6 +186,15 @@ export class EdaBlankPanelComponent implements OnInit {
         this.initializeBlankPanelUtils();
         this.initializeInputs();
 
+        this.route.queryParams.subscribe(params => {
+            try {
+                if (params['cnproperties']) {
+                    this.connectionProperties = JSON.parse(decodeURIComponent(params['cnproperties'])); 
+                }
+            } catch (err) {
+                console.error('queryParams: '+ err)
+            }
+        });
     }
 
     ngOnInit(): void {
@@ -628,7 +641,8 @@ export class EdaBlankPanelComponent implements OnInit {
             inject: this.inject,
             panel: this.panel,
             table: this.findTable(column.table_id),
-            filters: this.selectedFilters
+            filters: this.selectedFilters,
+            connectionProperties: this.connectionProperties
         };
 
         if (!isFilter) {

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

@@ -180,6 +180,7 @@ export class FilterDialogComponent extends EdaDialogAbstract {
                 dataSource: this.controller.params.inject.dataSource._id,
                 dashboard: this.controller.params.inject.dashboard_id,
                 panel: this.controller.params.panel._id,
+                connectionProperties: this.controller.params.connectionProperties,
                 filters: [],
                 forSelector: true
             };

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

@@ -40,6 +40,10 @@ export const QueryUtils = {
    * 
    */
   switchAndRun: async (ebp: EdaBlankPanelComponent, query: Query) => {
+    if (ebp.connectionProperties) {
+      query.dashboard.connectionProperties = ebp.connectionProperties;
+    }
+
     if (!ebp.modeSQL) {
       const response = await ebp.dashboardService.executeQuery(query).toPromise();
       return response;
@@ -223,7 +227,8 @@ export const QueryUtils = {
       filters: ebp.mergeFilters(ebp.selectedFilters, ebp.globalFilters),
       config: config.getConfig(),
       queryLimit: ebp.queryLimit,
-      joinType: ebp.joinType
+      joinType: ebp.joinType,
+      connectionProperties: ebp.connectionProperties
     };
     return ebp.queryBuilder.normalQuery(ebp.currentQuery, params);
   },
@@ -240,7 +245,8 @@ export const QueryUtils = {
       panel: ebp.panel.id,
       dashboard: ebp.inject.dashboard_id,
       filters: ebp.mergeFilters(ebp.selectedFilters, ebp.globalFilters),
-      config: config.getConfig()
+      config: config.getConfig(),
+      connectionProperties: ebp.connectionProperties
     };
     return ebp.queryBuilder.normalQuery(ebp.currentQuery, params, true, ebp.currentSQLQuery);
 

eda/eda_app/src/app/module/pages/dashboard/dashboard.component.ts

@@ -53,7 +53,10 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
     public datasourceName: string;
     public group: string = '';
     public onlyIcanEdit: boolean = false;
+
+    public connectionProperties: any;
     public queryParams: any = {};
+
     public filterButtonVisibility = {
         public : false,
         readOnly : false
@@ -529,19 +532,24 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
 
     private getUrlParams(): void {
         this.route.queryParams.subscribe(params => {
-            this.queryParams = params;
-            try{
-                    if(params['hideWheel'] == 'true'){
-                        this.display_v.hideWheel =true;
-                    }
-                    if(params['panelMode'] == 'true'){
-                        this.display_v.panelMode =true;
-                        this.display_v.hideWheel =true;
-                    }
-            }catch(e){
-            }
+            try {
+                this.queryParams = params;
+
+                if(params['hideWheel'] == 'true'){
+                    this.display_v.hideWheel =true;
+                }
+                if(params['panelMode'] == 'true'){
+                    this.display_v.panelMode =true;
+                    this.display_v.hideWheel =true;
+                }
 
+                if (params['cnproperties']) {
+                    this.connectionProperties = JSON.parse(decodeURIComponent(params['cnproperties'])); 
+                }
 
+            } catch(e){
+                console.error('getUrlParams: '+ e);
+            }
         });
     }
 
@@ -748,6 +756,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
                 panels: this.panels,
                 dataSource: this.dataSource,
                 filtersList: this.filtersList,
+                connectionProperties: this.connectionProperties,
                 filter,
                 isnew
             },
@@ -977,6 +986,7 @@ export class DashboardComponent implements OnInit, AfterViewInit, OnDestroy {
         const queryParams = {
             table: targetTable,
             dataSource: this.dataSource._id,
+            connectionProperties: this.connectionProperties,
             dashboard: '',
             panel: '',
             filters: []

eda/eda_app/src/app/module/pages/dashboard/filter-dialog/dashboard-filter-dialog.component.ts

@@ -243,6 +243,7 @@ export class DashboardFilterDialogComponent extends EdaDialogAbstract {
             table: this.targetTable.value,
             dataSource: this.params.dataSource._id,
             dashboard: this.params.id,
+            connectionProperties: this.params.connectionProperties,
             forSelector: true,
             panel: '',
             filters: []

eda/eda_app/src/app/services/utils/query-builder.service.ts

@@ -12,7 +12,8 @@ export interface QueryParams {
     config?: any;
     queryLimit? : number;
     joinType?:string;
-    forSelector?: boolean
+    forSelector?: boolean;
+    connectionProperties?: any;
 }
 
 @Injectable()
@@ -54,6 +55,7 @@ export class QueryBuilderService extends ApiService {
             dashboard: {
                 dashboard_id: params.dashboard,
                 panel_id: params.panel,
+                connectionProperties: params.connectionProperties
             },
             query: {
                 fields: queryColumns,
@@ -62,7 +64,7 @@ export class QueryBuilderService extends ApiService {
                 modeSQL : false,
                 SQLexpression : null,
                 queryLimit : null,
-                joinType: 'left' //puede que necesite el joinType
+                joinType: 'left', //puede que necesite el joinType
             },
             output: {
                 labels,
@@ -111,7 +113,8 @@ export class QueryBuilderService extends ApiService {
             },
             dashboard: {
                 dashboard_id: params.dashboard,
-                panel_id: params.panel
+                panel_id: params.panel,
+                connectionProperties: params.connectionProperties
             },
             query: {
                 fields: queryColumns,

eda/eda_app/src/app/shared/models/dashboard-models/query.model.ts

@@ -9,7 +9,8 @@ export interface Query {
     };
     dashboard: {
         dashboard_id: string,
-        panel_id: string
+        panel_id: string,
+        connectionProperties: any
     };
     query: {
         fields: Column[]
@@ -19,8 +20,7 @@ export interface Query {
         SQLexpression : string,
         queryLimit : number,
         joinType: string,
-        forSelector?: boolean ;
-
+        forSelector?: boolean
     };
     output: {
         labels: any[],