portal check for subtypes and add indexes logic

packages/common/src/featureServiceHelpers.ts

@@ -219,7 +219,7 @@ export function deleteViewProps(layer: any) {
  * @param isView When true the current layer is a view and does not need to cache subtype details
  * @returns An updated instance of the fieldInfos
  */
-export function cacheFieldInfos(layer: any, fieldInfos: any, isView: boolean): any {
+export function cacheFieldInfos(layer: any, fieldInfos: any, isView: boolean, isPortal: boolean): any {
   // cache the source fields as they are in the original source
   if (layer && layer.fields) {
     fieldInfos[layer.id] = {
@@ -228,7 +228,7 @@ export function cacheFieldInfos(layer: any, fieldInfos: any, isView: boolean): a
       id: layer.id,
     };
     /* istanbul ignore else */
-    if (!isView) {
+    if (!isView && isPortal) {
       fieldInfos[layer.id].subtypes = layer.subtypes;
       fieldInfos[layer.id].subtypeField = layer.subtypeField;
       fieldInfos[layer.id].defaultSubtypeCode = layer.defaultSubtypeCode;
@@ -252,7 +252,7 @@ export function cacheFieldInfos(layer: any, fieldInfos: any, isView: boolean): a
   };
 
   /* istanbul ignore else */
-  if (!isView) {
+  if (!isView && isPortal) {
     props["subtypes"] = true;
     props["subtypeField"] = true;
     props["defaultSubtypeCode"] = true;
@@ -281,6 +281,30 @@ export function cacheContingentValues(id: string, fieldInfos: any, itemTemplate:
   return fieldInfos;
 }
 
+/**
+ * Cache the stored contingent values so we can add them in subsequent addToDef calls
+ *
+ * @param layer The current layer to check indexes on
+ * @param fieldInfos The object that stores the cached field infos
+ * @returns An updated instance of the fieldInfos
+ */
+export function cacheIndexes(layer: any, fieldInfos: any): any {
+  if (Array.isArray(layer.indexes)) {
+    const oidField = layer.objectIdField;
+    const guidField = layer.globalIdField;
+    fieldInfos[layer.id].indexes = layer.indexes.filter((i) => {
+      if ((i.isUnique && i.fields !== oidField && i.fields !== guidField) || i.indexType === "FullText") {
+        if (i.name) {
+          i.name = i.name.replaceAll(" ", "");
+        }
+        return i;
+      }
+    });
+    delete layer.indexes;
+  }
+  return fieldInfos;
+}
+
 /**
  * Helper function to cache a single property into the fieldInfos object
  * This property will be removed from the layer instance.
@@ -825,7 +849,7 @@ export function addFeatureServiceLayersAndTables(
                 updates
                   .reduce((prev, update) => {
                     return prev.then(() => {
-                      return getRequest(update);
+                      return getRequest(update, false, false, templateDictionary.isPortal);
                     });
                   }, Promise.resolve(null))
                   .then(
@@ -895,11 +919,17 @@ export function addFeatureServiceDefinition(
         let item = toAdd.item;
         const originalId = item.id;
         const isView = itemTemplate.properties.service.isView;
-        fieldInfos = cacheFieldInfos(item, fieldInfos, isView);
+        const isPortal = templateDictionary.isPortal;
+        fieldInfos = cacheFieldInfos(item, fieldInfos, isView, isPortal);
 
         // cache the values to be added in seperate addToDef calls
         fieldInfos = cacheContingentValues(item.id, fieldInfos, itemTemplate);
 
+        // cache specific field indexes when deploying to ArcGIS Enterprise portal
+        if (isPortal) {
+          fieldInfos = cacheIndexes(item, fieldInfos);
+        }
+
         /* istanbul ignore else */
         if (item.isView) {
           deleteViewProps(item);
@@ -929,7 +959,7 @@ export function addFeatureServiceDefinition(
           }
         }
         /* istanbul ignore else */
-        if (templateDictionary.isPortal) {
+        if (isPortal) {
           item = _updateForPortal(item, itemTemplate, templateDictionary);
         }
 

packages/common/src/restHelpers.ts

@@ -956,7 +956,7 @@ export function getLayerUpdates(args: IPostProcessArgs, isPortal: boolean): IUpd
   });
 
   /* istanbul ignore else */
-  if (subtypeUpdates.length > 0) {
+  if (subtypeUpdates.length > 0 && isPortal) {
     subtypeUpdates.forEach((subtypeUpdate) => {
       updates.push(
         _getUpdate(adminUrl + subtypeUpdate.id, null, { subtypeField: subtypeUpdate.subtypeField }, args, "update"),
@@ -1013,6 +1013,34 @@ export function getLayerUpdates(args: IPostProcessArgs, isPortal: boolean): IUpd
       });
     }
   }
+
+  // issue: https://devtopia.esri.com/WebGIS/solution-deployment-apps/issues/273
+  // For portal only...add specific indexes with existing supplementary addToDefinition call if it exists
+  // or with a new addToDefinition call if one doesn't already exist
+  if (isPortal) {
+    Object.keys(args.objects).forEach((id) => {
+      const obj: any = Object.assign({}, args.objects[id]);
+      let update;
+      if (Array.isArray(obj.indexes) && obj.indexes.length > 0) {
+        const layerHasExistingAdd = updates.some((u) => {
+          if (u.url.indexOf(`${id}/addToDefinition`) > -1) {
+            update = u;
+            return true;
+          }
+        });
+        if (layerHasExistingAdd) {
+          // append to existing addToDef
+          update.params.addToDefinition = {
+            ...update.params.addToDefinition,
+            indexes: obj.indexes,
+          };
+        } else {
+          // create new addToDef
+          updates.push(_getUpdate(checkUrlPathTermination(adminUrl) + id, null, { indexes: obj.indexes }, args, "add"));
+        }
+      }
+    });
+  }
   return updates.length === 1 ? [] : updates;
 }
 
@@ -1101,7 +1129,12 @@ export function _sortRelationships(layers: any[], tables: any[], relUpdates: any
  * @private
  */
 /* istanbul ignore else */
-export function getRequest(update: IUpdate, skipRetry: boolean = false, useAsync: boolean = false): Promise<void> {
+export function getRequest(
+  update: IUpdate,
+  skipRetry: boolean = false,
+  useAsync: boolean = false,
+  isPortal: boolean = false,
+): Promise<void> {
   return new Promise((resolve, reject) => {
     const options: IRequestOptions = {
       params: update.params,
@@ -1124,7 +1157,7 @@ export function getRequest(update: IUpdate, skipRetry: boolean = false, useAsync
       },
       (e: any) => {
         if (!skipRetry) {
-          getRequest(update, true, true).then(
+          getRequest(update, true, true, isPortal).then(
             () => resolve(),
             (e) => reject(e),
           );