un-cli 0.0.84 → 0.0.85

package/examples.txt

@@ -0,0 +1,4 @@
+export subnetworks --all --resulttype [{"type":"features","includeGeometry":true,"includePropagatedValues":false,"includeDomainDescriptions":true,"networkAttributeNames":["Source ID","E:Riser"],"diagramTemplateName":"","resultTypeFields":[{"networkSourceId":14,"fieldName":"GLOBALID"},{"networkSourceId":15,"fieldName":"CLUSTERKEY"},{"networkSourceId":9,"fieldName":"LIFECYCLESTATUS"},{"networkSourceId":4,"fieldName":"ASSETGROUP"},{"networkSourceId":12,"fieldName":"ASSETGROUP"}]},{"type":"connectivity","includeGeometry":true,"includePropagatedValues":false,"includeDomainDescriptions":true,"networkAttributeNames":[],"diagramTemplateName":"","resultTypeFields":[]},{"type":"associations","includeGeometry":false,"includePropagatedValues":false,"includeDomainDescriptions":true,"networkAttributeNames":[],"diagramTemplateName":"","resultTypeFields":[]}]
+update subnewtorks --all
+topology --validate
+trace --subnetwork test

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.84";
+let version = "0.0.85";
 const GENERATE_TOKEN_TIME_MIN = 30;
 
 let rl = null;
@@ -172,11 +172,15 @@ const inputs = {
             "topology --validate" : "Validate topology (full extent)",
             "update subnetworks --subnetwork": "Update the input subnetwork synchronously",
             "update subnetworks --all": "Update all dirty subnetworks synchronously",
+            "update subnetworks --all --async": "Update all dirty subnetworks asynchronously",
             "update subnetworks --deleted": "Update all deleted dirty subnetworks synchronously",
             "update subnetworks --all --async": "Update all dirty subnetworks asynchronously",          
+            
             "export subnetworks --all [--folder]": "Export all subnetworks with ACK --folder where exported files are saved",
             "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 ",
+            "export subnetworks --all [--resulttype]": "Export all subnetworks with ACK --resulttype is a json configuration",
+
             "updateisconnected": "Run update is connected ",
             "versions": "List all versions available to the current logged in user.",
             "versions --summary": "Summary of versions.",
@@ -792,8 +796,8 @@ const inputs = {
             logger.info(`Result from submitting job ${JSON.stringify(subnetworkResult)}`)
         }
     },
-   "^export subnetworks --all --folder .*$|^export subnetworks --all$" : async input => {
- 
+   "^export subnetworks --all --folder .*$|^export subnetworks --all$|^export subnetworks --all --resulttype .*$" : async input => {
+  
         let subnetworks 
         let sort = "asc";
         if (input.indexOf("--desc") > 0) sort = "desc"
@@ -802,6 +806,27 @@ const inputs = {
         let inputDir = "Exported"
         if (file != null && file.length > 0)
              inputDir = file[0].replace("--folder ", "")
+
+        //default resulttype
+        let resultType = null;
+
+        const rt = input.match(/--resulttype .*/gm)
+        if (rt != null && v.length > 0)
+            resultType = rt[0].replace("--resulttype ", "")
+        
+        logger.info(resultType)
+
+        try
+        {
+            resultType = JSON.parse(resultType)
+        }
+        catch(ex)
+        {
+            logger.error("Can't parse resulttype" + ex)
+            return;
+        }
+
+        
         //create directory if doesn't exists
         if (!fs.existsSync(inputDir))  fs.mkdirSync(inputDir)
         let exportedSubnetworks = [];
@@ -823,7 +848,7 @@ const inputs = {
                 
                 const fromDate = new Date();
                 
-                const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
+                const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false, resultType);
                   
                 //code
                 exportedSubnetworks.push("'" + v(f.attributes,"subnetworkName") + "'")
@@ -845,10 +870,10 @@ const inputs = {
                 //although the response is json, its easier to treat it as text (handle error cases) since we will only write it to disk.
                 // if we want to do something with the response then make it json
                 const jsonExport = await subContent.text();
-                fs.writeFileSync(`${inputDir}/${subnetworkName}.json`, jsonExport)            
+                fs.writeFileSync(`${inputDir}/${v(f.attributes,"domainNetworkName")}_${v(f.attributes,"tierName")}_${subnetworkName}.json`, jsonExport)            
                
     
-                logger.info(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${subnetworkName}.json`)
+                logger.info(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${v(f.attributes,"domainNetworkName")}_${v(f.attributes,"tierName")}_${subnetworkName}.json`)
     
             }
         }
@@ -856,7 +881,55 @@ const inputs = {
        
     },
    
+ "^export subnetworks --all --async --folder .*$|^export subnetworks --all --async$|^export subnetworks --all --async --resulttype .*$" : async input => {
+ 
+        let subnetworks 
+        let sort = "asc";
+        if (input.indexOf("--desc") > 0) sort = "desc"
+        //create folder
+        const file = input.match(/--folder .*/gm)
+        let inputDir = "Exported"
+        if (file != null && file.length > 0)
+             inputDir = file[0].replace("--folder ", "")
+
+ 
+        //default resulttype
+        let resultType = null;
+        
+        const rt = input.match(/--resulttype .*/gm)
+        if (rt != null && v.length > 0)
+            resultType = rt[0].replace("--resulttype ", "")
+
+        logger.info(resultType)
+
+        //create directory if doesn't exists
+        if (!fs.existsSync(inputDir))  fs.mkdirSync(inputDir)
+        let exportedSubnetworks = [];
 
+        do {
+
+            let exportedSubnetworksWhereClause = ""
+            
+            if (exportedSubnetworks.length > 0 )
+                exportedSubnetworksWhereClause = " AND SUBNETWORKNAME NOT IN (" + exportedSubnetworks.join(",") + ")"
+ 
+            logger.info("Querying all subnetworks that are clean.");
+            subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=0 " + exportedSubnetworksWhereClause,`domainnetworkname  ${sort},tiername ${sort},subnetworkname ${sort}`);
+            logger.info(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
+            for (let i = 0;  i < subnetworks.features.length; i++) {
+                const f = subnetworks.features[i]
+                const subnetworkName = v(f.attributes,"subnetworkName")
+                logger.info("Exporting subnetworks " + subnetworkName);
+                 
+                
+                const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),true);
+                logger.info(`Result from submitting job ${JSON.stringify(subnetworkResult)}`)
+
+            }
+        }
+        while (subnetworks?.features?.length > 0)
+       
+    },
     "^export subnetworks --new --folder .*$|^export subnetworks --new$" : async input => {
 
         //create folder
@@ -879,9 +952,11 @@ const inputs = {
             //fetch the json and write it to disk 
             const subContent = await fetch(subnetworkResult.url);
             const jsonExport = await subContent.text();
-            fs.writeFileSync(`${inputDir}/${subnetworkName}.json`, JSON.stringify(jsonExport))            
-
-            logger.info(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${subnetworkName}.json`)
+            fs.writeFileSync(`${inputDir}/${v(f.attributes,"domainNetworkName")}_${v(f.attributes,"tierName")}_${subnetworkName}.json`, jsonExport)            
+               
+    
+            logger.info(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${v(f.attributes,"domainNetworkName")}_${v(f.attributes,"tierName")}_${subnetworkName}.json`)
+    
         }
 
  
@@ -968,19 +1043,19 @@ const inputs = {
             logger.error(JSON.stringify(ex))
         }
     },
-    "^export subnetworks --deleted$" : async input => {
+    "^export subnetworks --deleted --folder" : async input => {
 
         //create folder
-        const file = input.match(/-f .*/gm)
+        const file = input.match(/--folder .*/gm)
         let inputDir = "Exported"
         if (file != null && file.length > 0)
-             inputDir = file[0].replace("-f ", "")
+             inputDir = file[0].replace("--folder ", "")
         //create directory if doesn't exists
         if (!fs.existsSync(inputDir))  fs.mkdirSync(inputDir)
 
 
         logger.info("Querying all subnetworks that are clean and deleted.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty = 0 and isdeleted=1");
+        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdeleted=1", "subnetworkname");
         logger.info(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
         for (let i = 0;  i < subnetworks.features.length; i++) {
             const f = subnetworks.features[i]
@@ -998,9 +1073,11 @@ const inputs = {
             //fetch the json and write it to disk 
             const subContent = await fetch(subnetworkResult.url);
             const jsonExport = await subContent.text();
-            fs.writeFileSync(`${inputDir}/${subnetworkName}.json`, JSON.stringify(jsonExport))            
-
-            logger.info(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${subnetworkName}.json`)
+            fs.writeFileSync(`${inputDir}/${v(f.attributes,"domainNetworkName")}_${v(f.attributes,"tierName")}_${subnetworkName}.json`, jsonExport)            
+               
+    
+            logger.info(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${v(f.attributes,"domainNetworkName")}_${v(f.attributes,"tierName")}_${subnetworkName}.json`)
+    
         }
 
  

package/package.json

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

package/utilitynetwork.node.mjs

@@ -1180,7 +1180,7 @@ export class UtilityNetwork {
         }
 
 
-        exportSubnetworks(domainNetworkName, tierName, subnetworkName, async=false) {
+        exportSubnetworks(domainNetworkName, tierName, subnetworkName, async=false,resultTypes=null) {
 
             let thisObj = this; 
             let tier = this.getTier(domainNetworkName, tierName);
@@ -1190,37 +1190,9 @@ export class UtilityNetwork {
              let ar = thisObj.featureServiceUrl.split("/");
              ar[ar.length-1]="UtilityNetworkServer";
              let exportsubnetworkUrl = ar.join("/") + "/exportSubnetwork"
-             const resultTypes = [
-                {
-                  "type": "features",
-                  "includeGeometry": true,
-                  "includePropagatedValues": false,
-                  "includeDomainDescriptions": true,
-                  "networkAttributeNames": [
-                    "Is subnetwork controller"
-                  ],
-                  "diagramTemplateName": "",
-                  "resultTypeFields": []
-                },
-                {
-                  "type": "connectivity",
-                  "includeGeometry": true,
-                  "includePropagatedValues": false,
-                  "includeDomainDescriptions": true,
-                  "networkAttributeNames": [],
-                  "diagramTemplateName": "",
-                  "resultTypeFields": []
-                },
-                {
-                  "type": "associations",
-                  "includeGeometry": false,
-                  "includePropagatedValues": false,
-                  "includeDomainDescriptions": true,
-                  "networkAttributeNames": [],
-                  "diagramTemplateName": "",
-                  "resultTypeFields": []
-                }
-              ]
+             if (!resultTypes)
+                resultTypes = [{"type":"features","includeGeometry":true,"includePropagatedValues":false,"includeDomainDescriptions":true,"networkAttributeNames":["Is subnetwork controller"],"diagramTemplateName":"","resultTypeFields":[]},{"type":"connectivity","includeGeometry":true,"includePropagatedValues":false,"includeDomainDescriptions":true,"networkAttributeNames":[],"diagramTemplateName":"","resultTypeFields":[]},{"type":"associations","includeGeometry":false,"includePropagatedValues":false,"includeDomainDescriptions":true,"networkAttributeNames":[],"diagramTemplateName":"","resultTypeFields":[]}]
+
              //traceConfiguration: JSON.stringify(subnetworkDef),   
                let exportsubnetworkJson = {
                   f: "json",
@@ -1231,7 +1203,7 @@ export class UtilityNetwork {
                   exportAcknowledgement: true,
                   allSubnetworksInTier: false,
                   continueOnFailure: false,
-                  traceConfiguration: subnetworkDef,   
+                  traceConfiguration: JSON.stringify(subnetworkDef),   
                   async: async,
                   gdbVersion:this.gdbVersion,
                   resultTypes: JSON.stringify(resultTypes)