fix: default to home directory for SAS Drive in Viya

sas/package-lock.json

@@ -7,7 +7,7 @@
       "name": "dc-sas",
       "dependencies": {
         "@sasjs/cli": "^4.12.5",
-        "@sasjs/core": "^4.57.0"
+        "@sasjs/core": "^4.57.1"
       }
     },
     "node_modules/@coolaj86/urequest": {
@@ -76,12 +76,18 @@
         "sasjs": "build/index.js"
       }
     },
-    "node_modules/@sasjs/core": {
+    "node_modules/@sasjs/cli/node_modules/@sasjs/core": {
       "version": "4.57.0",
       "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.57.0.tgz",
       "integrity": "sha512-iJiLnW4oY15InGerXXWtrjc1YpJ9UDz72+r7Odfr/yYR7RxIhtXGjYQIqyQu6US+cS/0b2pi12LZB6VnfMS/pA==",
       "license": "MIT"
     },
+    "node_modules/@sasjs/core": {
+      "version": "4.57.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.57.1.tgz",
+      "integrity": "sha512-jTU0P99lt6ff5V6JwtbPx+kUiJQge5A7fUai2sXzMYbvlDykl5AxvAhC+8dMSddYLhgEfflKzdlwNfkZgFpugg==",
+      "license": "MIT"
+    },
     "node_modules/@sasjs/lint": {
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-2.4.3.tgz",

sas/package.json

@@ -29,6 +29,6 @@
   "private": true,
   "dependencies": {
     "@sasjs/cli": "^4.12.5",
-    "@sasjs/core": "^4.57.0"
+    "@sasjs/core": "^4.57.1"
   }
 }

sas/sasjs/sasjsconfig.json

@@ -99,7 +99,7 @@
       "httpsAgentOptions": {
         "allowInsecureRequests": false
       },
-      "appLoc": "/Public/app/dc",
+      "appLoc": "/Public/app/dcplaceholder",
       "macroFolders": [
         "sasjs/targets/viya/macros_viya"
       ],
@@ -109,7 +109,6 @@
       "binaryFolders": [],
       "buildConfig": {
         "initProgram": "sasjs/utils/buildinitviya.sas",
-        "termProgram": "sasjs/utils/buildtermviya.sas",
         "buildResultsFolder": "sasjsresults",
         "buildOutputFolder": "sasjsbuild",
         "buildOutputFileName": "viya.sas"
@@ -128,7 +127,7 @@
           "sasjs/utils/viyadeploy.sh"
         ]
       },
-      "contextName": "Datacontroller compute context"
+      "contextName": "SAS Job Execution compute context"
     },
     {
       "name": "viyacloud",
@@ -312,38 +311,6 @@
         "assetPaths": []
       }
     },
-    {
-      "name": "server-vlad",
-      "serverUrl": "https://sas.4gl.io:5000",
-      "serverType": "SASJS",
-      "httpsAgentOptions": {
-        "allowInsecureRequests": false
-      },
-      "appLoc": "/30.SASApps/app/dc",
-      "macroFolders": [
-        "sasjs/targets/server/macros_server"
-      ],
-      "programFolders": [
-        "sasjs/db/datactrl"
-      ],
-      "serviceConfig": {
-        "serviceFolders": [
-          "sasjs/targets/server/services_server/admin",
-          "sasjs/targets/server/services_server/usernav"
-        ],
-        "initProgram": "sasjs/utils/serviceinitserver.sas",
-        "termProgram": "",
-        "macroVars": {}
-      },
-      "streamConfig": {
-        "streamWeb": true,
-        "streamWebFolder": "webv",
-        "streamServiceName": "DataController",
-        "webSourcePath": "../client/dist",
-        "streamLogo": "favicon.ico",
-        "assetPaths": []
-      }
-    },
     {
       "name": "mihajlo",
       "serverUrl": "https://sas.4gl.io",

sas/sasjs/services/admin/dirlist.sas

@@ -0,0 +1,27 @@
+/**
+  @file
+  @brief Fetches directories to facilitate configuration
+  @details The service can also be invoked using the following URL param:
+
+    @li &parent= (parent path)
+
+  <h4> SAS Macros </h4>
+  @li mp_dirlist.sas
+
+  @version 9.2
+  @author 4GL Apps Ltd
+  @copyright 4GL Apps Ltd.  This code may only be used within Data Controller
+    and may not be re-distributed or re-sold without the express permission of
+    4GL Apps Ltd.
+
+**/
+
+%global parent;
+/* if no flavour is specified, default to root */
+%let parent=%sysfunc(coalescec(&parent,/));
+
+%mp_dirlist(path=&parent,outds=dirlist, maxdepth=2)
+
+%webout(OPEN)
+%webout(OBJ,dirlist)
+%webout(CLOSE)

sas/sasjs/utils/buildinitviya.sas

@@ -4,4 +4,9 @@
 
 **/
 
-options nonotes nomprint;
+options nonotes nomprint;
+
+/* update apploc to default to user home area if not set */
+%let apploc=%sysfunc(ifc("&apploc"="/Public/app/dcplaceholder"
+  ,/Users/&sysuserid/My Folder/Data Controller
+  ,&apploc));