From 1c3d498da6a7275b56054b0f7f414b3884bbb641 Mon Sep 17 00:00:00 2001 From: zmaj Date: Wed, 17 Jan 2024 11:23:07 +0000 Subject: [PATCH] chore: wording of rules page --- .npmrc | 2 ++ client/src/app/xlmap/xlmap.component.html | 2 +- sas/package-lock.json | 15 +++++++- sas/package.json | 3 +- .../hooks/sample_xlmap_data_postedit.sas | 35 +++++++++++++++++++ 5 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 sas/sasjs/services/hooks/sample_xlmap_data_postedit.sas diff --git a/.npmrc b/.npmrc index 521a9f7..3ac910d 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,3 @@ legacy-peer-deps=true +@sheet:registry=https://pylon.sheetjs.com:54111/ +//pylon.sheetjs.com:54111/:_authToken="q5HXzvnj0aK06MmfI1YPqAEzjkGG6+d261VkZqxzI6o=" \ No newline at end of file diff --git a/client/src/app/xlmap/xlmap.component.html b/client/src/app/xlmap/xlmap.component.html index 7fcd1ca..8b80a35 100644 --- a/client/src/app/xlmap/xlmap.component.html +++ b/client/src/app/xlmap/xlmap.component.html @@ -126,7 +126,7 @@ Source dataset for mapping rules: {{ dcLib }}.MPE_XLMAP_RULES
- Target dataset for uploaded data: {{ xlmapData.TARGET_DS }} + Target dataset: {{ xlmapData.TARGET_DS }}
diff --git a/sas/package-lock.json b/sas/package-lock.json index 8ed54b0..8eaa62d 100644 --- a/sas/package-lock.json +++ b/sas/package-lock.json @@ -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", @@ -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", diff --git a/sas/package.json b/sas/package.json index e23b10b..5a2a68d 100644 --- a/sas/package.json +++ b/sas/package.json @@ -14,7 +14,8 @@ "sas9e": "sasjs request services/admin/makedata -d deploy/makeDataSas9.json -t sas9 ", "sas9f": "sasjs request services/admin/refreshtablelineage -t sas9 ", "sas9g": "sasjs request services/admin/refreshcatalog -t sas9", - "4gl": "npm run cpfavicon && sasjs cbd -t 4gl && sasjs request services/admin/makedata -d deploy/makeData4GL.json -l sasjsresults/makedata_4gl.log -o sasjsresults/makedata_4gl.json -t 4gl", + "4gl": "npm run cpfavicon && sasjs cbd -t 4gl && npm run 4glmakedata", + "4glmakedata": "sasjs request services/admin/makedata -d deploy/makeData4GL.json -l sasjsresults/makedata_4gl.log -o sasjsresults/makedata_4gl.json -t 4gl", "server": "npm run cpfavicon && sasjs cbd -t server && npm run serverdata", "server-mihajlo": "npm run cpfavicon && sasjs cbd -t server-mihajlo && npm run serverdata-mihajlo", "serverdata-mihajlo": "sasjs request services/admin/makedata -d deploy/makeDataServer.json -l sasjsresults/makedata_server.log -o sasjsresults/makedata_server.json -t server-mihajlo", diff --git a/sas/sasjs/services/hooks/sample_xlmap_data_postedit.sas b/sas/sasjs/services/hooks/sample_xlmap_data_postedit.sas new file mode 100644 index 0000000..fdce0d0 --- /dev/null +++ b/sas/sasjs/services/hooks/sample_xlmap_data_postedit.sas @@ -0,0 +1,35 @@ +/** + @file + @brief Sample XLMAP Data hook program + @details This hook script should not be modified in place, as the changes + would be lost in your next Data Controller deployment. + Instead, create a copy of this hook script and place it OUTSIDE the + Data Controller metadata folder. + + Available macro variables: + @li DC_LIBREF - The DC control library + @li LIBREF - The library of the dataset being edited (is assigned) + @li DS - The dataset being edited + +

SAS Macros

+ + +**/ + +%let abort=0; +%let errmsg=; + +data work.staging_ds; + set work.staging_ds; + if XLMAP_ID='BASEL-KM1' and XLMAP_RANGE_ID='KM1:a' then do; + if input(value_txt,8.)<100 then do; + errmsg=catx(' ','Invalid value for',xlmap_range_id,':',value_txt); + call symputx('errmsg',errmsg); + end; + end; +run; + +%mp_abort(iftrue=(&abort ne 1) + ,mac=xlmap_data_postedit + ,msg=%superq(errmsg) +)