Compare commits
11 Commits
Author | SHA1 | Date |
---|---|---|
semantic-release-bot | 39c3e5411f | |
allan | aad419c55d | |
^ | ee58fd5b4b | |
allan | aedd2c451b | |
Mihajlo Medjedovic | 6d597611b6 | |
Mihajlo Medjedovic | 9ffe5efe5d | |
semantic-release-bot | 2715950d86 | |
Mihajlo Medjedovic | 77a7190f4d | |
allan | cc65890fea | |
^ | 93758efb27 | |
Mihajlo Medjedovic | c0dc9191e3 |
|
@ -184,6 +184,18 @@ jobs:
|
|||
apt-get update
|
||||
apt-get install doxygen -y
|
||||
|
||||
- name: Frontend Preliminary Build
|
||||
description: We want to prevent creating empty release if frontend fails
|
||||
run: |
|
||||
cd client
|
||||
npm ci
|
||||
# Decrypt and Install sheet
|
||||
echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
|
||||
npm i ./libraries/sheet-crypto.tgz
|
||||
# End
|
||||
npm i webpack
|
||||
npm run build
|
||||
|
||||
- name: Create Empty Release (assets are posted later)
|
||||
run: |
|
||||
npm i
|
||||
|
@ -196,11 +208,6 @@ jobs:
|
|||
description: Must be created AFTER the release as the version (git tag) is used in the interface
|
||||
run: |
|
||||
cd client
|
||||
npm ci
|
||||
# Decrypt and Install sheet
|
||||
echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
|
||||
npm i ./libraries/sheet-crypto.tgz
|
||||
# End
|
||||
npm run build
|
||||
|
||||
- name: Build SAS9 EBI Release
|
||||
|
@ -244,6 +251,7 @@ jobs:
|
|||
rm sasjsbuild/services/clickme.html
|
||||
sasjs b -t viya
|
||||
cp sasjsbuild/viya.sas ./viya.sas
|
||||
cp sasjsbuild/viya.json ./viya.json
|
||||
|
||||
- name: Zip Frontend (including viya.json for full viya deploy)
|
||||
run: |
|
||||
|
@ -279,3 +287,4 @@ jobs:
|
|||
curl -k $URL -F attachment=@sas/sasjs_server.json.zip
|
||||
curl -k $URL -F attachment=@sas/sas9.sas
|
||||
curl -k $URL -F attachment=@sas/viya.sas
|
||||
curl -k $URL -F attachment=@sas/viya.json
|
||||
|
|
15
CHANGELOG.md
15
CHANGELOG.md
|
@ -1,3 +1,18 @@
|
|||
## [6.8.3](https://git.datacontroller.io/dc/dc/compare/v6.8.2...v6.8.3) (2024-05-09)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* updating core to increase filename length, closes [#103](https://git.datacontroller.io/dc/dc/issues/103) ([ee58fd5](https://git.datacontroller.io/dc/dc/commit/ee58fd5b4bc0dd3e3f232c4f26bb85b2e7fe2b54))
|
||||
|
||||
## [6.8.2](https://git.datacontroller.io/dc/dc/compare/v6.8.1...v6.8.2) (2024-05-03)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* dc_request_logs option feature ([93758ef](https://git.datacontroller.io/dc/dc/commit/93758efb275966c181f1ee8b6c752010909a0282))
|
||||
* release process ([c0dc919](https://git.datacontroller.io/dc/dc/commit/c0dc9191e3b95ea6f7e5021fc0bdbcab0af4cc64))
|
||||
|
||||
## [6.8.1](https://git.datacontroller.io/dc/dc/compare/v6.8.0...v6.8.1) (2024-05-02)
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "dcfrontend",
|
||||
"version": "6.8.1",
|
||||
"version": "6.8.3",
|
||||
"description": "Data Controller",
|
||||
"devDependencies": {
|
||||
"@saithodev/semantic-release-gitea": "^2.1.0",
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
"name": "dc-sas",
|
||||
"dependencies": {
|
||||
"@sasjs/cli": "^4.11.1",
|
||||
"@sasjs/core": "^4.52.0"
|
||||
"@sasjs/core": "^4.52.1"
|
||||
}
|
||||
},
|
||||
"node_modules/@coolaj86/urequest": {
|
||||
|
@ -116,9 +116,9 @@
|
|||
"integrity": "sha512-Grwydm5GxBsYk238PZw41XPjXVVQ9vWcvfZ06L2P0bQbvK0sGn7l69JA7H5MGr3QcaLpiD4Kg70cAh7PgE+JOw=="
|
||||
},
|
||||
"node_modules/@sasjs/core": {
|
||||
"version": "4.52.0",
|
||||
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.52.0.tgz",
|
||||
"integrity": "sha512-r+yQYSTYdvNPJ82n2xW/rbJd/cJpk3HuFhCa49RTDlDWjXMXJlymvGB0ltv3/L8rNk4+TwoyMzb7cJYnILi6ag=="
|
||||
"version": "4.52.1",
|
||||
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.52.1.tgz",
|
||||
"integrity": "sha512-XPNuKD1T5XLGMKg4Ll3KggOTjhHgnjdbefpwajpfro/8/9bJK7lyNehzUCcmbhJnijJbbChE7drIOF+uSaVxVg=="
|
||||
},
|
||||
"node_modules/@sasjs/lint": {
|
||||
"version": "2.3.1",
|
||||
|
@ -229,6 +229,12 @@
|
|||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/tough-cookie": {
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
|
||||
"integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
|
||||
"peer": true
|
||||
},
|
||||
"node_modules/abab": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
|
||||
|
@ -1828,9 +1834,9 @@
|
|||
}
|
||||
},
|
||||
"@sasjs/core": {
|
||||
"version": "4.52.0",
|
||||
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.52.0.tgz",
|
||||
"integrity": "sha512-r+yQYSTYdvNPJ82n2xW/rbJd/cJpk3HuFhCa49RTDlDWjXMXJlymvGB0ltv3/L8rNk4+TwoyMzb7cJYnILi6ag=="
|
||||
"version": "4.52.1",
|
||||
"resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.52.1.tgz",
|
||||
"integrity": "sha512-XPNuKD1T5XLGMKg4Ll3KggOTjhHgnjdbefpwajpfro/8/9bJK7lyNehzUCcmbhJnijJbbChE7drIOF+uSaVxVg=="
|
||||
},
|
||||
"@sasjs/lint": {
|
||||
"version": "2.3.1",
|
||||
|
@ -1927,6 +1933,12 @@
|
|||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"@types/tough-cookie": {
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
|
||||
"integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
|
||||
"peer": true
|
||||
},
|
||||
"abab": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
|
||||
|
@ -2953,7 +2965,8 @@
|
|||
"ws": {
|
||||
"version": "8.13.0",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
|
||||
"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="
|
||||
"integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
|
||||
"requires": {}
|
||||
},
|
||||
"xml": {
|
||||
"version": "1.0.1",
|
||||
|
|
|
@ -29,6 +29,6 @@
|
|||
"private": true,
|
||||
"dependencies": {
|
||||
"@sasjs/cli": "^4.11.1",
|
||||
"@sasjs/core": "^4.52.0"
|
||||
"@sasjs/core": "^4.52.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
/**
|
||||
@file
|
||||
@brief migration script to move from v6.5 to 6.8.2 of data controller
|
||||
|
||||
**/
|
||||
|
||||
%let dclib=YOURDCLIB;
|
||||
|
||||
libname &dclib "/your/dc/path";
|
||||
|
||||
/**
|
||||
* Change 1
|
||||
* New MPE_SUBMIT table
|
||||
*/
|
||||
proc sql;
|
||||
insert into &dclib..mpe_config set
|
||||
tx_from=0
|
||||
,tx_to='31DEC9999:23:59:59'dt
|
||||
,var_scope="DC"
|
||||
,var_name="DC_REQUEST_LOGS"
|
||||
,var_value="YES"
|
||||
,var_active=1
|
||||
,var_desc='Setting to NO will prevent each request being logged to the'
|
||||
!!' MPE_REQUESTS table Default=YES.';
|
|
@ -78,6 +78,15 @@ insert into &lib..mpe_config set
|
|||
!!' into the browser for editing in the EDIT screen. A higher number'
|
||||
!!' will require a decent browser (ie, not IE) and more memory on the'
|
||||
!!' client side.';
|
||||
insert into &lib..mpe_config set
|
||||
tx_from=0
|
||||
,tx_to='31DEC9999:23:59:59'dt
|
||||
,var_scope="DC"
|
||||
,var_name="DC_REQUEST_LOGS"
|
||||
,var_value="YES"
|
||||
,var_active=1
|
||||
,var_desc='Setting to NO will prevent each request being logged to the'
|
||||
!!' MPE_REQUESTS table Default=YES.';
|
||||
insert into &lib..mpe_config set
|
||||
tx_from=0
|
||||
,tx_to='31DEC9999:23:59:59'dt
|
||||
|
|
|
@ -29,9 +29,12 @@
|
|||
mpelocapprovals /* location for landing and staging files */
|
||||
mpelib /* location of configuration tables for DC */
|
||||
dc_repo_users /* location of user / group metadata */
|
||||
dc_licence_key /* extracted in dc_getsettings */
|
||||
dc_activation_key /* extracted in dc_getsettings */
|
||||
dc_locale /* extracted in dc_getsettings */
|
||||
/* extracted in dc_getsettings */
|
||||
dc_activation_key
|
||||
dc_licence_key
|
||||
dc_locale
|
||||
dc_request_logs
|
||||
dc_restrict_viewer
|
||||
dc_dttmtfmt /* can be overridden in dc_getsettings */
|
||||
_debug /* automatic variable when provided in URL */
|
||||
sasjs_mdebug /* used to show extra info when _debug is enabled */
|
||||
|
|
|
@ -35,6 +35,7 @@ run;
|
|||
run;
|
||||
%end;
|
||||
%if %sysfunc(exist(&dc_libref..mpe_requests)) and %mf_getplatform() ne SASVIYA
|
||||
and &DC_REQUEST_LOGS ne NO
|
||||
%then %do;
|
||||
data ;
|
||||
if 0 then set &dc_libref..mpe_requests;
|
||||
|
@ -42,6 +43,8 @@ run;
|
|||
request_user="%mf_getuser()";
|
||||
request_service="%scan(&_program,-2,/)/%scan(&_program,-1,/)";
|
||||
request_params='';
|
||||
/* sleep random amount to avoid parallel update attempts */
|
||||
call sleep(ranuni(0)*0.1,1);
|
||||
output;stop;
|
||||
proc append base=&dc_libref..mpe_requests data=&syslast force nowarn;
|
||||
run;
|
||||
|
|
Loading…
Reference in New Issue