22 Commits

Author SHA1 Message Date
20255c69c2 chore(release): 6.8.5 [skip ci]
## [6.8.5](https://git.datacontroller.io/dc/dc/compare/v6.8.4...v6.8.5) (2024-05-23)

### Bug Fixes

* bitemporal load issue [#105](#105) ([967698e](967698e4ce))
2024-05-23 11:34:51 +00:00
74f1c5416b Merge pull request 'fix: bitemporal load issue #105' (#108) from issue105 into main
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 4m43s
Release / Build-and-test-development (push) Successful in 8m40s
Release / release (push) Successful in 10m6s
Reviewed-on: #108
2024-05-23 11:08:03 +00:00
feed7f1ded Merge branch 'main' into issue105
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m44s
2024-05-23 11:07:29 +00:00
967698e4ce fix: bitemporal load issue #105
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m49s
2024-05-23 12:07:11 +01:00
71bd81ae47 chore(release): 6.8.4 [skip ci]
## [6.8.4](https://git.datacontroller.io/dc/dc/compare/v6.8.3...v6.8.4) (2024-05-22)

### Bug Fixes

* new approach to fixing [#105](#105) ([c11bd9a](c11bd9a2c5))
2024-05-22 16:56:15 +00:00
89a5153bb3 Merge pull request 'fix: new approach to fixing #105' (#106) from issue105 into main
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 4m44s
Release / Build-and-test-development (push) Successful in 8m42s
Release / release (push) Successful in 10m14s
Reviewed-on: #106
2024-05-22 16:33:29 +00:00
c11bd9a2c5 fix: new approach to fixing #105
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m54s
2024-05-22 17:33:04 +01:00
39c3e5411f chore(release): 6.8.3 [skip ci]
## [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](#103) ([ee58fd5](ee58fd5b4b))
2024-05-09 11:47:48 +00:00
aad419c55d Merge pull request 'fix: updating core to increase filename length, closes #103' (#104) from issue103 into main
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 4m48s
Release / Build-and-test-development (push) Successful in 8m51s
Release / release (push) Successful in 10m9s
Reviewed-on: #104
2024-05-09 11:29:37 +00:00
^
ee58fd5b4b fix: updating core to increase filename length, closes #103
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 5m2s
2024-05-09 12:23:04 +01:00
aedd2c451b Merge pull request 'release-ci' (#100) from release-ci into main
Some checks failed
Release / Build-production-and-ng-test (push) Successful in 5m1s
Release / Build-and-test-development (push) Successful in 8m54s
Release / release (push) Failing after 4m31s
Reviewed-on: #100
2024-05-06 21:33:57 +00:00
6d597611b6 chore(git): Merge branch 'main' into release-ci
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m9s
2024-05-06 09:04:34 +02:00
9ffe5efe5d ci: added viya.json to the release assets 2024-05-06 09:04:19 +02:00
2715950d86 chore(release): 6.8.2 [skip ci]
## [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](93758efb27))
* release process ([c0dc919](c0dc9191e3))
2024-05-03 07:19:26 +00:00
77a7190f4d ci: fixing release script
All checks were successful
Release / Build-production-and-ng-test (push) Successful in 3m58s
Release / Build-and-test-development (push) Successful in 7m39s
Release / release (push) Successful in 8m23s
2024-05-03 09:03:56 +02:00
cc65890fea Merge pull request 'fix: dc_request_logs option feature closes #96' (#97) from issue96 into main
Some checks failed
Release / Build-production-and-ng-test (push) Successful in 3m58s
Release / Build-and-test-development (push) Successful in 7m52s
Release / release (push) Failing after 1m18s
Reviewed-on: #97
2024-05-02 22:25:29 +00:00
^
93758efb27 fix: dc_request_logs option feature
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m3s
see: https://docs.datacontroller.io/dcc-options/#dc_request_logs
2024-05-02 23:09:14 +01:00
c0dc9191e3 fix: release process
Some checks failed
Release / Build-production-and-ng-test (push) Successful in 3m57s
Release / Build-and-test-development (push) Successful in 7m44s
Release / release (push) Failing after 1m17s
2024-05-02 18:41:25 +02:00
485783a782 chore(release): 6.8.1 [skip ci]
## [6.8.1](https://git.datacontroller.io/dc/dc/compare/v6.8.0...v6.8.1) (2024-05-02)

### Bug Fixes

* hide approve button when table revertable ([ec0f539](ec0f539a33))
2024-05-02 16:10:44 +00:00
ee07bef2b8 Merge pull request 'fix: hide approve button when table revertable' (#95) from ci-fix into main
Some checks failed
Release / Build-production-and-ng-test (push) Successful in 3m59s
Release / Build-and-test-development (push) Successful in 7m45s
Release / release (push) Failing after 1m55s
Reviewed-on: #95
2024-05-02 15:57:22 +00:00
0de8481314 ci: ng build
All checks were successful
Build / Build-and-ng-test (pull_request) Successful in 4m4s
2024-05-02 17:48:30 +02:00
ec0f539a33 fix: hide approve button when table revertable
Some checks failed
Build / Build-and-ng-test (pull_request) Failing after 2m1s
2024-05-02 17:44:53 +02:00
15 changed files with 757 additions and 651 deletions

View File

@ -46,3 +46,8 @@ jobs:
run: |
cd client
npm run test:headless
- name: Production Build
run: |
cd client
npm run build

View File

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

1
.gitignore vendored
View File

@ -12,6 +12,7 @@ client/cypress/results
client/cypress/videos
client/documentation
client/sheet-crypto*
client/.nx
cypress.env.json
sasjsbuild
sasjsresults

View File

@ -1,3 +1,39 @@
## [6.8.5](https://git.datacontroller.io/dc/dc/compare/v6.8.4...v6.8.5) (2024-05-23)
### Bug Fixes
* bitemporal load issue [#105](https://git.datacontroller.io/dc/dc/issues/105) ([967698e](https://git.datacontroller.io/dc/dc/commit/967698e4ce1e0abcbc6f0aff8a4be6c512dee93c))
## [6.8.4](https://git.datacontroller.io/dc/dc/compare/v6.8.3...v6.8.4) (2024-05-22)
### Bug Fixes
* new approach to fixing [#105](https://git.datacontroller.io/dc/dc/issues/105) ([c11bd9a](https://git.datacontroller.io/dc/dc/commit/c11bd9a2c55e49f10451962cb2e222c21206bce5))
## [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)
### Bug Fixes
* hide approve button when table revertable ([ec0f539](https://git.datacontroller.io/dc/dc/commit/ec0f539a337b176c83a661ff520a6892d47efa02))
# [6.8.0](https://git.datacontroller.io/dc/dc/compare/v6.7.0...v6.8.0) (2024-05-02)

1256
client/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -65,6 +65,7 @@
View base table
</button>
<button
*ngIf="!(tableDetails?.['ALLOW_RESTORE'] === 'YES')"
id="approval-btn"
class="btn btn-sm btn-success-outline text-center mr-5i"
[disabled]="

View File

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

29
sas/package-lock.json generated
View File

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

View File

@ -29,6 +29,6 @@
"private": true,
"dependencies": {
"@sasjs/cli": "^4.11.1",
"@sasjs/core": "^4.52.0"
"@sasjs/core": "^4.52.1"
}
}

View File

@ -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.';

View File

@ -1048,8 +1048,12 @@ run;
%if &loadtype=BITEMPORAL %then %do;
%let cat_string=catx('|' ,&bus_from,&bus_to);
data bitemp5a_lkp (keep=&md5_col);
set bitemp0_base;
data work.bitemp5a_lkp (keep=&md5_col)
%if "%substr(&sysver,1,1)" ne "4" and "%substr(&sysver,1,1)" ne "5" %then %do;
/nonote2err
%end;
;
set work.bitemp0_base;
/* for BITEMPORAL we need to compare business dates also */
&md5_col=put(md5(&cat_string!!'|'!!&stripcols),$hex32.);
run;

View File

@ -341,7 +341,7 @@ data work.STAGING_DS;
&droplist;
infile "&csv_dir/&fname" dsd dlm="&dlm" lrecl=32767
firstobs=2 missover termstr=&termstr encoding='utf-8';
attrib &attrib ;
attrib _____DELETE__THIS__RECORD_____ length=$3 &attrib ;
if _n_=1 then call missing (of _all_);
missing a b c d e f g h i j k l m n o p q r s t u v w x y z _;
input

View File

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

View File

@ -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 */

View File

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