6 Commits

Author SHA1 Message Date
997f09adde chore(release): 6.14.10 [skip ci]
## [6.14.10](https://git.datacontroller.io/dc/dc/compare/v6.14.9...v6.14.10) (2025-06-02)

### Bug Fixes

* bump core ([0e8503e](0e8503ed2b))
* default to home directory for SAS Drive in Viya ([9682b54](9682b548e6))
2025-06-02 17:51:20 +00:00
0e8503ed2b fix: bump core
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 4m31s
Release / Build-and-test-development (push) Successful in 8m40s
Release / release (push) Successful in 8m20s
2025-06-02 18:32:33 +01:00
97dfcd79b1 Merge pull request 'issue156' (#161) from issue156 into main
Some checks failed
Release / Build-and-test-development (push) Has been cancelled
Release / release (push) Has been cancelled
Release / Build-production-and-ng-test (push) Has been cancelled
Reviewed-on: #161
2025-06-02 17:29:18 +00:00
9a12a2e41f Merge branch 'main' into issue156
Some checks failed
Build / Build-and-ng-test (pull_request) Successful in 4m9s
Build / Build-and-test-development (pull_request) Has been cancelled
2025-06-02 17:27:14 +00:00
9682b548e6 fix: default to home directory for SAS Drive in Viya
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m10s
Build / Build-and-test-development (pull_request) Successful in 8m35s
2025-05-29 15:05:18 +01:00
2e0c60cc0d chore: fix package-lock 2025-05-28 18:57:43 +02:00
7 changed files with 53 additions and 40 deletions

View File

@ -1,3 +1,11 @@
## [6.14.10](https://git.datacontroller.io/dc/dc/compare/v6.14.9...v6.14.10) (2025-06-02)
### Bug Fixes
* bump core ([0e8503e](https://git.datacontroller.io/dc/dc/commit/0e8503ed2bb22a0fc3924ac929e7f19626772e0a))
* default to home directory for SAS Drive in Viya ([9682b54](https://git.datacontroller.io/dc/dc/commit/9682b548e6106d99d97dcc023a35d93addfd5170))
## [6.14.9](https://git.datacontroller.io/dc/dc/compare/v6.14.8...v6.14.9) (2025-06-02)

View File

@ -1,6 +1,6 @@
{
"name": "dcfrontend",
"version": "6.14.9",
"version": "6.14.10",
"description": "Data Controller",
"devDependencies": {
"@saithodev/semantic-release-gitea": "^2.1.0",

10
sas/package-lock.json generated
View File

@ -7,7 +7,7 @@
"name": "dc-sas",
"dependencies": {
"@sasjs/cli": "^4.12.5",
"@sasjs/core": "^4.57.0"
"@sasjs/core": "^4.58.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.58.1",
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.58.1.tgz",
"integrity": "sha512-Qp6KAtp1VZcmN5HLGSIUE9H41qpFuihWLbjNygOYp+NRs/Y8VagpHrYeyIQbh3cSgchiJEMXudLql8hoU06wpg==",
"license": "MIT"
},
"node_modules/@sasjs/lint": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/@sasjs/lint/-/lint-2.4.3.tgz",

View File

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

View File

@ -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",

View File

@ -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)

View File

@ -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));