un-cli 0.0.78 → 0.0.80

package/cmd.txt

@@ -1,2 +1,2 @@
-topology --validate --fishnet
+reconcile --version U136967.MigrateTransm
 exit

package/index.mjs

@@ -7,7 +7,7 @@ import { AdminLog } from "./adminlog.mjs"
 import  logger  from "./logger.mjs"
 import  fetch  from "node-fetch"
 //update version
-let version = "0.0.78";
+let version = "0.0.80";
 const GENERATE_TOKEN_TIME_MIN = 30;
 
 let rl = null;
@@ -175,8 +175,8 @@ const inputs = {
             "export subnetworks --new [--folder]": "Export all subnetworks with ACK that haven't been exported --folder where exported files are saved",
             "export subnetworks --deleted": "Export all subnetworks with ACK that are deleted ",
             "updateisconnected": "Run update is connected ",
-            
-            "count": "Lists the number of rows in all feature layers.",
+            "versions": "List all versions available to the current logged in user.",
+            "count": "Lists the number of rows in all feature layers and tables.",
             "count --system": "Lists the number of rows in system layers.",
             "connect --service": "Connects to the another service",
             "tracelogs --age <minutes>": "Lists utility network trace summary logs for the last x minutes (requires admin)",
@@ -228,6 +228,100 @@ const inputs = {
 
         console.table(serviceDef)
     },
+    
+    "^versions$": async () => {
+        
+        const versions = await un.versions();
+        if (versions.versions.length === 0) {
+            logger.info("No versions found.")
+            return;
+        }
+        const subs = versions.versions.map( (a) =>  {
+                     return  {"versionName": a.versionName, "Id": a.versionId, "guid" : a.versionGuid, "created": a.creationDate, "modified": a.modifiedDate, "access": a.access};
+                     })
+
+        console.table(subs)
+        const rowCount = subs.length;
+        logger.info (`${numberWithCommas(rowCount)} rows returned.`)
+    },
+
+
+    "^reconcile --version": async (input) => {
+        
+        const inputParam = input.match(/--version .*/gm)
+        let versionName = null;
+        if (inputParam != null && inputParam.length > 0)
+            versionName = inputParam[0].replace("--version ", "")
+
+        const versions = await un.versions();
+
+        for (let v = 0; v < versions.versions.length; v++)
+        {   
+            if (versions.versions[v].versionName.toString().toUpperCase() === "SDE.DEFAULT") continue;
+            if (versions.versions[v].versionName.toString().toUpperCase() == versionName.toUpperCase())  {
+                logger.info (`Reconciling version ${versions.versions[v].versionName} ...`)
+
+                const result = await un.reconcile(versions.versions[v].versionGuid, false, false, true, false);
+                logger.info(JSON.stringify(result))
+                break;
+            }
+           
+        }   
+        logger.info (`Reconciled ${versionName}.`)
+    },
+
+    
+    "^reconcile --all$": async () => {
+        
+        const versions = await un.versions();
+
+        for (let v = 0; v < versions.versions.length; v++)
+        {   
+            if (versions.versions[v].versionName.toString().toUpperCase() === "SDE.DEFAULT") continue;
+            logger.info (`Reconciling version ${versions.versions[v].versionName} ...`)
+
+            const result = await un.reconcile(versions.versions[v].versionGuid, false, false, true, false);
+            logger.info(JSON.stringify(result))
+        }   
+        const rowCount = versions.versions.length;
+        logger.info (`Reconciled ${numberWithCommas(rowCount)} versions.`)
+    },
+
+    "^reconcile --all --async$": async () => {
+        //async
+        const versions = await un.versions();
+
+        for (let v = 0; v < versions.versions.length; v++)
+        {   
+            if (versions.versions[v].versionName.toString().toUpperCase() === "SDE.DEFAULT") continue;
+            logger.info (`Reconciling version ${versions.versions[v].versionName} ...`)
+
+            const result = await un.reconcile(versions.versions[v].versionGuid, false, false, true, true);
+            logger.info(JSON.stringify(result))
+        }   
+        const rowCount = versions.versions.length;
+        logger.info (`Reconciled ${numberWithCommas(rowCount)} versions.`)
+    },
+
+    
+    "^versions --disconnect$": async () => {
+        //disconnect all versions
+        const versions = await un.versions();
+
+        for (let v = 0; v < versions.versions.length; v++)
+        {   
+            if (versions.versions[v].versionName.toString().toUpperCase() === "SDE.DEFAULT") continue;
+            logger.info (`Stopping editing on version ${versions.versions[v].versionName} ...`)
+            const g = versions.versions[v].versionGuid
+            let result = await un.stopEditing(g,g);
+            logger.info(JSON.stringify(result))
+            logger.info (`Stopping reading on version ${versions.versions[v].versionName} ...`)
+            result = await un.stopReading(g,g);
+            logger.info(JSON.stringify(result))
+        }   
+        const rowCount = versions.versions.length;
+        logger.info (`Disconnected ${numberWithCommas(rowCount)} versions.`)
+    },
     "^subnetworks$": async () => {
         
         const subnetworks = await un.getSubnetworks();
@@ -748,8 +842,8 @@ const inputs = {
         let totalRows =0;
         serviceDef.layers.forEach (l=> Object.keys(l).forEach (k => !layerProperties.includes(k) ? delete l[k] : ""))  
         //all layers except system ones
-        const allLayers = serviceDef.layers.filter(l => l.type === 'Feature Layer' && !systemLayers.find(a=> a.id === l.id ))
-  
+        let allLayers = serviceDef.layers.filter(l => l.type === 'Feature Layer' && !systemLayers.find(a=> a.id === l.id ))
+        allLayers = allLayers.concat(serviceDef.tables);
 
         for (let i = 0; i < allLayers.length; i++ )      
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "un-cli",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "description": "Command line interface for working with ArcGIS Utility Network Extension",
   "main": "index.mjs",
   "bin": {

package/utilitynetwork.node.mjs

@@ -443,6 +443,13 @@ export class UtilityNetwork {
 
             
 
+            if (this.layerDefinition.systemLayers.dirtyObjectsTableId)
+                systemLayers.push({
+                    "id": this.layerDefinition.systemLayers.dirtyObjectsTableId,
+                    "name": "Dirty Objects",
+                    "type": "Feature Layer",
+                    "geometryType": "None" 
+                })
 
             if (this.layerDefinition.systemLayers.pointErrorsLayerId)
             systemLayers.push({
@@ -815,8 +822,109 @@ export class UtilityNetwork {
              
         }
 
+        startReading(versionGuid, sessionGuid){
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/startReading"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: sessionGuid,
+                 token: this.token
+             } 
+           
+           return makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        }
+
+
+        
+        stopReading(versionGuid, sessionGuid){
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/stopReading"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: sessionGuid,
+                 token: this.token
+             } 
+           
+           return makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        }
+
+
+        
+        startEditing(versionGuid, sessionGuid){
+            
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/startEditing"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: sessionGuid,
+                 token: this.token
+             } 
+           
+           return makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        }
+
+
+        
+        stopEditing(versionGuid, sessionGuid,saveEdits=true){
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/stopEditing"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: sessionGuid,
+                 saveEdits:saveEdits,
+                 token: this.token
+             } 
+           
+           return makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        }
+
         
-        versions() {
+
+        async reconcile (versionGuid, withPost = false, abortIfConflicts=false, conflictDetection=true, async = false ) {
+
+            //startReading use the version guid as a session id
+            await this.startReading(versionGuid,versionGuid );
+            await this.startEditing(versionGuid,versionGuid );
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/reconcile"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: versionGuid,
+                 withPost: withPost, 
+                 async: async,
+                 token: this.token
+             } 
+            
+           const result = makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        /*  if (async == false){
+           await this.stopEditing(versionGuid,versionGuid );
+           await this.stopReading(versionGuid,versionGuid );}*/
+
+           return result;
+
+        }
+
+         versions() {
 
             let thisObj = this;    
             let ar = thisObj.featureServiceUrl.split("/");