npm - @esri/solutions-components - Versions diffs - 0.8.39 → 0.8.40 - Mend

@esri/solutions-components 0.8.39 → 0.8.40

Files changed (273) hide show

package/dist/collection/demos/solution-item.html CHANGED Viewed

@@ -24,6 +24,9 @@
   <link rel="stylesheet" href="https://webapps-cdn.esri.com/CDN/fonts/v1.4.1/fonts.css" />
   <link rel="stylesheet" href="../solutions-components.css" type="text/css">
   <style>
+  .content {
+    padding: 20px;
+  }
   .full-height {
     height: 100%;
   }
@@ -37,12 +40,12 @@
   <h1>Demo Solution Item</h1>
   <main id="appContainer">
     <div id="sol-item" class="content full-height">
-      <store-manager id="helper"></store-manager>
-      <solution-item id="demo"></solution-item>
+      <store-manager id="helper"/>
+      <solution-item id="demo"/>
     </div>
   </main>
-  <script src="./libs/require.js"></script>
+  <script src="./libs/require.js">/script>
   <script src="./libs/setLocale.js"></script>
   <script src="./monacoConfig.js"></script>
   <script>
@@ -53,9 +56,7 @@
     });
     require(['vs/editor/editor.main'],
     function () {
-      // Initialize the configuration content
       const demo = document.getElementById("demo");
       const helper = document.getElementById("helper");
       // set the data
@@ -68,7 +69,7 @@
       ])
         .then(results => Promise.all(results.map(r => r.json())))
         .then(jsonResults => {
-          helper.value = JSON.stringify(jsonResults[4].templates[0]);
+          helper.value = JSON.stringify(jsonResults[4]);
           const itemDetails = jsonResults[0].value;
           const value = jsonResults[1].value;

package/dist/collection/demos/solution-spatial-ref.html CHANGED Viewed

@@ -19,6 +19,7 @@
    | See the License for the specific language governing permissions and
    | limitations under the License.
   -->
   <link rel="stylesheet" type="text/css" href="https://js.arcgis.com/calcite-components/2.0.0/calcite.css" />
   <link rel="stylesheet" href="https://webapps-cdn.esri.com/CDN/fonts/v1.4.1/fonts.css" />
   <link rel="stylesheet" href="../solutions-components.css" type="text/css">
@@ -30,14 +31,16 @@
       height: calc(100% - 40px);
     }
   </style>
   <script type="module" src="https://js.arcgis.com/calcite-components/2.0.0/calcite.esm.js"></script>
   <script type="module" src="../solutions-components.esm.js"></script>
 </head>
 <body>
   <h1>Demo Solution Spatial Reference</h1>
   <main id="appContainer">
     <div class="content full-height">
-      <store-manager id="helper"></store-manager>
+      <store-manager id="helper"/>
       <solution-spatial-ref id="demo"/>
     </div>
   </main>
@@ -45,13 +48,16 @@
   <script src="./libs/require.js"></script>
   <script src="./libs/setLocale.js"></script>
   <script>
-    require([],  // for loading i18n in setLocale
+    require([],
     function () {
+      const demo = document.getElementById("demo");
+      const helper = document.getElementById("helper");
+      // set the data
       fetch("./data/election-outreach.json").then(result => {
         result.json().then(data => {
           document.getElementById("appContainer").style.opacity = "1";
-          const helper = document.getElementById("helper");
-          helper.value = JSON.stringify(data.templates);
+          helper.value = JSON.stringify(data);
         });
       });
     });

package/dist/collection/demos/solution-template-data.html CHANGED Viewed

@@ -24,6 +24,9 @@
   <link rel="stylesheet" href="https://webapps-cdn.esri.com/CDN/fonts/v1.4.1/fonts.css" />
   <link rel="stylesheet" href="../solutions-components.css" type="text/css">
   <style>
+  .content {
+    padding: 20px;
+  }
   .full-height {
     height: 100%;
   }
@@ -37,7 +40,7 @@
   <h1>Demo Solution Template Data</h1>
   <main id="appContainer">
     <div id="template-data" class="content full-height">
-      <store-manager id="helper"></store-manager>
+      <store-manager id="helper"/>
       <solution-template-data id="demo" instanceId="data" itemid="2d2d176f5f3e43a985a31649e213aaf4"></solution-template-data>
     </div>
   </main>
@@ -53,9 +56,7 @@
     });
     require(["vs/editor/editor.main"],
     function () {
-      // Initialize the content
       const demo = document.getElementById("demo");
       const helper = document.getElementById("helper");
       // set the data
@@ -67,8 +68,7 @@
       ])
         .then(results => Promise.all(results.map(r => r.json())))
         .then(jsonResults => {
-          const template = JSON.stringify(jsonResults[3].templates[0]);
-          helper.value = template;
+          helper.value = JSON.stringify(jsonResults[3]);
           demo.value = { value: jsonResults[0].value };
           demo.itemid = "2d2d176f5f3e43a985a31649e213aaf4";

package/dist/collection/utils/interfaces.ts CHANGED Viewed

@@ -275,7 +275,6 @@ export interface ISolutionTemplateEdits {
   [templateId: string]: ISolutionTemplateEdit;
 }
-//???
 export interface ISolutionModel {
   dataModel: monaco.editor.ITextModel;
   dataOriginValue: string;
@@ -306,7 +305,6 @@ export interface ISolutionModel {
 export interface ISolutionModels {
   [key: string]: ISolutionModel;
 }
-//???
 /**
  * Feature service name and whether the service is enabled for SR configuration

package/dist/collection/utils/solution-store.js CHANGED Viewed

@@ -256,14 +256,12 @@ class SolutionStore {
      */
     _flagStoreHasChanges(flagHasChanges) {
         // Event for notifying if the store has changes or not
-        if (this._hasChanges !== flagHasChanges) {
-            window.dispatchEvent(new CustomEvent("solutionStoreHasChanges", {
-                detail: flagHasChanges,
-                bubbles: true,
-                cancelable: false,
-                composed: true
-            }));
-        }
+        window.dispatchEvent(new CustomEvent("solutionStoreHasChanges", {
+            detail: flagHasChanges,
+            bubbles: true,
+            cancelable: false,
+            composed: true
+        }));
         this._hasChanges = flagHasChanges;
     }
     /**

package/dist/collection/utils/solution-store.ts CHANGED Viewed

@@ -53,11 +53,12 @@ import {
 //   * solutionItemId: [string] id of the current solution
 //   * defaultWkid: [any] value of the solution's `params.wkid.default` data property, which may be undefined
 //   * solutionData: [ISolutionItemData] the solution's data, which is modified in-place
-//   * featureServices: [array] a list of Feature service enablement status for SR configuration
+//   * featureServices: [array] a list of Feature services that use a spatial reference var
 //   * spatialReferenceInfo: [object] the current spatial reference (if enabled) and the services that use it
 //       * enabled: [boolean] use the spatial reference
-//       * services: [object] services using this spatial reference organized by the service name
-//       * spatialReference: [object] the spatial reference display
+//       * services: [object] for each service in featureServices by service name, a switch indicating if the
+//           custom spatial reference parameter is enabled/disabled
+//       * spatialReference: [object] the custom spatial reference wkid
 //
 // Store singleton method:
 //   * Store: Creates singleton instance when accessed; default export from module.
@@ -79,7 +80,7 @@ import {
 //
 //--------------------------------------------------------------------------------------------------------------------//
-interface SolutionStoreData {
+interface ISolutionStoreData {
   solutionItemId: string,
   defaultWkid: string,
   solutionData: ISolutionItemData,
@@ -88,7 +89,7 @@ interface SolutionStoreData {
   spatialReferenceInfo: ISolutionSpatialReferenceInfo
 }
-const EmptySolutionStore: SolutionStoreData = {
+const EmptySolutionStore: ISolutionStoreData = {
   solutionItemId: "",
   defaultWkid: undefined,
   solutionData: { metadata: {}, templates: [] },
@@ -374,14 +375,12 @@ class SolutionStore
    */
   protected _flagStoreHasChanges(flagHasChanges: boolean): void {
     // Event for notifying if the store has changes or not
-    if (this._hasChanges !== flagHasChanges) {
-      window.dispatchEvent(new CustomEvent("solutionStoreHasChanges", {
-        detail: flagHasChanges,
-        bubbles: true,
-        cancelable: false,
-        composed: true
-      }));
-    }
+    window.dispatchEvent(new CustomEvent("solutionStoreHasChanges", {
+      detail: flagHasChanges,
+      bubbles: true,
+      cancelable: false,
+      composed: true
+    }));
     this._hasChanges = flagHasChanges;
   }

package/dist/collection/utils/templates.js CHANGED Viewed

@@ -18,11 +18,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { getProp } from "@esri/solution-common";
 //--------------------------------------------------------------------------
 //
 //  Public Functions
 //
 //--------------------------------------------------------------------------
+/**
+ * Gets a list of Feature Services that are not views along with an enabled property that indicates
+ * if the service currently uses a spatial reference variable.
+ *
+ * @param templates a list of item templates from the solution
+ *
+ * @returns a list of feature service names and an enabled property to indicate
+ * if they currently use a spatial reference variable.
+ */
+export function getFeatureServices(templates) {
+    return templates.reduce((prev, cur) => {
+        const name = cur.item.title || cur.item.name;
+        if (cur.type === "Feature Service" &&
+            cur.item.typeKeywords.indexOf("View Service") < 0 &&
+            prev.indexOf(name) < 0) {
+            const wkid = getProp(cur, "properties.service.spatialReference.wkid");
+            prev.push({ name, enabled: wkid.toString().startsWith("{{params.wkid||") });
+        }
+        return prev;
+    }, []);
+}
 /**
  * Sort the solution items
  *
@@ -100,6 +122,80 @@ export function getItemHierarchy(templates) {
     }
     return hierarchy;
 }
+/**
+ * Create and store text models for the editor as well as other key values such as the original values
+ * that can be used to clear any temp edits.
+ *
+ * @param templates a list of item templates from the solution
+ *
+ * @returns a list of models and key values
+ */
+export function getModels(templates) {
+    const ids = [];
+    const models = {};
+    const monacoDefined = typeof (monaco) !== "undefined";
+    templates.forEach(t => {
+        var _a, _b, _c, _d;
+        if (ids.indexOf(t.itemId) < 0) {
+            ids.push(t.itemId);
+            models[t.itemId] = {
+                dataModel: monacoDefined ? monaco.editor.createModel(JSON.stringify(t.data, null, '\t'), "json") : undefined,
+                dataOriginValue: JSON.stringify(t.data),
+                propsModel: monacoDefined ? monaco.editor.createModel(JSON.stringify(t.properties, null, '\t'), "json") : undefined,
+                propsOriginValue: JSON.stringify(t.properties),
+                propsDiffOriginValue: JSON.stringify(t.properties),
+                state: undefined,
+                shareInfo: undefined,
+                isEditing: false,
+                itemId: t.itemId,
+                updateItemValues: {},
+                originalItemValues: {},
+                name: (_a = t.item) === null || _a === void 0 ? void 0 : _a.name,
+                title: (_b = t.item) === null || _b === void 0 ? void 0 : _b.title,
+                itemOriginValue: JSON.stringify(t.item),
+                spatialReference: (_d = (_c = t.properties) === null || _c === void 0 ? void 0 : _c.service) === null || _d === void 0 ? void 0 : _d.spatialReference,
+                resources: [], //???
+                resourceFilePaths: [], //???
+                sourceResourceFilePaths: [], //???
+                thumbnailOrigin: undefined, //???
+                thumbnailNew: undefined, //???
+                type: t.type
+            };
+        }
+    });
+    return models;
+}
+/**
+ * Set key organization variables we will allow users to insert at runtime
+ *
+ * @param translations nls translation object
+ *
+ * @returns a list of variables for the organization
+ */
+export function getOrganizationVariables(translations) {
+    const orgVars = [{
+            id: "",
+            title: translations.geocodeUrl,
+            value: "{{organization.helperServices.geocode:getDefaultLocatorURL}}"
+        }, {
+            id: "",
+            title: translations.geometryUrl,
+            value: "{{organization.helperServices.geometry.url}}"
+        }, {
+            id: "",
+            title: translations.portalBaseUrl,
+            value: "{{portalBaseUrl}}"
+        }, {
+            id: "",
+            title: translations.routeUrl,
+            value: "{{organization.helperServices.route.url}}"
+        }, {
+            id: "",
+            title: translations.solutionItemExtent,
+            value: "{{solutionItemExtent}}"
+        }];
+    return orgVars;
+}
 /**
  * Explore the solution item templates for variables we will allow users to insert at runtime
  *
@@ -145,35 +241,26 @@ export function getSolutionVariables(templates, translations) {
     return vars;
 }
 /**
- * Set key organization variables we will allow users to insert at runtime
+ * Stores basic spatial reference information that is used to determine if a custom spatial reference parameter will
+ * be exposed while deploying this solution and if so what feature services will support it and what will the default wkid be
  *
- * @param translations nls translation object
+ * @param services a list of objects with service name and enabled property (indicates if they currently use a spatial reference var)
+ * @param data the data object of a solution item
  *
- * @returns a list of variables for the organization
+ * @returns an object that stores if a custom spatial reference parameter is enabled/disabled,
+ * a list of services and if they are enabled/disabled, and the default wkid
  */
-export function getOrganizationVariables(translations) {
-    const orgVars = [{
-            id: "",
-            title: translations.geocodeUrl,
-            value: "{{organization.helperServices.geocode:getDefaultLocatorURL}}"
-        }, {
-            id: "",
-            title: translations.geometryUrl,
-            value: "{{organization.helperServices.geometry.url}}"
-        }, {
-            id: "",
-            title: translations.portalBaseUrl,
-            value: "{{portalBaseUrl}}"
-        }, {
-            id: "",
-            title: translations.routeUrl,
-            value: "{{organization.helperServices.route.url}}"
-        }, {
-            id: "",
-            title: translations.solutionItemExtent,
-            value: "{{solutionItemExtent}}"
-        }];
-    return orgVars;
+export function getSpatialReferenceInfo(services, data) {
+    const defaultServices = {};
+    services.forEach(service => {
+        defaultServices[service.name] = service.enabled;
+    });
+    const wkid = getProp(data, "params.wkid.default");
+    return {
+        enabled: wkid !== undefined && wkid !== "",
+        services: defaultServices,
+        spatialReference: wkid ? { wkid } : undefined
+    };
 }
 //--------------------------------------------------------------------------
 //

package/dist/collection/utils/templates.ts CHANGED Viewed

@@ -24,12 +24,13 @@ import {
   //IItemShare,
   IOrganizationVariableItem,
   //IResourcePath,
-  //SolutionModels,
+  ISolutionModels,
   //ISolutionSpatialReferenceInfo,
   IVariableItem
 } from '../utils/interfaces';
 import {
-  IItemTemplate
+  IItemTemplate,
+  getProp
 } from '@esri/solution-common';
 //--------------------------------------------------------------------------
@@ -38,6 +39,31 @@ import {
 //
 //--------------------------------------------------------------------------
+/**
+ * Gets a list of Feature Services that are not views along with an enabled property that indicates
+ * if the service currently uses a spatial reference variable.
+ *
+ * @param templates a list of item templates from the solution
+ *
+ * @returns a list of feature service names and an enabled property to indicate
+ * if they currently use a spatial reference variable.
+ */
+export function getFeatureServices(
+  templates: IItemTemplate[]
+): any[] {
+  return templates.reduce((prev, cur) => {
+    const name: string = cur.item.title || cur.item.name;
+    if (cur.type === "Feature Service" &&
+      cur.item.typeKeywords.indexOf("View Service") < 0 &&
+      prev.indexOf(name) < 0
+    ) {
+      const wkid = getProp(cur, "properties.service.spatialReference.wkid");
+      prev.push({ name, enabled: wkid.toString().startsWith("{{params.wkid||")});
+    }
+    return prev;
+  }, []);
+}
 /**
  * Sort the solution items
  *
@@ -131,6 +157,83 @@ export function getItemHierarchy(
   return hierarchy;
 }
+/**
+ * Create and store text models for the editor as well as other key values such as the original values
+ * that can be used to clear any temp edits.
+ *
+ * @param templates a list of item templates from the solution
+ *
+ * @returns a list of models and key values
+ */
+export function getModels(templates: any[]): ISolutionModels {
+  const ids: string[] = [];
+  const models: ISolutionModels = {};
+  const monacoDefined = typeof(monaco) !== "undefined";
+  templates.forEach(t => {
+    if (ids.indexOf(t.itemId) < 0) {
+      ids.push(t.itemId);
+      models[t.itemId] = {
+        dataModel: monacoDefined ? monaco.editor.createModel(JSON.stringify(t.data, null, '\t'), "json") : undefined,
+        dataOriginValue: JSON.stringify(t.data),
+        propsModel: monacoDefined ? monaco.editor.createModel(JSON.stringify(t.properties, null, '\t'), "json") : undefined,
+        propsOriginValue: JSON.stringify(t.properties),
+        propsDiffOriginValue: JSON.stringify(t.properties),
+        state: undefined,
+        shareInfo: undefined,
+        isEditing: false,
+        itemId: t.itemId,
+        updateItemValues: {},
+        originalItemValues: {},
+        name: t.item?.name,
+        title: t.item?.title,
+        itemOriginValue: JSON.stringify(t.item),
+        spatialReference: t.properties?.service?.spatialReference,
+        resources: [], //???
+        resourceFilePaths: [], //???
+        sourceResourceFilePaths: [], //???
+        thumbnailOrigin: undefined, //???
+        thumbnailNew: undefined, //???
+        type: t.type
+      };
+    }
+  });
+  return models;
+}
+/**
+ * Set key organization variables we will allow users to insert at runtime
+ *
+ * @param translations nls translation object
+ *
+ * @returns a list of variables for the organization
+ */
+export function getOrganizationVariables(
+  translations: any
+): IOrganizationVariableItem[] {
+  const orgVars: IOrganizationVariableItem[] = [{
+    id: "",
+    title: translations.geocodeUrl,
+    value: "{{organization.helperServices.geocode:getDefaultLocatorURL}}"
+  }, {
+    id: "",
+    title: translations.geometryUrl,
+    value: "{{organization.helperServices.geometry.url}}"
+  }, {
+    id: "",
+    title: translations.portalBaseUrl,
+    value: "{{portalBaseUrl}}"
+  }, {
+    id: "",
+    title: translations.routeUrl,
+    value: "{{organization.helperServices.route.url}}"
+  }, {
+    id: "",
+    title: translations.solutionItemExtent,
+    value: "{{solutionItemExtent}}"
+  }];
+  return orgVars;
+}
 /**
  * Explore the solution item templates for variables we will allow users to insert at runtime
  *
@@ -181,37 +284,29 @@ export function getSolutionVariables(
 }
 /**
- * Set key organization variables we will allow users to insert at runtime
+ * Stores basic spatial reference information that is used to determine if a custom spatial reference parameter will
+ * be exposed while deploying this solution and if so what feature services will support it and what will the default wkid be
  *
- * @param translations nls translation object
+ * @param services a list of objects with service name and enabled property (indicates if they currently use a spatial reference var)
+ * @param data the data object of a solution item
  *
- * @returns a list of variables for the organization
+ * @returns an object that stores if a custom spatial reference parameter is enabled/disabled,
+ * a list of services and if they are enabled/disabled, and the default wkid
  */
-export function getOrganizationVariables(
-  translations: any
-): IOrganizationVariableItem[] {
-  const orgVars: IOrganizationVariableItem[] = [{
-    id: "",
-    title: translations.geocodeUrl,
-    value: "{{organization.helperServices.geocode:getDefaultLocatorURL}}"
-  }, {
-    id: "",
-    title: translations.geometryUrl,
-    value: "{{organization.helperServices.geometry.url}}"
-  }, {
-    id: "",
-    title: translations.portalBaseUrl,
-    value: "{{portalBaseUrl}}"
-  }, {
-    id: "",
-    title: translations.routeUrl,
-    value: "{{organization.helperServices.route.url}}"
-  }, {
-    id: "",
-    title: translations.solutionItemExtent,
-    value: "{{solutionItemExtent}}"
-  }];
-  return orgVars;
+export function getSpatialReferenceInfo(
+  services: any[],
+  data: any
+): any {
+  const defaultServices: any = {};
+  services.forEach(service => {
+    defaultServices[service.name] = service.enabled;
+  });
+  const wkid = getProp(data, "params.wkid.default");
+  return {
+    enabled: wkid !== undefined && wkid !== "",
+    services: defaultServices,
+    spatialReference: wkid ? { wkid } : undefined
+  }
 }
 //--------------------------------------------------------------------------

package/dist/collection/utils/test/templates.e2e.js CHANGED Viewed

@@ -23,8 +23,8 @@ import * as electionOutreach from "../../demos/data/election-outreach.json";
 describe("getInventoryItems", () => {
     it("can get inventory items", () => {
         const templates = electionOutreach.templates;
-        expect(templates.length).toEqual(11);
+        expect(templates.length).toEqual(12);
         const actual = getInventoryItems(templates);
-        expect(actual.length).toEqual(5);
+        expect(actual.length).toEqual(6);
     });
 });

package/dist/collection/utils/test/templates.e2e.ts CHANGED Viewed

@@ -22,8 +22,8 @@ import * as electionOutreach from '../../demos/data/election-outreach.json';
 describe("getInventoryItems", () => {
   it("can get inventory items", () => {
     const templates = electionOutreach.templates;
-    expect(templates.length).toEqual(11)
+    expect(templates.length).toEqual(12)
     const actual = getInventoryItems(templates);
-    expect(actual.length).toEqual(5);
+    expect(actual.length).toEqual(6);
   });
 });

package/dist/components/_commonjsHelpers.js ADDED Viewed

@@ -0,0 +1,16 @@
+/*!
+ * Copyright 2022 Esri
+ * Licensed under the Apache License, Version 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+function getDefaultExportFromCjs (x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
+function commonjsRequire (path) {
+	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
+}
+export { commonjsRequire as a, commonjsGlobal as c, getDefaultExportFromCjs as g };

package/dist/components/core.js CHANGED Viewed

@@ -5,7 +5,7 @@
  */
 /**
  * Do not edit directly
- * Generated on Wed, 17 Jan 2024 17:52:08 GMT
+ * Generated on Wed, 01 May 2024 00:07:10 GMT
  */
 const calciteSize24 = "24px";
 const calciteSize32 = "32px";

package/dist/components/downloadUtils.js CHANGED Viewed

@@ -3,7 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  */
-import { g as getDefaultExportFromCjs } from './esri-loader.js';
+import { g as getDefaultExportFromCjs } from './_commonjsHelpers.js';
 import { getAssetPath } from '@stencil/core/internal/client';
 import { l as loadModules } from './loadModules.js';
 import { q as queryFeaturesByID } from './queryUtils.js';

package/dist/components/esri-loader.js CHANGED Viewed

@@ -3,15 +3,7 @@
  * Licensed under the Apache License, Version 2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  */
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-function getDefaultExportFromCjs (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
-}
-function commonjsRequire (path) {
-	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
-}
+import { c as commonjsGlobal } from './_commonjsHelpers.js';
 var esriLoader = {exports: {}};
@@ -308,4 +300,4 @@ Object.defineProperty(exports, '__esModule', { value: true });
 }(esriLoader, esriLoader.exports));
-export { commonjsRequire as a, commonjsGlobal as c, esriLoader as e, getDefaultExportFromCjs as g };
+export { esriLoader as e };