Fix addFields and deleteFields

Author: Rick Saccoccia

plugins/arcgis/service/package-lock.json

@@ -41,7 +41,7 @@
     "@esri/arcgis-rest-feature-service": "^4.0.6",
     "@esri/arcgis-rest-request": "^4.2.3",
     "@terraformer/arcgis": "2.1.2",
-    "form-data": "^4.0.0"
+    "form-data": "^4.0.1"
   },
   "peerDependencies": {
     "@ngageoint/mage.service": "^6.2.9 || ^6.3.0-beta",

plugins/arcgis/service/package.json

@@ -92,6 +92,7 @@ export class FeatureServiceAdmin {
         const eventFields = this.fields(events)
         const layerFields = layerInfo.fields
 
+        // TODO - better naming: addFields is a boolean, array of fields, and a method. Ditto for deleteFields
         if (featureLayer.addFields) {
 
             const layerFieldSet = new Set()
@@ -110,6 +111,7 @@ export class FeatureServiceAdmin {
                 }
             }
 
+            // TODO - where does New_field and New_field_2 come from with each startup?
             if (addFields.length > 0) {
                 this.addFields(service, featureLayer, addFields)
             }
@@ -462,24 +464,27 @@ export class FeatureServiceAdmin {
      */
     private async addFields(service: FeatureServiceConfig, featureLayer: FeatureLayerConfig, fields: Field[]) {
 
-        const layer = {} as Layer
-        layer.fields = fields
+        const layer = { fields: fields} as Layer
 
         const httpClient = this.httpClient(service)
         const identityManager = await getIdentityManager(service, httpClient)
         const url = this.adminUrl(service) + featureLayer.layer.toString() + '/addToDefinition'
 
         this._console.info('ArcGIS feature layer addToDefinition (add fields) url ' + url)
 
-        const form = new FormData()
-        form.append('addToDefinition', JSON.stringify(layer))
-
-        const postResponse = request(url, {
+        await request(url, {
             authentication: identityManager,
-            httpMethod: 'POST',
-            params: form
+            params: {
+                addToDefinition: JSON.stringify(layer),
+                f: "json"
+            }
+        }).then((postResponse) => {
+            console.log('Response: ' + postResponse)
+        }).catch((error) => {
+            console.log('Error: ' + error)
         });
-        console.log('Response: ' + postResponse)
+
+        console.log('Remove me')
 
     }
 
@@ -507,14 +512,12 @@ export class FeatureServiceAdmin {
 
         this._console.info('ArcGIS feature layer deleteFromDefinition (delete fields) url ' + url)
 
-        const form = new FormData()
-        form.append('deleteFromDefinition', JSON.stringify(layer))
-
-        httpClient.sendPostForm(url, form)
         const postResponse = request(url, {
             authentication: identityManager,
             httpMethod: 'POST',
-            params: form
+            params: {
+                deleteFromDefinition:  JSON.stringify(layer)
+            }
         });
         console.log('Response: ' + postResponse)
     }

plugins/arcgis/service/src/FeatureServiceAdmin.ts

@@ -244,6 +244,8 @@ export class ObservationProcessor {
             }
 
             for (const featureLayer of featureServiceConfig.layers) {
+                // Initiate the feature layer and event fields to sync with the feature service
+                featureLayer.addFields = true
 
                 if (featureLayer.token == null) {
                     featureLayer.token = featureServiceConfig.auth?.type == AuthType.Token ? featureServiceConfig.auth.token : ""
@@ -311,8 +313,8 @@ export class ObservationProcessor {
             const identityManager = await getIdentityManager(featureServiceConfig, new HttpClient(console))
             const layerProcessor = new FeatureLayerProcessor(info, config, identityManager,this._console);
             this._layerProcessors.push(layerProcessor);
-            clearTimeout(this._nextTimeout);
-            this.scheduleNext(config);
+            clearTimeout(this._nextTimeout); // TODO why is this needed?
+            // this.scheduleNext(config); // TODO why is this needed when processAndScheduleNext is called upstream and ends with scheduleNext() This causes a query before updateLayer.
         }
     }