* added "defaultApp" custom field to config.json. This field can be used to specify custom path for defaultApp if mdx2json doesn't set up properly or different path needed (#449)

Author: gnibeda

angular.json

@@ -31,13 +31,16 @@
             "assets": [
               "src/assets",
               "src/favicon.ico",
-              "src/config.json",
               "src/changelog.md",
               "src/manifest.webmanifest",
               {
                 "glob": "*",
                 "input": "dist-addons/src/addons",
                 "output": "addons"
+              },
+              {
+                "glob": "**/*",
+                "input": "public"
               }
             ],
             "externalDependencies": [
@@ -119,13 +122,16 @@
             "inlineStyleLanguage": "scss",
             "assets": [
               "src/favicon.ico",
-              "src/config.json",
               "src/changelog.md",
               "src/manifest.webmanifest",
               {
                 "glob": "*",
                 "input": "dist-addons/src/addons",
                 "output": "addons"
+              },
+              {
+                "glob": "**/*",
+                "input": "public"
               }
             ],
             "styles": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deep-see-web",
-  "version": "4.0.18",
+  "version": "4.0.19",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --proxy-config=proxy.conf.samples-bi.js",

proxy.conf.samples-bi.js

@@ -1,10 +1,4 @@
 module.exports = {
-  "/config.json": {
-    "target": "https://samples-bi-demo.demo.community.intersystems.com/dsw/",
-    "secure": false,
-    "logLevel": "debug",
-    "changeOrigin": true
-  },
   "/configs": {
     "target": "https://samples-bi-demo.demo.community.intersystems.com/dsw/",
     "secure": false,

config.json renamed to public/config.json

@@ -2,5 +2,6 @@
     "namespace": "MDX2JSON",
     "endpoints": {
         "mdx2json": "MDX2JSON"
-    }
+    },
+    "defaultApp": ""
 }

src/app/components/screens/dashboard-screen/dashboard-screen.component.ts

@@ -621,7 +621,8 @@ export class DashboardScreenComponent extends DashboardEditingClass implements O
           mdx = lpt._dataSourcesStack[lpt._dataSourcesStack.length - 1].BASIC_MDX + lpt.dataSource.FILTERS;
         }
         const folder = this.ss.serverSettings.DefaultApp || ('/csp/' + CURRENT_NAMESPACE);
-        const url = folder + '/_DeepSee.UI.MDXExcel.zen?MDX=' + encodeURIComponent(mdx || '');
+        const confPath = this.ds.configDefaultApp;
+        const url = (confPath || folder) + '/_DeepSee.UI.MDXExcel.zen?MDX=' + encodeURIComponent(mdx || '');
         window.open(url, '_blank');
         this.hideContextMenu();
         return;
@@ -772,7 +773,8 @@ export class DashboardScreenComponent extends DashboardEditingClass implements O
     }
     const folder = this.ss.serverSettings.DefaultApp || '/csp/' + CURRENT_NAMESPACE;
     const filters = this.fs.getFiltersUrlString(w.name, false, '\t', '\n');
-    let url = folder + '/_DeepSee.UI.Dialog.Analyzer.zen?&PIVOT=' + encodeURIComponent(w.dataSource);
+    const confPath = this.ds.configDefaultApp;
+    let url = (confPath || folder) + '/_DeepSee.UI.Dialog.Analyzer.zen?&PIVOT=' + encodeURIComponent(w.dataSource);
     if (filters) {
       url += '&FILTERSTATE=' + filters;
     }

src/app/components/widgets/map-widget/map-widget.component.ts

@@ -579,7 +579,8 @@ export class MapWidgetComponent extends BaseWidget implements OnInit, OnDestroy,
 
     fileName = this.getDataPropValue('polygonFile') || this.getDataPropValue('coordsJsFile') || fileName;
     const folder = this.ss.serverSettings.DefaultApp || '/csp';
-    const url = folder + '/' + fileName;
+    const confPath = this.ds.configDefaultApp;
+    const url = (confPath || folder) + '/' + fileName;
     const isJSON = fileName.split('.').pop()?.toString() === 'json';
     const p = isJSON ? this.ds.getJSONFile(url) : this.ds.getFile(url);
 

src/app/services/data.service.ts

@@ -52,6 +52,7 @@ export interface ITileInfo {
   providedIn: 'root'
 })
 export class DataService {
+  private mainConfig: any;
   public firstRun = true;
   public dashboardList = new Map<string, string>();
   public username = '';
@@ -76,6 +77,10 @@ export class DataService {
               private es: ErrorService) {
   }
 
+  public get configDefaultApp() {
+    return this.mainConfig?.defaultApp || '';
+  }
+
   public get url() {
     let prefix = '';
     const redirect = localStorage.getItem('connectorRedirect');
@@ -350,6 +355,7 @@ export class DataService {
     return this.http.get('config.json', {headers: new HttpHeaders({withCredentials: 'false'})})
       .toPromise()
       .then((conf: any) => {
+        this.mainConfig = conf;
         try {
           if (conf && conf.endpoints && conf.endpoints.mdx2json) {
             MDX2JSON = conf.endpoints.mdx2json.replace(/\//ig, '').replace(/ /g, '');

src/changelog.md

@@ -1,3 +1,6 @@
+#### 4.0.19
+* added "defaultApp" custom field to config.json. This field can be used to specify custom path for defaultApp if mdx2json doesn't set up properly or different path needed
+
 #### 4.0.18
 * fixed infinite loading for mobile