@esri/solution-common 5.5.0 → 5.6.0

package/dist/cjs/featureServiceHelpers.js

@@ -46,7 +46,7 @@ function getFeatureServiceRelatedRecords(url, relationshipId, objectIds) {
     const options = {
         url: url + `/${relationshipId}`,
         relationshipId,
-        objectIds
+        objectIds,
     };
     return (0, arcgis_rest_feature_layer_2.queryRelated)(options);
 }
@@ -70,7 +70,7 @@ function templatize(itemTemplate, dependencies, templatizeFieldReferences, templ
         ...itemTemplate.item,
         id: (0, templatization_1.templatizeTerm)(id, id, ".itemId"),
         url: _templatize(id, "url"),
-        typeKeywords: (0, templatization_1.templatizeIds)(itemTemplate.item.typeKeywords)
+        typeKeywords: (0, templatization_1.templatizeIds)(itemTemplate.item.typeKeywords),
     };
     // special handeling if we are dealing with a tracker view
     (0, trackingHelpers_1.templatizeTracker)(itemTemplate);
@@ -85,7 +85,7 @@ function templatize(itemTemplate, dependencies, templatizeFieldReferences, templ
     const _items = layers.concat(tables);
     // Set up symbols for the URL of the feature service and its layers and tables
     templateDictionary[fsUrl] = itemTemplate.item.url; // map FS URL to its templatized form
-    jsonItems.concat(_items).forEach(layer => {
+    jsonItems.concat(_items).forEach((layer) => {
         templateDictionary[fsUrl + "/" + layer.id] = _templatize(id, "layer" + layer.id + ".url");
     });
     // templatize the service references serviceItemId
@@ -114,7 +114,7 @@ function templatize(itemTemplate, dependencies, templatizeFieldReferences, templ
     let hasZ = false;
     jsonItems.forEach((jsonItem) => {
         // get the source service json for the given data item
-        const matchingItems = _items.filter(item => {
+        const matchingItems = _items.filter((item) => {
             return jsonItem.id === item.id;
         });
         // templatize the source service json
@@ -136,7 +136,7 @@ exports.templatize = templatize;
  */
 function deleteViewProps(layer) {
     const props = ["definitionQuery"];
-    props.forEach(prop => {
+    props.forEach((prop) => {
         (0, generalHelpers_1.deleteProp)(layer, prop);
     });
 }
@@ -158,7 +158,7 @@ function cacheFieldInfos(layer, fieldInfos) {
         fieldInfos[layer.id] = {
             sourceFields: JSON.parse(JSON.stringify(layer.fields)),
             type: layer.type,
-            id: layer.id
+            id: layer.id,
         };
     }
     // cache each of these properties as they each can contain field references
@@ -171,9 +171,9 @@ function cacheFieldInfos(layer, fieldInfos) {
         relationships: true,
         drawingInfo: false,
         timeInfo: false,
-        viewDefinitionQuery: false
+        viewDefinitionQuery: false,
     };
-    Object.keys(props).forEach(k => {
+    Object.keys(props).forEach((k) => {
         _cacheFieldInfo(layer, k, fieldInfos, props[k]);
     });
     return fieldInfos;
@@ -188,9 +188,9 @@ exports.cacheFieldInfos = cacheFieldInfos;
  * @returns An updated instance of the fieldInfos
  */
 function cacheContingentValues(id, fieldInfos, itemTemplate) {
-    const contingentValues = (0, generalHelpers_1.getProp)(itemTemplate, 'properties.contingentValues');
+    const contingentValues = (0, generalHelpers_1.getProp)(itemTemplate, "properties.contingentValues");
     if (contingentValues && contingentValues[id]) {
-        fieldInfos[id]['contingentValues'] = contingentValues[id];
+        fieldInfos[id]["contingentValues"] = contingentValues[id];
     }
     return fieldInfos;
 }
@@ -206,10 +206,7 @@ exports.cacheContingentValues = cacheContingentValues;
  */
 function _cacheFieldInfo(layer, prop, fieldInfos, removeProp) {
     /* istanbul ignore else */
-    if (layer &&
-        layer.hasOwnProperty(prop) &&
-        fieldInfos &&
-        fieldInfos.hasOwnProperty(layer.id)) {
+    if (layer && layer.hasOwnProperty(prop) && fieldInfos && fieldInfos.hasOwnProperty(layer.id)) {
         fieldInfos[layer.id][prop] = layer[prop];
         // editFieldsInfo does not come through unless its with the layer
         // when it's being added
@@ -230,7 +227,7 @@ function cachePopupInfos(data) {
     // store any popupInfo so we can update after any potential name changes
     const popupInfos = {
         layers: {},
-        tables: {}
+        tables: {},
     };
     if (data && data.layers && data.layers.length > 0) {
         _cachePopupInfo(popupInfos, "layers", data.layers);
@@ -275,11 +272,11 @@ function cacheLayerInfo(layerId, itemId, url, templateDictionary) {
         // need to structure these differently so they are not used for standard replacement calls
         // this now adds additional vars that are not needing replacement unless we fail to fetch the service
         const newVars = (0, generalHelpers_1.getProp)(templateDictionary, `${interfaces_1.UNREACHABLE}.${itemId}`) || {
-            itemId
+            itemId,
         };
         newVars[layerIdVar] = (0, generalHelpers_1.getProp)(newVars, layerIdVar) || {
             layerId,
-            itemId
+            itemId,
         };
         if (url !== "") {
             newVars[layerIdVar]["url"] = url;
@@ -288,7 +285,7 @@ function cacheLayerInfo(layerId, itemId, url, templateDictionary) {
         unreachableVars[itemId] = newVars;
         templateDictionary[interfaces_1.UNREACHABLE] = {
             ...templateDictionary[interfaces_1.UNREACHABLE],
-            ...unreachableVars
+            ...unreachableVars,
         };
     }
 }
@@ -309,7 +306,7 @@ function updateTemplate(itemTemplate, templateDictionary, createResponse) {
     templateDictionary[itemTemplate.itemId] = Object.assign(templateDictionary[itemTemplate.itemId] || {}, {
         itemId: createResponse.serviceItemId,
         url: (0, generalHelpers_1.checkUrlPathTermination)(createResponse.serviceurl),
-        name: createResponse.name
+        name: createResponse.name,
     });
     // Update the item template now that the new service has been created
     itemTemplate.itemId = createResponse.serviceItemId;
@@ -330,7 +327,7 @@ function _updateTypeKeywords(itemTemplate, createResponse) {
     const iKwords = (0, generalHelpers_1.getProp)(itemTemplate, "item.typeKeywords");
     const cKwords = (0, generalHelpers_1.getProp)(createResponse, "typeKeywords");
     if (iKwords && cKwords) {
-        (0, generalHelpers_1.setProp)(itemTemplate, "item.typeKeywords", iKwords.concat(cKwords.filter(k => iKwords.indexOf(k) < 0)));
+        (0, generalHelpers_1.setProp)(itemTemplate, "item.typeKeywords", iKwords.concat(cKwords.filter((k) => iKwords.indexOf(k) < 0)));
     }
     return itemTemplate;
 }
@@ -352,16 +349,12 @@ function getLayerSettings(layerInfos, url, itemId, enterpriseIDMapping) {
     ids.forEach((id) => {
         const _layerId = (0, generalHelpers_1.getProp)(layerInfos[id], "item.id");
         const isNum = parseInt(_layerId, 10) > -1;
-        const layerId = isNum && enterpriseIDMapping
-            ? enterpriseIDMapping[_layerId]
-            : isNum
-                ? _layerId
-                : id;
+        const layerId = isNum && enterpriseIDMapping ? enterpriseIDMapping[_layerId] : isNum ? _layerId : id;
         settings[`layer${isNum ? _layerId : id}`] = {
             fields: _getNameMapping(layerInfos, id),
             url: (0, generalHelpers_1.checkUrlPathTermination)(url) + layerId,
             layerId,
-            itemId
+            itemId,
         };
         (0, generalHelpers_1.deleteProp)(layerInfos[id], "newFields");
         (0, generalHelpers_1.deleteProp)(layerInfos[id], "sourceFields");
@@ -381,7 +374,7 @@ exports.getLayerSettings = getLayerSettings;
  */
 function setNamesAndTitles(templates, solutionItemId) {
     const names = [];
-    return templates.map(t => {
+    return templates.map((t) => {
         /* istanbul ignore else */
         if (t.item.type === "Feature Service") {
             // Retain the existing title but swap with name if it's missing
@@ -396,10 +389,7 @@ function setNamesAndTitles(templates, solutionItemId) {
                 // Limit the baseName to 50 characters before the _<guid>
                 const name = baseName.substring(0, 50) + "_" + solutionItemId;
                 // If the name + GUID already exists then append "_occurrenceCount"
-                t.item.name =
-                    names.indexOf(name) === -1
-                        ? name
-                        : `${name}_${names.filter(n => n === name).length}`;
+                t.item.name = names.indexOf(name) === -1 ? name : `${name}_${names.filter((n) => n === name).length}`;
                 names.push(name);
             }
         }
@@ -433,7 +423,7 @@ function updateSettingsFieldInfos(itemTemplate, settings) {
                             ? { ...settings[k]["sourceServiceFields"], ...fieldInfos }
                             : fieldInfos;
                         const layerKeys = Object.keys(settings[_k]);
-                        layerKeys.forEach(layerKey => {
+                        layerKeys.forEach((layerKey) => {
                             /* istanbul ignore else */
                             if (layerKey.startsWith("layer")) {
                                 settings[k][layerKey] = settings[_k][layerKey];
@@ -462,8 +452,8 @@ function updateTemplateForInvalidDesignations(template, authentication) {
             // get the admin URL
             const url = template.item.url;
             (0, restHelpers_1.rest_request)(url + "?f=json", {
-                authentication: authentication
-            }).then(serviceData => {
+                authentication: authentication,
+            }).then((serviceData) => {
                 const layerInfos = {};
                 const layersAndTables = (serviceData.layers || []).concat(serviceData.tables || []);
                 layersAndTables.forEach((l) => {
@@ -473,10 +463,10 @@ function updateTemplateForInvalidDesignations(template, authentication) {
                     }
                 });
                 template.data[template.itemId] = Object.assign({
-                    itemId: template.itemId
+                    itemId: template.itemId,
                 }, getLayerSettings(layerInfos, url, template.itemId));
                 resolve(template);
-            }, e => reject((0, generalHelpers_1.fail)(e)));
+            }, (e) => reject((0, generalHelpers_1.fail)(e)));
         }
         else {
             resolve(template);
@@ -497,7 +487,7 @@ exports.updateTemplateForInvalidDesignations = updateTemplateForInvalidDesignati
  */
 function processContingentValues(properties, adminUrl, authentication) {
     return new Promise((resolve, reject) => {
-        if ((0, generalHelpers_1.getProp)(properties, 'service.isView')) {
+        if ((0, generalHelpers_1.getProp)(properties, "service.isView")) {
             // views will inherit from the source service
             resolve();
         }
@@ -507,8 +497,10 @@ function processContingentValues(properties, adminUrl, authentication) {
             const contingentValuePromises = layersAndTables.reduce((prev, cur) => {
                 /* istanbul ignore else */
                 if (cur.hasContingentValuesDefinition) {
-                    prev.push((0, restHelpers_1.rest_request)(`${adminUrl}/${cur['id']}/contingentValues?f=json`, { authentication }));
-                    layerIds.push(cur['id']);
+                    prev.push((0, restHelpers_1.rest_request)(`${adminUrl}/${cur["id"]}/contingentValues?f=json`, {
+                        authentication,
+                    }));
+                    layerIds.push(cur["id"]);
                 }
                 return prev;
             }, []);
@@ -516,13 +508,18 @@ function processContingentValues(properties, adminUrl, authentication) {
                 Promise.all(contingentValuePromises).then((results) => {
                     const contingentValues = {};
                     results.forEach((r, i) => {
-                        (0, generalHelpers_1.deleteProp)(r, 'typeCodes');
+                        (0, generalHelpers_1.deleteProp)(r, "typeCodes");
                         /* istanbul ignore else */
-                        if ((0, generalHelpers_1.getProp)(r, 'stringDicts') && (0, generalHelpers_1.getProp)(r, 'contingentValuesDefinition')) {
-                            r.contingentValuesDefinition['stringDicts'] = r.stringDicts;
-                            (0, generalHelpers_1.deleteProp)(r, 'stringDicts');
+                        if ((0, generalHelpers_1.getProp)(r, "stringDicts") && (0, generalHelpers_1.getProp)(r, "contingentValuesDefinition")) {
+                            r.contingentValuesDefinition["stringDicts"] = r.stringDicts;
+                            (0, generalHelpers_1.deleteProp)(r, "stringDicts");
                         }
-                        (0, generalHelpers_1.deleteProps)((0, generalHelpers_1.getProp)(r, 'contingentValuesDefinition'), ['layerID', 'layerName', 'geometryType', 'hasSubType']);
+                        (0, generalHelpers_1.deleteProps)((0, generalHelpers_1.getProp)(r, "contingentValuesDefinition"), [
+                            "layerID",
+                            "layerName",
+                            "geometryType",
+                            "hasSubType",
+                        ]);
                         contingentValues[layerIds[i]] = r;
                     });
                     properties.contingentValues = contingentValues;
@@ -547,13 +544,12 @@ exports.processContingentValues = processContingentValues;
  */
 function deTemplatizeFieldInfos(fieldInfos, popupInfos, adminLayerInfos, settings) {
     const fieldInfoKeys = Object.keys(fieldInfos);
-    fieldInfoKeys.forEach(id => {
+    fieldInfoKeys.forEach((id) => {
         if (fieldInfos[id].hasOwnProperty("templates")) {
             fieldInfos[id].templates = JSON.parse((0, templatization_1.replaceInTemplate)(JSON.stringify(fieldInfos[id].templates), settings));
         }
         if (fieldInfos[id].hasOwnProperty("adminLayerInfo")) {
-            adminLayerInfos[id].viewLayerDefinition.table.relatedTables =
-                fieldInfos[id].adminLayerInfo;
+            adminLayerInfos[id].viewLayerDefinition.table.relatedTables = fieldInfos[id].adminLayerInfo;
             (0, generalHelpers_1.deleteProp)(fieldInfos[id], "adminLayerInfo");
         }
         if (fieldInfos[id].hasOwnProperty("types")) {
@@ -563,7 +559,7 @@ function deTemplatizeFieldInfos(fieldInfos, popupInfos, adminLayerInfos, setting
     return {
         popupInfos: (0, templatization_1.replaceInTemplate)(popupInfos, settings),
         fieldInfos: (0, templatization_1.replaceInTemplate)(fieldInfos, settings),
-        adminLayerInfos: (0, templatization_1.replaceInTemplate)(adminLayerInfos, settings)
+        adminLayerInfos: (0, templatization_1.replaceInTemplate)(adminLayerInfos, settings),
     };
 }
 exports.deTemplatizeFieldInfos = deTemplatizeFieldInfos;
@@ -582,13 +578,13 @@ function getLayersAndTables(itemTemplate) {
     (properties.layers || []).forEach(function (layer) {
         layersAndTables.push({
             item: layer,
-            type: "layer"
+            type: "layer",
         });
     });
     (properties.tables || []).forEach(function (table) {
         layersAndTables.push({
             item: table,
-            type: "table"
+            type: "table",
         });
     });
     return layersAndTables;
@@ -607,14 +603,14 @@ exports.getLayersAndTables = getLayersAndTables;
  */
 function getExistingLayersAndTables(url, ids, authentication) {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    return new Promise(resolve => {
-        const defs = ids.map(id => {
+    return new Promise((resolve) => {
+        const defs = ids.map((id) => {
             return (0, restHelpers_1.rest_request)((0, generalHelpers_1.checkUrlPathTermination)(url) + id, {
-                authentication
+                authentication,
             });
         });
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        Promise.all(defs.map(p => p.catch(e => e))).then(resolve);
+        Promise.all(defs.map((p) => p.catch((e) => e))).then(resolve);
     });
 }
 exports.getExistingLayersAndTables = getExistingLayersAndTables;
@@ -645,13 +641,13 @@ function addFeatureServiceLayersAndTables(itemTemplate, templateDictionary, popu
                     // Detemplatize field references and update the layer properties
                     // Only failure path is handled by addFeatureServiceDefinition
                     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                    updateLayerFieldReferences(itemTemplate, fieldInfos, popupInfos, adminLayerInfos, templateDictionary).then(r => {
+                    updateLayerFieldReferences(itemTemplate, fieldInfos, popupInfos, adminLayerInfos, templateDictionary).then((r) => {
                         // Update relationships and layer definitions
                         const updates = (0, restHelpers_1.getLayerUpdates)({
                             message: "updated layer definition",
                             objects: r.layerInfos.fieldInfos,
                             itemTemplate: r.itemTemplate,
-                            authentication
+                            authentication,
                         }, templateDictionary.isPortal);
                         // Process the updates sequentially
                         updates
@@ -660,11 +656,9 @@ function addFeatureServiceLayersAndTables(itemTemplate, templateDictionary, popu
                                 return (0, restHelpers_1.getRequest)(update);
                             });
                         }, Promise.resolve(null))
-                            .then(() => resolve(null), (e) => reject((0, generalHelpers_1.fail)(e)) // getRequest
-                        );
+                            .then(() => resolve(null), (e) => reject((0, generalHelpers_1.fail)(e)));
                     });
-                }, e => reject((0, generalHelpers_1.fail)(e)) // addFeatureServiceDefinition
-                );
+                }, (e) => reject((0, generalHelpers_1.fail)(e)));
             }
             else {
                 resolve(null);
@@ -697,7 +691,7 @@ function addFeatureServiceDefinition(serviceUrl, listToAdd, templateDictionary,
             let options = {
                 layers: [],
                 tables: [],
-                authentication
+                authentication,
             };
             // if the service has veiws keep track of the fields so we can use them to
             // compare with the view fields
@@ -731,10 +725,9 @@ function addFeatureServiceDefinition(serviceUrl, listToAdd, templateDictionary,
                     item.adminLayerInfo = (0, templatization_1.replaceInTemplate)(item.adminLayerInfo, templateDictionary);
                     /* istanbul ignore else */
                     if (fieldInfos && fieldInfos.hasOwnProperty(item.id)) {
-                        Object.keys(templateDictionary).some(k => {
+                        Object.keys(templateDictionary).some((k) => {
                             if (templateDictionary[k].itemId === itemTemplate.itemId) {
-                                fieldInfos[item.id]["sourceServiceFields"] =
-                                    templateDictionary[k].sourceServiceFields;
+                                fieldInfos[item.id]["sourceServiceFields"] = templateDictionary[k].sourceServiceFields;
                                 return true;
                             }
                             else {
@@ -766,7 +759,7 @@ function addFeatureServiceDefinition(serviceUrl, listToAdd, templateDictionary,
                     options = {
                         layers: [],
                         tables: [],
-                        authentication
+                        authentication,
                     };
                 }
             });
@@ -820,7 +813,7 @@ function _updateAddOptions(itemTemplate, options, layerChunks, isSelfReferential
             options = {
                 layers: [],
                 tables: [],
-                authentication
+                authentication,
             };
         }
     }
@@ -837,9 +830,9 @@ exports._updateAddOptions = _updateAddOptions;
  * @private
  */
 function _isSelfReferential(layersAndTables) {
-    const names = layersAndTables.map(l => l.item.name);
+    const names = layersAndTables.map((l) => l.item.name);
     const srcTables = {};
-    return layersAndTables.some(l => {
+    return layersAndTables.some((l) => {
         const table = l.item.adminLayerInfo?.viewLayerDefinition?.table;
         if (table) {
             const name = table.sourceServiceName;
@@ -857,7 +850,7 @@ function _isSelfReferential(layersAndTables) {
                     srcTables[name] = [id];
                 }
             }
-            return (table.relatedTables || []).some(r => names.indexOf(r.name) > -1);
+            return (table.relatedTables || []).some((r) => names.indexOf(r.name) > -1);
         }
     });
 }
@@ -919,7 +912,7 @@ function _updateForPortal(item, itemTemplate, templateDictionary) {
             }
         }
         else {
-            Object.keys(templateDictionary).some(k => {
+            Object.keys(templateDictionary).some((k) => {
                 /* istanbul ignore else */
                 if (templateDictionary[k].itemId === item.serviceItemId) {
                     const layerInfo = templateDictionary[k][`layer${item.id}`];
@@ -960,12 +953,10 @@ function _getFieldNames(table, itemTemplate, templateDictionary) {
     /* istanbul ignore else */
     if (typeof viewSourceLayerId === "number") {
         // need to make sure these actually exist in the source..
-        itemTemplate.dependencies.forEach(d => {
+        itemTemplate.dependencies.forEach((d) => {
             const layerInfo = templateDictionary[d][`layer${viewSourceLayerId}`];
             /* istanbul ignore else */
-            if (layerInfo &&
-                layerInfo.fields &&
-                templateDictionary[d].name === table.sourceServiceName) {
+            if (layerInfo && layerInfo.fields && templateDictionary[d].name === table.sourceServiceName) {
                 if (Array.isArray(layerInfo.fields)) {
                     sourceLayerFields = sourceLayerFields.concat(layerInfo.fields.map((f) => f.name));
                 }
@@ -1031,8 +1022,7 @@ exports._updateItemFields = _updateItemFields;
  */
 function _updateSourceLayerFields(table, sourceLayerFields) {
     /* istanbul ignore else */
-    if (Array.isArray(table.sourceLayerFields) &&
-        table.sourceLayerFields.length > 0) {
+    if (Array.isArray(table.sourceLayerFields) && table.sourceLayerFields.length > 0) {
         // need to make sure these actually exist in the source..
         /* istanbul ignore else */
         if (sourceLayerFields.length > 0) {
@@ -1056,9 +1046,7 @@ function _updateGeomFieldName(adminLayerInfo, templateDictionary) {
     const fieldName = (0, generalHelpers_1.getProp)(adminLayerInfo, "geometryField.name");
     /* istanbul ignore else */
     if (fieldName && tableName) {
-        const geomName = templateDictionary.isPortal
-            ? `${tableName}.shape`
-            : `${tableName}.Shape`;
+        const geomName = templateDictionary.isPortal ? `${tableName}.shape` : `${tableName}.Shape`;
         (0, generalHelpers_1.setProp)(adminLayerInfo, "geometryField.name", geomName);
     }
     else if (!fieldName && (0, generalHelpers_1.getProp)(adminLayerInfo, "geometryField")) {
@@ -1084,13 +1072,11 @@ function _updateTemplateDictionaryFields(itemTemplate, templateDictionary, compa
     const tables = itemTemplate.properties.tables;
     const layersAndTables = layers.concat(tables);
     const fieldInfos = {};
-    layersAndTables.forEach(layerOrTable => {
+    layersAndTables.forEach((layerOrTable) => {
         fieldInfos[layerOrTable.id] = layerOrTable.fields;
     });
-    Object.keys(templateDictionary).some(k => {
-        if (compareItemId
-            ? templateDictionary[k].itemId === itemTemplate.itemId
-            : k === itemTemplate.itemId) {
+    Object.keys(templateDictionary).some((k) => {
+        if (compareItemId ? templateDictionary[k].itemId === itemTemplate.itemId : k === itemTemplate.itemId) {
             templateDictionary[k].fieldInfos = fieldInfos;
             return true;
         }
@@ -1146,9 +1132,7 @@ function validateSpatialReferenceAndExtent(serviceInfo, itemTemplate, templateDi
         }
         const viewExt = (0, generalHelpers_1.getProp)(serviceInfo, "service.fullExtent");
         /* istanbul ignore else */
-        if (sourceExt &&
-            viewExt &&
-            JSON.stringify(sourceExt) !== JSON.stringify(viewExt)) {
+        if (sourceExt && viewExt && JSON.stringify(sourceExt) !== JSON.stringify(viewExt)) {
             (0, generalHelpers_1.setCreateProp)(serviceInfo, "defaultExtent", sourceExt);
         }
     }
@@ -1167,18 +1151,17 @@ exports.validateSpatialReferenceAndExtent = validateSpatialReferenceAndExtent;
  * @private
  */
 function _getSourceSpatialReferenceAndExtent(serviceInfo, itemTemplate, templateDictionary, validateGeom) {
-    const layersAndTables = [
-        ...serviceInfo.layers || [],
-        ...serviceInfo.tables || []
-    ];
+    const layersAndTables = [...(serviceInfo.layers || []), ...(serviceInfo.tables || [])];
     let spatialReference;
     let extent;
-    itemTemplate.dependencies.some(id => {
+    itemTemplate.dependencies.some((id) => {
         const source = templateDictionary[id];
-        const hasGeom = validateGeom ? layersAndTables.some(layerOrTable => {
-            const name = (0, generalHelpers_1.getProp)(layerOrTable, "adminLayerInfo.viewLayerDefinition.table.sourceServiceName");
-            return name && source.name && name === source.name && layerOrTable.geometryType;
-        }) : true;
+        const hasGeom = validateGeom
+            ? layersAndTables.some((layerOrTable) => {
+                const name = (0, generalHelpers_1.getProp)(layerOrTable, "adminLayerInfo.viewLayerDefinition.table.sourceServiceName");
+                return name && source.name && name === source.name && layerOrTable.geometryType;
+            })
+            : true;
         const sr = (0, generalHelpers_1.getProp)(source, "defaultSpatialReference");
         /* istanbul ignore else */
         if (!spatialReference && sr && hasGeom) {
@@ -1193,7 +1176,7 @@ function _getSourceSpatialReferenceAndExtent(serviceInfo, itemTemplate, template
     });
     return {
         spatialReference,
-        extent
+        extent,
     };
 }
 exports._getSourceSpatialReferenceAndExtent = _getSourceSpatialReferenceAndExtent;
@@ -1218,9 +1201,9 @@ function updateLayerFieldReferences(itemTemplate, fieldInfos, popupInfos, adminL
             updatePopupInfo(itemTemplate, layerInfos.popupInfos);
             resolveFn({
                 itemTemplate,
-                layerInfos
+                layerInfos,
             });
-        }, e => rejectFn((0, generalHelpers_1.fail)(e)));
+        }, (e) => rejectFn((0, generalHelpers_1.fail)(e)));
     });
 }
 exports.updateLayerFieldReferences = updateLayerFieldReferences;
@@ -1246,7 +1229,7 @@ function postProcessFields(itemTemplate, layerInfos, popupInfos, adminLayerInfos
             const id = itemTemplate.itemId;
             const settingsKeys = Object.keys(templateDictionary);
             let templateInfo;
-            settingsKeys.some(k => {
+            settingsKeys.some((k) => {
                 if (templateDictionary[k].itemId === id) {
                     templateInfo = templateDictionary[k];
                     return true;
@@ -1271,8 +1254,7 @@ function postProcessFields(itemTemplate, layerInfos, popupInfos, adminLayerInfos
                     const layerInfo = layerInfos[item.id];
                     layerInfo["isView"] = item.isView;
                     layerInfo["newFields"] = item.fields;
-                    layerInfo["sourceSchemaChangesAllowed"] =
-                        item.sourceSchemaChangesAllowed;
+                    layerInfo["sourceSchemaChangesAllowed"] = item.sourceSchemaChangesAllowed;
                     /* istanbul ignore else */
                     if (item.editFieldsInfo) {
                         // more than case change when deployed to protal so keep track of the new names
@@ -1305,7 +1287,7 @@ exports.postProcessFields = postProcessFields;
  * @private
  */
 function updatePopupInfo(itemTemplate, popupInfos) {
-    ["layers", "tables"].forEach(type => {
+    ["layers", "tables"].forEach((type) => {
         const _items = (0, generalHelpers_1.getProp)(itemTemplate, "data." + type);
         /* istanbul ignore else */
         if (_items && Array.isArray(_items)) {
@@ -1371,7 +1353,7 @@ function _templatizeLayer(dataItem, adminItem, itemTemplate, dependencies, templ
     if (dataItem) {
         updates.push(dataItem);
     }
-    updates.forEach(update => {
+    updates.forEach((update) => {
         if (update.hasOwnProperty("name")) {
             // templatize the name but leave the current name as the optional default
             update.name = (0, templatization_1.templatizeTerm)(update["serviceItemId"] + ".layer" + update.id, update["serviceItemId"] + ".layer" + update.id, ".name||" + update.name);
@@ -1419,7 +1401,7 @@ exports._validateFields = _validateFields;
 function _validateDisplayField(adminItem, fieldNames) {
     const displayField = adminItem.displayField || "";
     let i = -1;
-    if (fieldNames.some(name => {
+    if (fieldNames.some((name) => {
         i += 1;
         return name === displayField || name === displayField.toLowerCase();
     })) {
@@ -1438,7 +1420,7 @@ function _validateDisplayField(adminItem, fieldNames) {
         if (globalIdField) {
             skipFields.push(globalIdField);
         }
-        fieldNames.some(name => {
+        fieldNames.some((name) => {
             if (skipFields.indexOf(name) === -1) {
                 adminItem.displayField = name;
                 return true;
@@ -1466,7 +1448,7 @@ function _validateIndexes(adminItem, fieldNames) {
         adminItem.indexes = indexes.reduce((filtered, index) => {
             const indexFields = index.fields.split(",");
             const verifiedFields = [];
-            indexFields.forEach(indexField => {
+            indexFields.forEach((indexField) => {
                 /* istanbul ignore else */
                 if (indexedFields.indexOf(indexField) === -1) {
                     indexedFields.push(indexField);
@@ -1499,11 +1481,11 @@ function _validateTemplatesFields(adminItem, fieldNames) {
     const templates = adminItem.templates;
     /* istanbul ignore else */
     if (templates) {
-        adminItem.templates = templates.map(template => {
+        adminItem.templates = templates.map((template) => {
             const attributes = (0, generalHelpers_1.getProp)(template, "prototype.attributes");
             /* istanbul ignore else */
             if (attributes) {
-                Object.keys(attributes).forEach(k => {
+                Object.keys(attributes).forEach((k) => {
                     /* istanbul ignore else */
                     if (fieldNames.indexOf(k) === -1) {
                         delete attributes[k];
@@ -1527,7 +1509,7 @@ function _validateTypesTemplates(adminItem, fieldNames) {
     const types = adminItem.types;
     /* istanbul ignore else */
     if (types) {
-        adminItem.types = types.map(t => {
+        adminItem.types = types.map((t) => {
             _validateTemplatesFields(t, fieldNames);
             return t;
         });
@@ -1546,11 +1528,11 @@ function _validateEditFieldsInfo(adminItem, fieldNames) {
     /* istanbul ignore else */
     if (editFieldsInfo) {
         const editFieldsInfoKeys = Object.keys(editFieldsInfo);
-        editFieldsInfoKeys.forEach(k => {
+        editFieldsInfoKeys.forEach((k) => {
             const editFieldName = editFieldsInfo[k];
             /* istanbul ignore else */
             if (editFieldName) {
-                fieldNames.some(name => {
+                fieldNames.some((name) => {
                     if (name === editFieldName) {
                         return true;
                     }
@@ -1661,7 +1643,7 @@ exports._processAdminObject = _processAdminObject;
  * @private
  */
 function _templatizeSourceServiceName(lookupName, dependencies) {
-    const deps = dependencies.filter(dependency => dependency.name === lookupName);
+    const deps = dependencies.filter((dependency) => dependency.name === lookupName);
     return deps.length === 1 ? _templatize(deps[0].id, "name") : undefined;
 }
 exports._templatizeSourceServiceName = _templatizeSourceServiceName;
@@ -1709,7 +1691,7 @@ exports._templatizeAdminLayerInfoFields = _templatizeAdminLayerInfoFields;
  * @private
  */
 function _getDependantItemId(lookupName, dependencies) {
-    const deps = dependencies.filter(dependency => dependency.name === lookupName);
+    const deps = dependencies.filter((dependency) => dependency.name === lookupName);
     return deps.length === 1 ? deps[0].id : "";
 }
 exports._getDependantItemId = _getDependantItemId;
@@ -1721,7 +1703,7 @@ exports._getDependantItemId = _getDependantItemId;
  * @private
  */
 function _templatizeAdminSourceLayerFields(fields, basePath) {
-    fields.forEach(f => _templatizeProperty(f, "source", basePath, "name"));
+    fields.forEach((f) => _templatizeProperty(f, "source", basePath, "name"));
 }
 exports._templatizeAdminSourceLayerFields = _templatizeAdminSourceLayerFields;
 /**
@@ -1766,7 +1748,7 @@ exports._templatizeTopFilter = _templatizeTopFilter;
 function _templatizeRelationshipFields(layer, itemID) {
     if (layer && layer.relationships) {
         const relationships = layer.relationships;
-        relationships.forEach(r => {
+        relationships.forEach((r) => {
             /* istanbul ignore else */
             if (r.keyField) {
                 const basePath = itemID + ".layer" + layer.id + ".fields";
@@ -1816,7 +1798,7 @@ exports._templatizePopupInfo = _templatizePopupInfo;
  */
 function _templatizeName(object, property, fieldNames, basePath) {
     if (object.hasOwnProperty(property)) {
-        fieldNames.forEach(name => {
+        fieldNames.forEach((name) => {
             // Only test and replace instance of the name so any enclosing characters
             // will be retained
             const regEx = new RegExp("(\\b" + name + "\\b(?![}]{2}))", "gm");
@@ -1864,9 +1846,7 @@ function _templatizeFieldName(name, layer, itemID, basePath) {
             const relatedTable = relatedTables[relationshipId];
             // the layers relationships stores the property as relatedTableId
             // the layers adminLayerInfo relatedTables stores the property as sourceLayerId
-            const prop = (0, generalHelpers_1.getProp)(relatedTable, "relatedTableId")
-                ? "relatedTableId"
-                : "sourceLayerId";
+            const prop = (0, generalHelpers_1.getProp)(relatedTable, "relatedTableId") ? "relatedTableId" : "sourceLayerId";
             const _basePath = itemID + ".layer" + relatedTable[prop] + ".fields";
             rels[2] = _templatize(_basePath, rels[2], "name");
             name = rels.join("/");
@@ -1892,7 +1872,7 @@ exports._templatizeFieldName = _templatizeFieldName;
  */
 function _templatizeExpressionInfos(expressionInfos, fieldNames, basePath) {
     return expressionInfos.map((i) => {
-        fieldNames.forEach(name => {
+        fieldNames.forEach((name) => {
             i.expression = _templatizeArcadeExpressions(i.expression, name, basePath);
         });
         return i;
@@ -1933,13 +1913,13 @@ exports._templatizePopupElements = _templatizePopupElements;
 function _templatizeMediaInfos(mediaInfos, fieldNames, basePath, layer, itemId) {
     // templatize various properties of mediaInfos
     const props = ["title", "caption"];
-    props.forEach(p => _templatizeName(mediaInfos, p, fieldNames, basePath));
+    props.forEach((p) => _templatizeName(mediaInfos, p, fieldNames, basePath));
     mediaInfos.forEach((mi) => {
         /* istanbul ignore else */
         if (mi.hasOwnProperty("value")) {
             const v = mi.value;
             const vfields = v.fields || [];
-            v.fields = vfields.map(f => _templatizeFieldName(f, layer, itemId, basePath));
+            v.fields = vfields.map((f) => _templatizeFieldName(f, layer, itemId, basePath));
             if (v.hasOwnProperty("normalizeField")) {
                 _templatizeProperty(v, "normalizeField", basePath, "name");
             }
@@ -1966,7 +1946,7 @@ function _templatizeDefinitionEditor(layer, basePath, fieldNames) {
         if (defEditor) {
             const inputs = defEditor.inputs;
             if (inputs) {
-                inputs.forEach(i => {
+                inputs.forEach((i) => {
                     /* istanbul ignore else */
                     if (i.parameters) {
                         i.parameters.forEach((p) => {
@@ -2005,7 +1985,7 @@ exports._templatizeDefinitionExpression = _templatizeDefinitionExpression;
  * @private
  */
 function _templatizeSimpleName(expression, basePath, fieldNames, suffix) {
-    fieldNames.forEach(name => {
+    fieldNames.forEach((name) => {
         // look for the name but not if its followed by }}
         const regEx = new RegExp("\\b" + name + "\\b(?![}]{2})", "gm");
         if (expression && regEx.test(expression)) {
@@ -2079,13 +2059,13 @@ function _templatizeGenRenderer(renderer, basePath, fieldNames) {
             _templatizeAuthoringInfo(authoringInfo, basePath, fieldNames);
         }
         const props = ["field", "normalizationField"];
-        props.forEach(p => _templatizeProperty(renderer, p, basePath, "name"));
+        props.forEach((p) => _templatizeProperty(renderer, p, basePath, "name"));
         const fieldNameProps = ["field1", "field2", "field3"];
-        fieldNameProps.forEach(fnP => _templatizeProperty(renderer, fnP, basePath, "name"));
+        fieldNameProps.forEach((fnP) => _templatizeProperty(renderer, fnP, basePath, "name"));
         // When an attribute name is specified, it's enclosed in square brackets
         const rExp = renderer.rotationExpression;
         if (rExp) {
-            fieldNames.forEach(name => {
+            fieldNames.forEach((name) => {
                 const regEx = new RegExp("(\\[" + name + "\\])", "gm");
                 if (regEx.test(rExp)) {
                     renderer.rotationExpression = rExp.replace(regEx, "[" + _templatize(basePath, name, "name") + "]");
@@ -2094,17 +2074,17 @@ function _templatizeGenRenderer(renderer, basePath, fieldNames) {
         }
         // update valueExpression
         if (renderer.valueExpression) {
-            fieldNames.forEach(name => {
+            fieldNames.forEach((name) => {
                 renderer.valueExpression = _templatizeArcadeExpressions(renderer.valueExpression, name, basePath);
             });
         }
         // update visualVariables
         const visualVariables = renderer.visualVariables;
         if (visualVariables) {
-            visualVariables.forEach(v => {
-                props.forEach(p => _templatizeProperty(v, p, basePath, "name"));
+            visualVariables.forEach((v) => {
+                props.forEach((p) => _templatizeProperty(v, p, basePath, "name"));
                 if (v.valueExpression) {
-                    fieldNames.forEach(name => {
+                    fieldNames.forEach((name) => {
                         v.valueExpression = _templatizeArcadeExpressions(v.valueExpression, name, basePath);
                     });
                 }
@@ -2122,12 +2102,8 @@ exports._templatizeGenRenderer = _templatizeGenRenderer;
  * @private
  */
 function _templatizeTemporalRenderer(renderer, basePath, fieldNames) {
-    const renderers = [
-        renderer.latestObservationRenderer,
-        renderer.observationRenderer,
-        renderer.trackRenderer
-    ];
-    renderers.forEach(r => {
+    const renderers = [renderer.latestObservationRenderer, renderer.observationRenderer, renderer.trackRenderer];
+    renderers.forEach((r) => {
         _templatizeRenderer(r, basePath, fieldNames);
     });
 }
@@ -2145,17 +2121,17 @@ function _templatizeAuthoringInfo(authoringInfo, basePath, fieldNames) {
     if (authoringInfo) {
         const props = ["field", "normalizationField"];
         const field1 = authoringInfo.field1;
-        props.forEach(p => _templatizeProperty(field1, p, basePath, "name"));
+        props.forEach((p) => _templatizeProperty(field1, p, basePath, "name"));
         const field2 = authoringInfo.field2;
-        props.forEach(p => _templatizeProperty(field2, p, basePath, "name"));
+        props.forEach((p) => _templatizeProperty(field2, p, basePath, "name"));
         const fields = authoringInfo.fields;
         if (fields) {
-            authoringInfo.fields = fields.map(f => _templatize(basePath, f, "name"));
+            authoringInfo.fields = fields.map((f) => _templatize(basePath, f, "name"));
         }
         const vProps = ["endTime", "field", "startTime"];
         const vVars = authoringInfo.visualVariables;
         if (vVars) {
-            vProps.forEach(p => {
+            vProps.forEach((p) => {
                 // endTime and startTime may or may not be a field name
                 if (fieldNames.indexOf(vVars[p]) > -1) {
                     _templatizeProperty(vVars, p, basePath, "name");
@@ -2193,8 +2169,7 @@ function _templatizeArcadeExpressions(text, fieldName, basePath) {
         }
         // test for $feature[] with join case
         // captures VOTED_DEM_2016 from $feature["COUNTY_ID.VOTED_DEM_2016"]
-        exp =
-            "(?:[$]feature)(\\[\\\"?\\'?)(\\w+)[.]" + fieldName + "(\\\"?\\'?\\])";
+        exp = "(?:[$]feature)(\\[\\\"?\\'?)(\\w+)[.]" + fieldName + "(\\\"?\\'?\\])";
         regEx = new RegExp(exp, "gm");
         result = regEx.exec(text);
         if (result && result.length > 3) {
@@ -2227,11 +2202,11 @@ function _templatizeLabelingInfo(labelingInfo, basePath, fieldNames) {
         /* istanbul ignore else */
         if (li.hasOwnProperty("fieldInfos")) {
             const fieldInfos = li.fieldInfos || [];
-            fieldInfos.forEach(fi => _templatizeProperty(fi, "fieldName", basePath, "name"));
+            fieldInfos.forEach((fi) => _templatizeProperty(fi, "fieldName", basePath, "name"));
         }
         const labelExp = li.labelExpression || "";
         const labelExpInfo = li.labelExpressionInfo || {};
-        fieldNames.forEach(n => {
+        fieldNames.forEach((n) => {
             const t = _templatize(basePath, n, "name");
             // check for [fieldName] or ["fieldName"]
             const regExBracket = new RegExp('(\\[\\"*)+(' + n + ')(\\"*\\])+', "gm");
@@ -2267,7 +2242,7 @@ exports._templatizeLabelingInfo = _templatizeLabelingInfo;
  */
 function _templatizeTemplates(layer, basePath) {
     const templates = layer.templates || [];
-    templates.forEach(t => {
+    templates.forEach((t) => {
         const attributes = (0, generalHelpers_1.getProp)(t, "prototype.attributes");
         const _attributes = _templatizeKeys(attributes, basePath, "name");
         /* istanbul ignore else */
@@ -2325,7 +2300,7 @@ function _templatizeKeys(obj, basePath, suffix) {
         const objKeys = Object.keys(obj);
         /* istanbul ignore else */
         if (objKeys && objKeys.length > 0) {
-            objKeys.forEach(k => {
+            objKeys.forEach((k) => {
                 _obj[_templatize(basePath, k, suffix)] = obj[k];
             });
         }
@@ -2343,12 +2318,8 @@ exports._templatizeKeys = _templatizeKeys;
 function _templatizeTimeInfo(layer, basePath) {
     if (layer.timeInfo) {
         const timeInfo = layer.timeInfo;
-        const timeProps = [
-            "endTimeField",
-            "startTimeField",
-            "trackIdField"
-        ];
-        timeProps.forEach(t => {
+        const timeProps = ["endTimeField", "startTimeField", "trackIdField"];
+        timeProps.forEach((t) => {
             if (timeInfo[t] !== "") {
                 _templatizeProperty(timeInfo, t, basePath, "name");
             }
@@ -2390,22 +2361,19 @@ function _getNameMapping(fieldInfos, id) {
     const fInfo = fieldInfos[id];
     const nameMapping = {};
     const newFields = fInfo.newFields;
-    const newFieldNames = newFields
-        ? newFields.map((f) => f.name)
-        : [];
+    const newFieldNames = newFields ? newFields.map((f) => f.name) : [];
     const sourceFields = fInfo.sourceFields || [];
     sourceFields.forEach((field) => {
         const lName = String(field.name).toLowerCase();
         newFields.forEach((f) => {
             // Names can change more than case
-            if (newFieldNames.indexOf(field.name) === -1 &&
-                newFieldNames.indexOf(lName) === -1) {
+            if (newFieldNames.indexOf(field.name) === -1 && newFieldNames.indexOf(lName) === -1) {
                 // If both new (f) and source (field) aliases are defined and are equal, map the source name to the new name
                 if (f.alias && f.alias === field.alias) {
                     nameMapping[lName] = {
                         name: f.name,
                         alias: f.alias,
-                        type: f.type ? f.type : ""
+                        type: f.type ? f.type : "",
                     };
                 }
             }
@@ -2413,7 +2381,7 @@ function _getNameMapping(fieldInfos, id) {
                 nameMapping[lName] = {
                     name: f.name,
                     alias: f.alias ? f.alias : "",
-                    type: f.type ? f.type : ""
+                    type: f.type ? f.type : "",
                 };
             }
         });
@@ -2423,10 +2391,9 @@ function _getNameMapping(fieldInfos, id) {
         const efi = JSON.parse(JSON.stringify(fInfo.editFieldsInfo));
         const newEfi = JSON.parse(JSON.stringify(fInfo.newEditFieldsInfo));
         const nameMappingKeys = Object.keys(nameMapping);
-        Object.keys(efi).forEach(k => {
+        Object.keys(efi).forEach((k) => {
             const lowerEfi = String(efi[k]).toLowerCase();
-            if ((nameMappingKeys.indexOf(lowerEfi) === -1 ||
-                nameMapping[lowerEfi].name !== newEfi[k]) &&
+            if ((nameMappingKeys.indexOf(lowerEfi) === -1 || nameMapping[lowerEfi].name !== newEfi[k]) &&
                 newFieldNames.indexOf(lowerEfi) > -1) {
                 // Only add delete fields if source schema changes allowed
                 /* istanbul ignore else */
@@ -2450,7 +2417,7 @@ function _getNameMapping(fieldInfos, id) {
                 nameMapping[lowerEfi] = {
                     name: newEfi[k],
                     alias: sourceEfiField && sourceEfiField.alias ? sourceEfiField.alias : "",
-                    type: sourceEfiField && sourceEfiField.type ? sourceEfiField.type : ""
+                    type: sourceEfiField && sourceEfiField.type ? sourceEfiField.type : "",
                 };
             }
         });