@esri/solutions-components 0.7.33 → 0.7.34

package/dist/cjs/card-manager_3.cjs.entry.js

@@ -1383,35 +1383,47 @@ const LayerTable = class {
      * @returns a list of column templates if they exist
      */
     _getColumnTemplates(id, fieldInfos) {
-        var _a;
-        let layerInfo;
-        (_a = this.mapInfo.layerInfos) === null || _a === void 0 ? void 0 : _a.some(li => {
-            if (li.id === id) {
-                layerInfo = li;
+        var _a, _b;
+        let layerOption;
+        (_b = (_a = this.mapInfo) === null || _a === void 0 ? void 0 : _a.layerOptions) === null || _b === void 0 ? void 0 : _b.layers.some(l => {
+            if (l.id === id) {
+                layerOption = l;
                 return true;
             }
         });
-        let columnTemplates = layerInfo === null || layerInfo === void 0 ? void 0 : layerInfo.columnTemplates;
+        const fieldOrder = (layerOption === null || layerOption === void 0 ? void 0 : layerOption.fields) && (layerOption === null || layerOption === void 0 ? void 0 : layerOption.fieldOrder) ?
+            layerOption.fieldOrder.filter(f => layerOption.fields.indexOf(f) > -1) :
+            undefined;
+        let columnTemplates;
         if (fieldInfos) {
-            columnTemplates = columnTemplates ? columnTemplates.map(columnTemplate => {
-                fieldInfos.some(fieldInfo => {
-                    if (fieldInfo.name === columnTemplate.fieldName) {
-                        columnTemplate.label = fieldInfo.alias;
-                        columnTemplate.menuConfig = this._getMenuConfig(fieldInfo.name);
-                        return true;
+            columnTemplates = layerOption && (layerOption === null || layerOption === void 0 ? void 0 : layerOption.fields)
+                ? fieldInfos.reduce((prev, cur) => {
+                    if (layerOption.fields.indexOf(cur.name) > -1) {
+                        const template = {
+                            type: "field",
+                            fieldName: cur.name,
+                            label: cur.alias,
+                            menuConfig: this._getMenuConfig(cur.name)
+                        };
+                        prev.push(template);
                     }
+                    return prev;
+                }, []).sort(this._sortFields.bind(this, layerOption === null || layerOption === void 0 ? void 0 : layerOption.fieldOrder))
+                : fieldInfos.map(fieldInfo => {
+                    return {
+                        type: "field",
+                        fieldName: fieldInfo.name,
+                        label: fieldInfo.alias,
+                        menuConfig: this._getMenuConfig(fieldInfo.name)
+                    };
                 });
-                return columnTemplate;
-            }) : fieldInfos.map(fieldInfo => {
-                return {
-                    type: "field",
-                    fieldName: fieldInfo.name,
-                    label: fieldInfo.alias,
-                    menuConfig: this._getMenuConfig(fieldInfo.name)
-                };
-            });
         }
-        return columnTemplates;
+        return fieldOrder ?
+            columnTemplates === null || columnTemplates === void 0 ? void 0 : columnTemplates.sort(this._sortFields.bind(this, fieldOrder)) :
+            columnTemplates;
+    }
+    _sortFields(sorter, a, b) {
+        return (sorter === null || sorter === void 0 ? void 0 : sorter.indexOf(a.fieldName)) - sorter.indexOf(b.fieldName);
     }
     /**
      * Get the menu config that adds the ability to hide the current column

package/dist/collection/components/basemap-gallery/basemap-gallery.css

@@ -1,19 +1,19 @@
-/** @license
- * Copyright 2022 Esri
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-:host {
-  display: block;
-}
+/** @license
+ * Copyright 2022 Esri
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+:host {
+  display: block;
+}

package/dist/collection/components/layer-table/layer-table.js

@@ -1298,35 +1298,47 @@ export class LayerTable {
      * @returns a list of column templates if they exist
      */
     _getColumnTemplates(id, fieldInfos) {
-        var _a;
-        let layerInfo;
-        (_a = this.mapInfo.layerInfos) === null || _a === void 0 ? void 0 : _a.some(li => {
-            if (li.id === id) {
-                layerInfo = li;
+        var _a, _b;
+        let layerOption;
+        (_b = (_a = this.mapInfo) === null || _a === void 0 ? void 0 : _a.layerOptions) === null || _b === void 0 ? void 0 : _b.layers.some(l => {
+            if (l.id === id) {
+                layerOption = l;
                 return true;
             }
         });
-        let columnTemplates = layerInfo === null || layerInfo === void 0 ? void 0 : layerInfo.columnTemplates;
+        const fieldOrder = (layerOption === null || layerOption === void 0 ? void 0 : layerOption.fields) && (layerOption === null || layerOption === void 0 ? void 0 : layerOption.fieldOrder) ?
+            layerOption.fieldOrder.filter(f => layerOption.fields.indexOf(f) > -1) :
+            undefined;
+        let columnTemplates;
         if (fieldInfos) {
-            columnTemplates = columnTemplates ? columnTemplates.map(columnTemplate => {
-                fieldInfos.some(fieldInfo => {
-                    if (fieldInfo.name === columnTemplate.fieldName) {
-                        columnTemplate.label = fieldInfo.alias;
-                        columnTemplate.menuConfig = this._getMenuConfig(fieldInfo.name);
-                        return true;
+            columnTemplates = layerOption && (layerOption === null || layerOption === void 0 ? void 0 : layerOption.fields)
+                ? fieldInfos.reduce((prev, cur) => {
+                    if (layerOption.fields.indexOf(cur.name) > -1) {
+                        const template = {
+                            type: "field",
+                            fieldName: cur.name,
+                            label: cur.alias,
+                            menuConfig: this._getMenuConfig(cur.name)
+                        };
+                        prev.push(template);
                     }
+                    return prev;
+                }, []).sort(this._sortFields.bind(this, layerOption === null || layerOption === void 0 ? void 0 : layerOption.fieldOrder))
+                : fieldInfos.map(fieldInfo => {
+                    return {
+                        type: "field",
+                        fieldName: fieldInfo.name,
+                        label: fieldInfo.alias,
+                        menuConfig: this._getMenuConfig(fieldInfo.name)
+                    };
                 });
-                return columnTemplate;
-            }) : fieldInfos.map(fieldInfo => {
-                return {
-                    type: "field",
-                    fieldName: fieldInfo.name,
-                    label: fieldInfo.alias,
-                    menuConfig: this._getMenuConfig(fieldInfo.name)
-                };
-            });
         }
-        return columnTemplates;
+        return fieldOrder ?
+            columnTemplates === null || columnTemplates === void 0 ? void 0 : columnTemplates.sort(this._sortFields.bind(this, fieldOrder)) :
+            columnTemplates;
+    }
+    _sortFields(sorter, a, b) {
+        return (sorter === null || sorter === void 0 ? void 0 : sorter.indexOf(a.fieldName)) - sorter.indexOf(b.fieldName);
     }
     /**
      * Get the menu config that adds the ability to hide the current column

package/dist/collection/components/map-fullscreen/map-fullscreen.css

@@ -1,19 +1,19 @@
-/** @license
- * Copyright 2022 Esri
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-:host {
-  display: block;
-}
+/** @license
+ * Copyright 2022 Esri
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+:host {
+  display: block;
+}

package/dist/collection/components/map-legend/map-legend.css

@@ -1,3 +1,3 @@
-:host {
-  display: block;
-}
+:host {
+  display: block;
+}

package/dist/collection/demos/crowdsource-manager.html

@@ -1,12 +1,10 @@
 <html>
-  <head>
-    <meta charset="utf-8" />
-    <meta
-      name="viewport"
-      content="initial-scale=1,maximum-scale=1,user-scalable=no"
-    />
-    <title>Crowdsource Manager</title>
-    <!--
+
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
+  <title>Crowdsource Manager</title>
+  <!--
     | Copyright 2022 Esri
     |
     | Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,164 +19,188 @@
     | See the License for the specific language governing permissions and
     | limitations under the License.
     -->
-    <style>
-      .crowdsource {
-        height: 100vh;
-        width: 100vw;
-        display: flex;
-      }
-    </style>
+  <style>
+    .crowdsource {
+      height: 100vh;
+      width: 100vw;
+      display: flex;
+    }
+  </style>
 
-    <link rel="stylesheet" href="https://jsdev.arcgis.com/4.29/esri/themes/light/main.css" />
-    <!-- <link rel="stylesheet" href="https://jsdev.arcgis.com/4.29/esri/themes/dark/main.css" /> -->
-    <link rel="stylesheet" type="text/css" href="https://js.arcgis.com/calcite-components/2.0.0/calcite.css" />
+  <link rel="stylesheet" href="https://jsdev.arcgis.com/4.29/esri/themes/light/main.css" />
+  <!-- <link rel="stylesheet" href="https://jsdev.arcgis.com/4.29/esri/themes/dark/main.css" /> -->
+  <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">
+  <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">
 
-    <script src="https://jsdev.arcgis.com/4.29/"></script>
-    <script type="module" src="../solutions-components.esm.js"></script>
+  <script src="https://jsdev.arcgis.com/4.29/"></script>
+  <script type="module" src="../solutions-components.esm.js"></script>
 
-    <script>
-      function addValues() {
-        const demo = document.getElementById("demo");
+  <script>
+    function addValues() {
+      const demo = document.getElementById("demo");
 
-        let headerSet = false;
-        let custom = [];
-        var vars = window.location.search.substring(1).split('&');
-        vars.forEach((param) => {
-          let vals = param.split('=');
-          const v = vals[1];
-          switch (vals[0]) {
-            case "id":
-              custom = [{
-                id: v,
-                name: "Map from URL"
-              }];
-              break;
-            case "zoomAndScrollToSelected":
-              demo.zoomAndScrollToSelected = v.toLocaleLowerCase() === "true";
-              break;
-            case "hideHeader":
-              demo.hideHeader = v.toLocaleLowerCase() === "true";
-              headerSet = true;
-              break;
-            default:
-              break;
-          }
-        });
-
-        if (!headerSet) {
-          // Want the header to be disabled by default for IA
-          // Want the header to be enabled by default for the demo app
-          demo.hideHeader = false;
+      let headerSet = false;
+      let custom = [];
+      var vars = window.location.search.substring(1).split('&');
+      vars.forEach((param) => {
+        let vals = param.split('=');
+        const v = vals[1];
+        switch (vals[0]) {
+          case "id":
+            custom = [{
+              id: v,
+              name: "Map from URL"
+            }];
+            break;
+          case "zoomAndScrollToSelected":
+            demo.zoomAndScrollToSelected = v.toLocaleLowerCase() === "true";
+            break;
+          case "hideHeader":
+            demo.hideHeader = v.toLocaleLowerCase() === "true";
+            headerSet = true;
+            break;
+          default:
+            break;
         }
+      });
 
-        demo.mapInfos = [
-          ...custom,
-          ...[{
-            id: "ce3dec81bf714d3bb71da9691ab686d1",
-            name: "Popup Configured Map",
-            filterConfig: {
-              mapId: "ce3dec81bf714d3bb71da9691ab686d1",
-              layerExpressions: [
-                {
-                  id: "Requests_681",
-                  title: "Requests",
-                  operator: " AND ",
-                  expressions: [
-                    {
-                      definitionExpression: "OBJECTID > 690",
-                      id: 1701793260225,
-                      index: 0,
-                      name: "greater than 690",
-                      active: false
-                    }
-                  ]
-                }, {
-                  id: "Requets_6608",
-                  title: "Comments",
-                  operator: " AND ",
-                  expressions: [
-                    {
-                      definitionExpression: "OBJECTID > 1",
-                      id: 1701793260226,
-                      index: 0,
-                      name: "greater than 1",
-                      active: false
-                    }
-                  ]
-                }
-              ]
-            }
-            // filters: {},
-            // layerInfos: [{
-            //   id: "Requests_681",
-            //   columnTemplates: [{
-            //     type: "field",
-            //     fieldName: "ObjectId",
-            //     visible: false
-            //   }, {
-            //     type: "field",
-            //     fieldName: "reqcategory",
-            //     label: "Request ID",
-            //     visible: true
-            //   }]
-            // }, {
-            //   id: "Requets_6608",
-            //   columnTemplates: [{
-            //     type: "field",
-            //     fieldName: "requestglobalid",
-            //     visible: false
-            //   }, {
-            //     type: "field",
-            //     fieldName: "comments",
-            //     label: "Comments",
-            //     visible: true
-            //   }]
-            // }]
-          }, {
-            id: "863e4f6f2a7840db896cc1b1606d552d",
-            name: "IA map"
-          }, {
-            id: "3715f4899bea4b2a948347c5c2357e58",
-            name: "PN Map"
-          }, {
-            id: "4fa949c89bb04ecb8a9f5ad119448333",
-            name: "CS TIL DATA"
-          }, {
-            id: "f5b01c17a09941eaad63e7b4e6c7d880",
-            name: "Attachments Map"
-          }, {
-            id: "b422923b7a4c4958b9788118255f2f0a",
-            name: "Floor aware map"
-          }, {
-            id: "5dc8ae351ff34280a75f7ffe1115b36b",
-            name: "Standalone table",
-            filterConfig: {
-              "mapId": "5dc8ae351ff34280a75f7ffe1115b36b",
-              "layerExpressions": [{
-                "id": "18c4a8cda15-layer-2",
-                "title": "Table_1",
-                "operator": " AND ",
-                "expressions": [{
-                  "definitionExpression": "OBJECTID > 14",
-                  "id": 1702486334825,
-                  "index": 0,
-                  "name": "> 14",
-                  "active": false
-                }]
-              }]
-            }
-          }]
-        ];
+      if (!headerSet) {
+        // Want the header to be disabled by default for IA
+        // Want the header to be enabled by default for the demo app
+        demo.hideHeader = false;
       }
-    </script>
-  </head>
 
-  <!-- <body class="calcite-mode-dark" onload="addValues()"> -->
-  <body onload="addValues()">
-    <crowdsource-manager id="demo" class="crowdsource"/>
-    <!-- <crowdsource-manager id="demo" class="crowdsource" theme="dark"/> -->
-  </body>
+      demo.mapInfos = [
+        ...custom,
+        ...[{
+          id: "ce3dec81bf714d3bb71da9691ab686d1",
+          name: "Popup Configured Map",
+          filterConfig: {
+            mapId: "ce3dec81bf714d3bb71da9691ab686d1",
+            layerExpressions: [
+              {
+                id: "Requests_681",
+                title: "Requests",
+                operator: " AND ",
+                expressions: [
+                  {
+                    definitionExpression: "OBJECTID > 690",
+                    id: 1701793260225,
+                    index: 0,
+                    name: "greater than 690",
+                    active: false
+                  }
+                ]
+              }, {
+                id: "Requets_6608",
+                title: "Comments",
+                operator: " AND ",
+                expressions: [
+                  {
+                    definitionExpression: "OBJECTID > 1",
+                    id: 1701793260226,
+                    index: 0,
+                    name: "greater than 1",
+                    active: false
+                  }
+                ]
+              }
+            ]
+          }
+        }, {
+          id: "863e4f6f2a7840db896cc1b1606d552d",
+          name: "IA map"
+        }, {
+          id: "3715f4899bea4b2a948347c5c2357e58",
+          name: "PN Map"
+        }, {
+          id: "4fa949c89bb04ecb8a9f5ad119448333",
+          name: "CS TIL DATA"
+        }, {
+          id: "f5b01c17a09941eaad63e7b4e6c7d880",
+          name: "Attachments Map"
+        }, {
+          id: "b422923b7a4c4958b9788118255f2f0a",
+          name: "Floor aware map"
+        }, {
+          id: "5dc8ae351ff34280a75f7ffe1115b36b",
+          name: "Standalone table",
+          filterConfig: {
+            mapId: "5dc8ae351ff34280a75f7ffe1115b36b",
+            layerExpressions: [{
+              id: "18c4a8cda15-layer-2",
+              title: "Table_1",
+              operator: " AND ",
+              expressions: [{
+                definitionExpression: "OBJECTID > 14",
+                id: 1702486334825,
+                index: 0,
+                name: "> 14",
+                active: false
+              }]
+            }]
+          }
+        }, {
+          id: "91e220910a994da4abfb0d1763d64ecb",
+          name: "EditMultiLayers",
+          visible: true,
+          layerOptions: {
+            layers: [{
+              id: "18b1fb85a29-layer-3",
+              fields: [
+                "OBJECTID", "a", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "c"
+              ],
+              fieldOrder: [
+                "c", "b", "a", "OBJECTID", "Shape__Area", "Shape__Length", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n"
+              ]
+            }, {
+              id: "18b1fb862df-layer-4",
+              fields: ["OBJECTID", "test"],
+              fieldOrder: ["test", "OBJECTID"]
+            }, {
+              id: "18b1fb82f0e-layer-2",
+              fields: [
+                "URL", "Avg_Stars", "Your_Stars", "Route_Type", "Rating", "Pitches", "Length", "Area_Latitude", "Area_Longitude", "ObjectId"
+              ],
+              fieldOrder: [
+                "Your_Stars", "Route", "Location", "URL", "Avg_Stars", "Route_Type", "Rating", "Pitches", "Length", "Area_Latitude", "Area_Longitude", "ObjectId"
+              ]
+            }],
+            mapId: "91e220910a994da4abfb0d1763d64ecb"
+          }
+        }, {
+          id: "7197542839d948258c7862b33f9d96ad",
+          name: "EditPolymap",
+          visible: true
+        }, {
+          id: "fbe7bb1907f34d5aa8771ad6475a1dfe",
+          name: "Mountain Project",
+          visible: true,
+          layerOptions: {
+            layers: [{
+              id: "18a6ffdeae9-layer-2",
+              fields: [
+                "URL", "Avg_Stars", "Your_Stars", "Route_Type", "Rating", "Pitches", "Length", "Area_Latitude", "Area_Longitude", "ObjectId"
+              ],
+              fieldOrder: [
+                "Avg_Stars", "Route", "Location", "URL", "Your_Stars", "Route_Type", "Rating", "Pitches", "Length", "Area_Latitude", "Area_Longitude", "ObjectId"
+              ]
+            }],
+            mapId: "fbe7bb1907f34d5aa8771ad6475a1dfe"
+          }
+        }]
+      ];
+    }
+  </script>
+</head>
+
+<!-- <body class="calcite-mode-dark" onload="addValues()"> -->
+
+<body onload="addValues()">
+  <crowdsource-manager id="demo" class="crowdsource" />
+  <!-- <crowdsource-manager id="demo" class="crowdsource" theme="dark"/> -->
+</body>
+
 </html>

package/dist/collection/utils/interfaces.ts

@@ -450,14 +450,21 @@ export interface IMapInfo {
   name: string;
   searchConfiguration?: ISearchConfiguration;
   filterConfig?: IFilterConfig;
-  layerInfos?: ILayerInfo[];
   _hasValidLayers?: boolean;
   visible?: boolean;
+  layerOptions?: ILayerOptions;
 }
 
-export interface ILayerInfo {
+export interface ILayerOptions {
+  layers: ILayerDef[];
+  mapId?: string;
+}
+
+export interface ILayerDef {
   id: string;
-  columnTemplates: __esri.FieldColumnTemplate[];
+  sublayerId?: number;
+  fields?: string[];
+  fieldOrder?: string[];
 }
 
 export interface IMapChange {