Merge pull request #594 from Esri/prav5100/add-general-app

Add support for General instant app

.gitignore

@@ -2,4 +2,5 @@ dist
 distESM
 node_modules
 coverage
-.vscode
+.vscode
+.idea

build/esmBuild.js

@@ -17,14 +17,24 @@ const updateFiles = (files) => {
       .then(fileTxt => {
         // esm uses @arcgis/core package for JS API and the references are different
         let updatedFile = fileTxt.replaceAll(/esri\//g, "@arcgis/core/");
+
         // the previous line messes up "@esri/" imports. revert those back specifically
         updatedFile = updatedFile.replaceAll("@@arcgis/core/", "@esri/");
+
+        // Add .js extension to module specifiers that contain bare module names without file extension
+        // Ex:
+        // "@arcgis/core/core/promiseUtils" -> "@arcgis/core/core/promiseUtils.js"
+        updatedFile = updatedFile.replaceAll(/(from)\s+\"([^"\.]+)\";/g, "$1 \"$2.js\";");
+
+        // Add .js extension to module specifiers that contain a relative path without file extension
+        // Ex:
+        // "./support/configParser" -> "./support/configParser.js"
+        // "../functionality/configurationSettings" -> "../functionality/configurationSettings.js"
+        updatedFile = updatedFile.replaceAll(/(from)\s+\"(((\.\/)|(\.\.\/)+)([^"\.]+))\";/g, "$1 \"$2.js\";");
+
         // esm needs different telemetry file
         updatedFile = updatedFile.replaceAll("\"./telemetry.dojo.min\"", "\"./telemetry.min\"");
-        // Takes out the dojo logic for injecting json file info
-        updatedFile = updatedFile.replaceAll("dojo/text!", "");
-        // Takes out the JSON.parse - esm apps don't need it
-        updatedFile = updatedFile.replaceAll("JSON.parse(INSTANT_APPS", "(INSTANT_APPS");
+
         return fse.writeFile(filePath, updatedFile);
       });
   });

package.json

@@ -12,8 +12,8 @@
     "generateTypes:amd": "dts-generator --prefix TemplatesCommonLib --project ./ --out ./dist/index.d.ts",
     "run:test": "npx intern serveOnly",
     "build:run:test": "npm run build:test && npm run run:test",
-    "filesCopy:amd": "npx cpy ./amd/package.json ./dist --flat && npx cpy ./README.md ./dist && npx cpy ./src/structuralFunctionality/telemetry/telemetry.dojo.min.js ./dist/structuralFunctionality/telemetry --flat && npx cpy ./src/configParamsJSON ./dist/configParamsJSON --flat",
-    "filesCopy:esm": "npx cpy ./esm/package.json ./distESM --flat && npx cpy ./README.md ./distESM  && npx cpy ./src/structuralFunctionality/telemetry/telemetry.min.js ./distESM/structuralFunctionality/telemetry --flat && npx cpy ./src/configParamsJSON ./distESM/configParamsJSON --flat"
+    "filesCopy:amd": "npx cpy ./amd/package.json ./dist --flat && npx cpy ./README.md ./dist && npx cpy ./src/structuralFunctionality/telemetry/telemetry.dojo.min.js ./dist/structuralFunctionality/telemetry --flat",
+    "filesCopy:esm": "npx cpy ./esm/package.json ./distESM --flat && npx cpy ./README.md ./distESM  && npx cpy ./src/structuralFunctionality/telemetry/telemetry.min.js ./distESM/structuralFunctionality/telemetry --flat"
   },
   "author": "Cameron Smith ([email protected])",
   "license": "ISC",

src/baseClasses/ApplicationBase.ts

@@ -19,7 +19,6 @@ import {
   ApplicationBaseSettings,
   ApplicationConfig,
   ApplicationConfigs,
-  ApplicationProxy,
   Direction,
   ILocalTestCase,
 } from "../interfaces/applicationBase";
@@ -752,10 +751,6 @@ export default class ApplicationBase {
       flowType: shouldUsePopup ? "authorization-code" : "auto",
     });
 
-    if (!info) {
-      return;
-    }
-
     IdentityManager.registerOAuthInfos([info]);
   }
 

src/baseClasses/CompatibilityChecker.ts

@@ -15,6 +15,7 @@ export enum EAppTemplateType {
   Compare = "/apps/instant/compare/index.html",
   Countdown = "/apps/instant/countdown/index.html",
   Exhibit = "/apps/instant/exhibit/index.html",
+  General = "/apps/instant/general/index.html",
   Insets = "/apps/instant/insets/index.html",
   InteractiveLegend = "/apps/instant/interactivelegend/index.html",
   ImageryApp = "/apps/instant/imageryviewer/index.html",
@@ -62,6 +63,7 @@ const EResourceType_to_AppType_Mapping = {
     EAppTemplateType.Atlas,
     EAppTemplateType.CategoryGallery,
     EAppTemplateType.Charts,
+    EAppTemplateType.General,
     EAppTemplateType.ImageryApp,
     EAppTemplateType.Insets,
     EAppTemplateType.InteractiveLegend,
@@ -83,6 +85,7 @@ const EResourceType_to_AppType_Mapping = {
     EAppTemplateType.Compare,
     EAppTemplateType.Countdown,
     EAppTemplateType.Exhibit,
+    EAppTemplateType.General,
     EAppTemplateType.ImageryApp,
     EAppTemplateType.Insets,
     EAppTemplateType.InteractiveLegend,
@@ -115,6 +118,7 @@ export interface ICompatibilityCheckerProperties {
 
   resourceMessages: {
     Webmap: string;
+    WebmapOrGroup: string;
     Webscene: string;
     Group: string;
     WebmapOrWebscene: string;
@@ -170,13 +174,14 @@ export class CompatibilityChecker {
 
     this._resourceMessagesMap = {
       [EAppTemplateType.AttachmentViewer]: resourceMessages.Webmap,
-      [EAppTemplateType.Atlas]: resourceMessages.Group,
+      [EAppTemplateType.Atlas]: resourceMessages.WebmapOrGroup,
       [EAppTemplateType.Basic]: resourceMessages.WebmapOrWebscene,
       [EAppTemplateType.CategoryGallery]: resourceMessages.Group,
       [EAppTemplateType.Charts]: resourceMessages.Webmap,
       [EAppTemplateType.Compare]: resourceMessages.WebmapOrWebscene,
       [EAppTemplateType.Countdown]: resourceMessages.WebmapOrWebscene,
       [EAppTemplateType.Exhibit]: resourceMessages.WebmapOrWebscene,
+      [EAppTemplateType.General]: resourceMessages.Webmap,
       [EAppTemplateType.ImageryApp]: resourceMessages.Webmap,
       [EAppTemplateType.Insets]: resourceMessages.Webmap,
       [EAppTemplateType.InteractiveLegend]: resourceMessages.Webmap,

src/baseClasses/support/configParamsUtils.ts

@@ -1,27 +1,28 @@
-import Atlas from "dojo/text!../../configParamsJSON/atlasConfigParams.json";
-import AttachmentViewer from "dojo/text!../../configParamsJSON/avConfigParams.json";
-import Basic from "dojo/text!../../configParamsJSON/basicConfigParams.json";
-import CategoryGallery from "dojo/text!../../configParamsJSON/categoryGalleryConfigParams.json";
-import Charts from "dojo/text!../../configParamsJSON/chartsConfigParams.json";
-import Compare from "dojo/text!../../configParamsJSON/compareConfigParams.json";
-import Countdown from "dojo/text!../../configParamsJSON/countdownConfigParams.json";
-import Exhibit from "dojo/text!../../configParamsJSON/exhibitConfigParams.json";
-import Imagery from "dojo/text!../../configParamsJSON/imageryViewerConfig.json";
-import Insets from "dojo/text!../../configParamsJSON/insetConfigParams.json";
-import InteractiveLegend from "dojo/text!../../configParamsJSON/intLegendConfigParams.json";
-import Manager from "dojo/text!../../configParamsJSON/managerConfigParams.json";
-import Media from "dojo/text!../../configParamsJSON/mediaConfigParams.json";
-import Minimalist from "dojo/text!../../configParamsJSON/minimalistConfigParams.json";
-import Nearby from "dojo/text!../../configParamsJSON/nearbyConfigParams.json";
-import Notify from "dojo/text!../../configParamsJSON/notifyConfigParams.json";
-import Observer from "dojo/text!../../configParamsJSON/observerConfigParams.json";
-import Portfolio from "dojo/text!../../configParamsJSON/portfolioConfigParams.json";
-import Reporter from "dojo/text!../../configParamsJSON/reporterConfigParams.json";
-import Sidebar from "dojo/text!../../configParamsJSON/sidebarConfigParams.json";
-import Slider from "dojo/text!../../configParamsJSON/dataSliderConfigParams.json";
-import Streamflow from "dojo/text!../../configParamsJSON/streamflowConfigParams.json";
-import ThreeDViewer from "dojo/text!../../configParamsJSON/3dViewerConfigParams.json";
-import ZoneLookup from "dojo/text!../../configParamsJSON/lookupConfigParams.json";
+import Atlas from "../../configParamsJSON/atlasConfigParams";
+import AttachmentViewer from "../../configParamsJSON/avConfigParams";
+import Basic from "../../configParamsJSON/basicConfigParams";
+import CategoryGallery from "../../configParamsJSON/categoryGalleryConfigParams";
+import Charts from "../../configParamsJSON/chartsConfigParams";
+import Compare from "../../configParamsJSON/compareConfigParams";
+import Countdown from "../../configParamsJSON/countdownConfigParams";
+import Exhibit from "../../configParamsJSON/exhibitConfigParams";
+import General from "../../configParamsJSON/generalConfigParams";
+import Imagery from "../../configParamsJSON/imageryViewerConfig";
+import Insets from "../../configParamsJSON/insetConfigParams";
+import InteractiveLegend from "../../configParamsJSON/intLegendConfigParams";
+import Manager from "../../configParamsJSON/managerConfigParams";
+import Media from "../../configParamsJSON/mediaConfigParams";
+import Minimalist from "../../configParamsJSON/minimalistConfigParams";
+import Nearby from "../../configParamsJSON/nearbyConfigParams";
+import Notify from "../../configParamsJSON/notifyConfigParams";
+import Observer from "../../configParamsJSON/observerConfigParams";
+import Portfolio from "../../configParamsJSON/portfolioConfigParams";
+import Reporter from "../../configParamsJSON/reporterConfigParams";
+import Sidebar from "../../configParamsJSON/sidebarConfigParams";
+import Slider from "../../configParamsJSON/dataSliderConfigParams";
+import Streamflow from "../../configParamsJSON/streamflowConfigParams";
+import ThreeDViewer from "../../configParamsJSON/3dViewerConfigParams";
+import ZoneLookup from "../../configParamsJSON/lookupConfigParams";
 
 import { EAppTemplateType } from "../CompatibilityChecker";
 
@@ -34,6 +35,7 @@ const INSTANT_APPS_CONFIG_PARAMS_MAP = {
   [EAppTemplateType.Compare]: Compare,
   [EAppTemplateType.Countdown]: Countdown,
   [EAppTemplateType.Exhibit]: Exhibit,
+  [EAppTemplateType.General]: General,
   [EAppTemplateType.ImageryApp]: Imagery,
   [EAppTemplateType.InteractiveLegend]: InteractiveLegend,
   [EAppTemplateType.Insets]: Insets,
@@ -53,7 +55,7 @@ const INSTANT_APPS_CONFIG_PARAMS_MAP = {
 };
 
 export function getConfigParams(template: EAppTemplateType) {
-  return JSON.parse(INSTANT_APPS_CONFIG_PARAMS_MAP[template]);
+  return structuredClone(INSTANT_APPS_CONFIG_PARAMS_MAP[template]);
 }
 
 export function generateDefaultValuesObj(configParamsObj) {

src/configParamsJSON/3dViewerConfigParams.json → src/configParamsJSON/3dViewerConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -1153,4 +1153,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/atlasConfigParams.json → src/configParamsJSON/atlasConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -494,4 +494,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/avConfigParams.json → src/configParamsJSON/avConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -524,4 +524,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/basicConfigParams.json → src/configParamsJSON/basicConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -550,4 +550,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/categoryGalleryConfigParams.json → src/configParamsJSON/categoryGalleryConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -365,4 +365,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/chartsConfigParams.json → src/configParamsJSON/chartsConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -557,4 +557,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/compareConfigParams.json → src/configParamsJSON/compareConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -476,4 +476,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/countdownConfigParams.json → src/configParamsJSON/countdownConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -444,4 +444,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/dataSliderConfigParams.json → src/configParamsJSON/dataSliderConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -854,4 +854,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/exhibitConfigParams.json → src/configParamsJSON/exhibitConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -494,4 +494,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/generalConfigParams.ts

@@ -0,0 +1,3 @@
+export default {
+  "config": []
+};

src/configParamsJSON/imageryViewerConfig.json → src/configParamsJSON/imageryViewerConfig.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -659,4 +659,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/insetConfigParams.json → src/configParamsJSON/insetConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -564,4 +564,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/intLegendConfigParams.json → src/configParamsJSON/intLegendConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -794,4 +794,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/lookupConfigParams.json → src/configParamsJSON/lookupConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -1099,4 +1099,4 @@
       ]
     }
   ]
-}
+};

src/configParamsJSON/managerConfigParams.json → src/configParamsJSON/managerConfigParams.ts

@@ -1,4 +1,4 @@
-{
+export default {
   "config": [
     {
       "type": "section",
@@ -362,4 +362,4 @@
       ]
     }
   ]
-}
+};