Compare commits
291 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
522979835c | ||
fe049256b5 | |||
|
31d1870198 | ||
|
6edf0dfb31 | ||
3bf3dceaa2 | |||
|
ce503653cd | ||
|
caa9854ff0 | ||
|
20c3a338c5 | ||
|
6547461637 | ||
|
bbb725c64c | ||
403d08c86a | |||
|
f66d9f511a | ||
|
dd2138ac5e | ||
74e9979c67 | |||
|
ddc22e5200 | ||
|
4218da91cd | ||
|
857b94f44f | ||
|
a3ce367950 | ||
|
75dac54591 | ||
a156c0111b | |||
e5d93fd7d6 | |||
|
67436f4ff9 | ||
|
b712f851a2 | ||
e2c0b8da86 | |||
|
1b4560061d | ||
|
d94df7f0eb | ||
|
fa04d7bf4e | ||
|
4d4cabb465 | ||
|
d4fee791a7 | ||
|
82c285e348 | ||
|
4d276657b3 | ||
|
cffeab813d | ||
|
18363bbbeb | ||
|
6df7d8d2ba | ||
|
5deba44d2b | ||
|
0a8b1e764c | ||
|
fc52e8f41a | ||
|
efcdc694dd | ||
|
eb7c44333c | ||
|
3c62ff6913 | ||
f4f589af94 | |||
3521579dea | |||
e97a6f52da | |||
|
3584aa35c7 | ||
|
b553520abe | ||
|
e32d44b1bc | ||
|
105da1503f | ||
29298072e5 | |||
|
154c10fee5 | ||
7853f7cb6a | |||
|
e54ecc8a35 | ||
d8b95c5739 | |||
|
2f8d0b764a | ||
|
d7732ed206 | ||
|
6e631cd9a5 | ||
|
0a9e5dd834 | ||
|
d14a4eaadd | ||
|
5f7c7fcc7b | ||
|
978f152ab6 | ||
|
68a2a606f3 | ||
|
bad43135d7 | ||
|
110ad9a6e9 | ||
|
e98f288302 | ||
|
9a79f37bf1 | ||
|
85909cfc1e | ||
|
4330da520f | ||
|
27907ed00f | ||
|
31c90f3190 | ||
|
35844e0cf1 | ||
|
afa7e380aa | ||
cb9a5f0eb4 | |||
|
da522c557d | ||
|
2c0afd0268 | ||
|
20255c69c2 | ||
74f1c5416b | |||
feed7f1ded | |||
967698e4ce | |||
|
71bd81ae47 | ||
89a5153bb3 | |||
c11bd9a2c5 | |||
59d46a9926 | |||
|
39c3e5411f | ||
aad419c55d | |||
|
ee58fd5b4b | ||
|
5564aea9c2 | ||
aedd2c451b | |||
|
6d597611b6 | ||
|
9ffe5efe5d | ||
|
2715950d86 | ||
|
77a7190f4d | ||
cc65890fea | |||
|
93758efb27 | ||
|
c0dc9191e3 | ||
|
485783a782 | ||
ee07bef2b8 | |||
|
0de8481314 | ||
|
ec0f539a33 | ||
|
173ee2daff | ||
|
5c0091b5e8 | ||
84dce7f6e8 | |||
|
e8a943a35a | ||
|
b3171a8125 | ||
|
d77f2eb674 | ||
|
5474fad9cc | ||
|
3dd85cc60b | ||
|
510e412ff2 | ||
|
3dfdccbc6b | ||
|
a55661548a | ||
|
69363b37e9 | ||
|
2d6a753921 | ||
|
dc989e5668 | ||
|
227ac480d5 | ||
|
c5e4650327 | ||
56cf271e77 | |||
|
fa8396f039 | ||
|
904ca30f91 | ||
|
549f35766b | ||
|
1589c799ec | ||
|
604c2e70bd | ||
|
297a84d3a4 | ||
|
aaad9f7207 | ||
|
a4028562ce | ||
|
5ab3f98855 | ||
|
eba21e96b4 | ||
|
9ad7ae47b5 | ||
cf54e4c8f3 | |||
|
57aa6fa0fc | ||
|
4a01f3d490 | ||
|
80a0db951d | ||
|
3202cb8e08 | ||
|
ddf36230bf | ||
|
b67c2be968 | ||
|
dc2c8da92b | ||
|
5d6c3701d0 | ||
|
b024e263b4 | ||
b706864e40 | |||
|
60cc666b67 | ||
|
efff4dd553 | ||
|
2b1dad8e48 | ||
|
8c7de5aad7 | ||
|
1db8bc2573 | ||
|
c60dd65a16 | ||
f7f59a4b0a | |||
|
ec7615e7e3 | ||
|
f411c33754 | ||
|
79121168e4 | ||
|
ef81e33f70 | ||
|
96066c66cb | ||
|
b1819b776d | ||
|
bd7a392ffc | ||
7997b77158 | |||
|
d1966bcdc5 | ||
|
7b5bbe024d | ||
4d84f15aca | |||
|
928937daab | ||
|
3bd8d247e5 | ||
|
cf6c9dd5f2 | ||
|
ff55cbbaad | ||
|
3eda4e2c58 | ||
|
02a8a1c565 | ||
|
8769841f08 | ||
|
7208fe1c3b | ||
|
801c8c6a9f | ||
|
51ebd25aa3 | ||
|
c6595c1f61 | ||
|
a267666e99 | ||
|
b27fea5b91 | ||
|
f8a14d4bde | ||
|
633e35338d | ||
|
8003da94e6 | ||
c3af97ef57 | |||
31d4e5c727 | |||
fbbcf90956 | |||
f522038b8d | |||
|
ace599b39f | ||
|
963562621d | ||
|
5171d07441 | ||
9a0b9573d5 | |||
|
4733311ef3 | ||
|
432450a15b | ||
|
47638becc0 | ||
bdd3a95685 | |||
|
38601346a5 | ||
|
dc3a6ae6a1 | ||
f668b1e7f7 | |||
eb1c09d790 | |||
|
9bf324c74b | ||
f13e909478 | |||
|
6a0fe287dd | ||
|
5a48f2e6e3 | ||
|
6565834ad4 | ||
|
837821fd01 | ||
|
cff5989559 | ||
|
60510a4d68 | ||
|
2b54034973 | ||
|
347b0f9065 | ||
|
eac0104d7a | ||
|
1c8e4604de | ||
e9624635ed | |||
|
f9beda1ddb | ||
|
53400de110 | ||
cf37ddab22 | |||
|
625af199f4 | ||
56e9217f4b | |||
86f1af7926 | |||
|
7737f8455d | ||
b0f1677fcc | |||
|
4406e0d4b4 | ||
cf19381060 | |||
802d8a3b08 | |||
|
2a852496e9 | ||
|
4653097225 | ||
|
8afee29e02 | ||
|
233eca39ef | ||
|
1a96bb1233 | ||
|
93702c63dc | ||
|
df065562d1 | ||
|
802c99adf9 | ||
|
482c7455f5 | ||
|
731b96dccc | ||
|
9550ae4d11 | ||
|
2d6e747db9 | ||
|
fd94945466 | ||
|
d3b0c09332 | ||
|
01915a2db9 | ||
|
51b043b6d2 | ||
|
c144fd8087 | ||
|
12b15df78c | ||
|
d6ecd12cea | ||
|
1c3d498da6 | ||
|
d75e10aef5 | ||
|
f0f9d85558 | ||
86f3411896 | |||
|
6daef39268 | ||
7d1720a360 | |||
|
b11a4884b4 | ||
|
50696bb926 | ||
|
d67d4e2f86 | ||
|
2f01c4d251 | ||
|
9ffa30ab74 | ||
|
5d93346b52 | ||
|
39762b36c6 | ||
e40ebdff05 | |||
|
8d12d9e51e | ||
|
23708c9aae | ||
|
c86fba9dc7 | ||
|
e747e6e4e7 | ||
|
5aec024242 | ||
|
b473b198a6 | ||
|
516e5a2062 | ||
|
fb3abbe491 | ||
|
3e009f3037 | ||
|
e63d304953 | ||
3cd90c2d47 | |||
|
a485c3b787 | ||
|
2702bb3c84 | ||
|
56264ecc69 | ||
|
cc4535245c | ||
|
6ae31de1dd | ||
|
2d4d068413 | ||
|
271543a446 | ||
|
8f796aec36 | ||
|
6eb1aa85d2 | ||
ac59b77ad5 | |||
3efccc4cf3 | |||
|
8cbcd18f4b | ||
6bb2378790 | |||
e7d0ffe8c0 | |||
|
ab89600c73 | ||
|
830e3816a0 | ||
|
dadac4f13f | ||
|
1de48a49af | ||
|
687a1e1cb5 | ||
|
665a04f5c5 | ||
|
fdb18d242b | ||
|
ec173da4ce | ||
|
bb35cc15d2 | ||
|
181f52eaea | ||
|
fc7c8101ed | ||
|
a347603fe0 | ||
|
09022c995f | ||
3609943f30 | |||
a1d308ea07 | |||
5579db0eaf | |||
3a3e488b23 | |||
0a82ec0a70 | |||
|
bc1d89218e | ||
817b9adeac | |||
|
a7aa42a59b | ||
34f239036d | |||
91f128c2fe |
@ -8,9 +8,16 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20.14.0
|
||||
|
||||
- name: Install Google Chrome
|
||||
run: |
|
||||
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
|
||||
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
|
||||
apt-get update
|
||||
apt-get install -y google-chrome-stable xvfb
|
||||
|
||||
- name: Write .npmrc file
|
||||
run: echo "$NPMRC" > client/.npmrc
|
||||
@ -18,8 +25,27 @@ jobs:
|
||||
env:
|
||||
NPMRC: ${{ secrets.NPMRC}}
|
||||
|
||||
- run: npm run lint:check
|
||||
- run: |
|
||||
- name: Lint check
|
||||
run: npm run lint:check
|
||||
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
cd client
|
||||
# Decrypt and Install sheet
|
||||
echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
|
||||
npm ci
|
||||
|
||||
- name: Licence checker
|
||||
run: |
|
||||
cd client
|
||||
npm run license-checker
|
||||
|
||||
- name: Angular Tests
|
||||
run: |
|
||||
cd client
|
||||
npm run test:headless
|
||||
|
||||
- name: Production Build
|
||||
run: |
|
||||
cd client
|
||||
npm run build
|
@ -11,9 +11,9 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20.14.0
|
||||
|
||||
- name: Write .npmrc file
|
||||
run: |
|
||||
@ -34,7 +34,11 @@ jobs:
|
||||
CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
run: |
|
||||
cd client
|
||||
# Decrypt and Install sheet
|
||||
echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
|
||||
npm ci
|
||||
|
||||
- name: Check audit
|
||||
# Audit should fail and stop the CI if critical vulnerability found
|
||||
@ -48,7 +52,7 @@ jobs:
|
||||
- name: Angular Tests
|
||||
run: |
|
||||
cd client
|
||||
npm test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
|
||||
npm run test:headless
|
||||
|
||||
- name: Angular Production Build
|
||||
run: |
|
||||
@ -62,9 +66,9 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20.14.0
|
||||
|
||||
- name: Write .npmrc file
|
||||
run: |
|
||||
@ -86,7 +90,11 @@ jobs:
|
||||
CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
run: |
|
||||
cd client
|
||||
# Decrypt and Install sheet
|
||||
echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
|
||||
npm ci
|
||||
|
||||
# Install pm2 and prepare SASJS server
|
||||
- run: npm i -g pm2
|
||||
@ -128,7 +136,7 @@ jobs:
|
||||
replace-in-files --regex='"hosturl".*' --replacement='hosturl:"http://localhost:4200",' ./cypress.config.ts
|
||||
cat ./cypress.config.ts
|
||||
# Start frontend and run cypress
|
||||
npm start & npx wait-on http://localhost:4200 && npx cypress run --browser chrome --spec "cypress/e2e/liveness.cy.ts,cypress/e2e/editor.cy.ts,cypress/e2e/excel.cy.ts,cypress/e2e/filtering.cy.ts,cypress/e2e/licensing.cy.ts"
|
||||
npm start & npx wait-on http://localhost:4200 && npx cypress run --browser chrome --spec "cypress/e2e/liveness.cy.ts,cypress/e2e/editor.cy.ts,cypress/e2e/excel-multi-load.cy.ts,cypress/e2e/excel.cy.ts,cypress/e2e/filtering.cy.ts,cypress/e2e/licensing.cy.ts"
|
||||
|
||||
- name: Zip Cypress videos
|
||||
if: always()
|
||||
@ -148,9 +156,9 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 18
|
||||
node-version: 20.14.0
|
||||
|
||||
- name: Write .npmrc file
|
||||
run: |
|
||||
@ -168,6 +176,19 @@ jobs:
|
||||
npm i -g @sasjs/cli
|
||||
# jq is used to parse the release JSON
|
||||
apt-get install jq -y
|
||||
# doxygen is used for the SASJS docs
|
||||
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
|
||||
# Decrypt and Install sheet
|
||||
echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
|
||||
npm ci
|
||||
npm i webpack
|
||||
npm run build
|
||||
|
||||
- name: Create Empty Release (assets are posted later)
|
||||
run: |
|
||||
@ -181,7 +202,6 @@ jobs:
|
||||
description: Must be created AFTER the release as the version (git tag) is used in the interface
|
||||
run: |
|
||||
cd client
|
||||
npm ci
|
||||
npm run build
|
||||
|
||||
- name: Build SAS9 EBI Release
|
||||
@ -225,6 +245,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: |
|
||||
@ -240,6 +261,12 @@ jobs:
|
||||
npm run compodoc:build
|
||||
surfer put --token ${{ secrets.TSDOC_TOKEN }} --server webdoc.datacontroller.io documentation/* /
|
||||
|
||||
- name: Release code.datacontroller.io
|
||||
run: |
|
||||
cd sas
|
||||
sasjs doc
|
||||
surfer put --token ${{ secrets.CODE_DATACONTROLLER_IO }} --server code.datacontroller.io sasjsbuild/sasdocs/* /
|
||||
|
||||
- name: Upload assets to release
|
||||
run: |
|
||||
RELEASE_ID=`curl -k 'https://git.datacontroller.io/api/v1/repos/dc/dc/releases/latest?access_token=${{ secrets.RELEASE_TOKEN }}' | jq -r '.id'`
|
||||
@ -254,3 +281,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
|
||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -11,6 +11,9 @@ client/cypress/screenshots
|
||||
client/cypress/results
|
||||
client/cypress/videos
|
||||
client/documentation
|
||||
client/**/sheet-crypto.tgz
|
||||
client/.nx
|
||||
client/libraries/sheet-crypto.tgz
|
||||
cypress.env.json
|
||||
sasjsbuild
|
||||
sasjsresults
|
||||
|
33
.vscode/settings.json
vendored
33
.vscode/settings.json
vendored
@ -1,18 +1,19 @@
|
||||
{
|
||||
"cSpell.words": [
|
||||
"SYSERRORTEXT",
|
||||
"SYSWARNINGTEXT"
|
||||
],
|
||||
"editor.rulers": [
|
||||
80
|
||||
],
|
||||
"files.trimTrailingWhitespace": true,
|
||||
"[markdown]": {
|
||||
"files.trimTrailingWhitespace": false
|
||||
},
|
||||
"workbench.colorCustomizations": {
|
||||
"titleBar.activeForeground": "#ebe8e8",
|
||||
"titleBar.activeBackground": "#95ff0053",
|
||||
},
|
||||
"terminal.integrated.wordSeparators": " ()[]{}',\"`─‘’"
|
||||
"cSpell.words": [
|
||||
"Licence",
|
||||
"SYSERRORTEXT",
|
||||
"SYSWARNINGTEXT",
|
||||
"xlmaprules",
|
||||
"xlmaps"
|
||||
],
|
||||
"editor.rulers": [80],
|
||||
"files.trimTrailingWhitespace": true,
|
||||
"[markdown]": {
|
||||
"files.trimTrailingWhitespace": false
|
||||
},
|
||||
"workbench.colorCustomizations": {
|
||||
"titleBar.activeForeground": "#ebe8e8",
|
||||
"titleBar.activeBackground": "#95ff0053"
|
||||
},
|
||||
"terminal.integrated.wordSeparators": " ()[]{}',\"`─‘’"
|
||||
}
|
274
CHANGELOG.md
274
CHANGELOG.md
@ -1,3 +1,277 @@
|
||||
# [6.12.0](https://git.datacontroller.io/dc/dc/compare/v6.11.1...v6.12.0) (2024-09-02)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* added appLoc to the system page ([dd2138a](https://git.datacontroller.io/dc/dc/commit/dd2138ac5e6067de310e83d16fccc9b9764ba3ff))
|
||||
* bumping core for passthrough fix, [#124](https://git.datacontroller.io/dc/dc/issues/124) ([caa9854](https://git.datacontroller.io/dc/dc/commit/caa9854ff0431ccbb6ff1d6d3509dc877362cceb))
|
||||
* excel with password flow, introducing web worker for XLSX.read ([a3ce367](https://git.datacontroller.io/dc/dc/commit/a3ce36795007a4e3b6ac3499ffd119dc3758f387))
|
||||
* implemented the new request wrapper usage, added XLSX read with a Web Worker, multi load preview data, full height ([4218da9](https://git.datacontroller.io/dc/dc/commit/4218da91cd193aa45346ad7e34ccc00ca89df4fb))
|
||||
* **multi load:** xlsx read file ahead of time, while user choose datasets ([6547461](https://git.datacontroller.io/dc/dc/commit/65474616379e1dacc1329b3bdc5eb14f34428bb1))
|
||||
* refactored adapter request wrapper function to return job log as well ([67436f4](https://git.datacontroller.io/dc/dc/commit/67436f4ff9bb4d77d5f897f47a3e3d472981f275))
|
||||
* using temporary names for temporary tables ([ce50365](https://git.datacontroller.io/dc/dc/commit/ce503653cd9fc36f72fb172bd14816e07c792e14)), closes [#124](https://git.datacontroller.io/dc/dc/issues/124)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* searching data in excel files using new algorithm (massive performance improvement) ([bbb725c](https://git.datacontroller.io/dc/dc/commit/bbb725c64cc23ed701b189623992408c42fdde8f))
|
||||
|
||||
## [6.11.1](https://git.datacontroller.io/dc/dc/compare/v6.11.0...v6.11.1) (2024-07-02)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* adding SYSSITE, part of [#116](https://git.datacontroller.io/dc/dc/issues/116) ([a156c01](https://git.datacontroller.io/dc/dc/commit/a156c0111b3de5e3744e38d377d6e9aa09915803))
|
||||
* ensuring review_reason_txt in output. Closes [#117](https://git.datacontroller.io/dc/dc/issues/117) ([e5d93fd](https://git.datacontroller.io/dc/dc/commit/e5d93fd7d6d86bc47ff56664bd812b4d9d0749a5))
|
||||
|
||||
# [6.11.0](https://git.datacontroller.io/dc/dc/compare/v6.10.1...v6.11.0) (2024-06-27)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* addressing PR comments ([d94df7f](https://git.datacontroller.io/dc/dc/commit/d94df7f0ebae8feab5e1d5cf8011af8c8be2ca18))
|
||||
* **multi load:** fixed parsing algorithm reused for the multi load, the fix affects the normal upload as well. ([d4fee79](https://git.datacontroller.io/dc/dc/commit/d4fee791a72021e449cf9680c3e3a525dce41ac1))
|
||||
* **multi load:** label rename ([fa04d7b](https://git.datacontroller.io/dc/dc/commit/fa04d7bf4e5ba337146bdaa926c60488f8851449))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **multi load:** added HOT for user datasets input ([18363bb](https://git.datacontroller.io/dc/dc/commit/18363bbbeb9cf96183ba4841da8134b2f66f735c))
|
||||
* **multi load:** implemented matching libds and parsing of the multiple sheets ([efcdc69](https://git.datacontroller.io/dc/dc/commit/efcdc694dd275cdb9a4e19f26e5522b8dadc5fd9))
|
||||
* **multi load:** licence submit limits ([cffeab8](https://git.datacontroller.io/dc/dc/commit/cffeab813d8d4b324f82710dfd73953d4cbf8ffe))
|
||||
* **multi load:** multiple csv files ([4d27665](https://git.datacontroller.io/dc/dc/commit/4d276657b35a147a2233a03afcb1716348555f52))
|
||||
* **multi load:** refactored range find function, unlocking excel with password is reusable ([eb7c443](https://git.datacontroller.io/dc/dc/commit/eb7c44333c865e7f7bbfb54dd7f73bfc110f86a7))
|
||||
* **multi load:** submitting multiple found tables at once ([5deba44](https://git.datacontroller.io/dc/dc/commit/5deba44d2b7352866d821b70dbbfbbf54955dc47))
|
||||
|
||||
## [6.10.1](https://git.datacontroller.io/dc/dc/compare/v6.10.0...v6.10.1) (2024-06-07)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* adding 60 more colours to crayons table. Closes [#112](https://git.datacontroller.io/dc/dc/issues/112) ([3521579](https://git.datacontroller.io/dc/dc/commit/3521579dead089eebf62455686be3aee88bde687))
|
||||
* terms and conditions colours, editor on smaller screens show only icons ([e32d44b](https://git.datacontroller.io/dc/dc/commit/e32d44b1bcdfeea43d19b21ec0ddf4af1ce3992a))
|
||||
|
||||
# [6.10.0](https://git.datacontroller.io/dc/dc/compare/v6.9.0...v6.10.0) (2024-06-07)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* updated handsontable to v14 ([2f8d0b7](https://git.datacontroller.io/dc/dc/commit/2f8d0b764a957ad8c11cd1088fad5e0670aa1731))
|
||||
|
||||
# [6.9.0](https://git.datacontroller.io/dc/dc/compare/v6.8.5...v6.9.0) (2024-05-31)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* added colors.scss file, start of a refactor ([110ad9a](https://git.datacontroller.io/dc/dc/commit/110ad9a6e9ed39bd5591ae65c2d0005ba47ca758))
|
||||
* added stealFocus directive ([9a79f37](https://git.datacontroller.io/dc/dc/commit/9a79f37bf143a1e05df7407358e2687c678e3e68))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* added app settings service to handle theme persistance, fix: optimised dark mode contrast ([35844e0](https://git.datacontroller.io/dc/dc/commit/35844e0cf1a639553269f2ab0f8666a56ab5cc47))
|
||||
* **dark mode:** clarity optimizations ([afa7e38](https://git.datacontroller.io/dc/dc/commit/afa7e380aa3bdabd380c038522b9d73d9a8a3b91))
|
||||
* **dark mode:** lineage and metadata ([27907ed](https://git.datacontroller.io/dc/dc/commit/27907ed00fe81f4c752ffe99d2fb029d5c884f0a))
|
||||
* **dark mode:** refactoring clarity to enable dark mode, added toggle button ([5564aea](https://git.datacontroller.io/dc/dc/commit/5564aea9c25f8e81ff85afa8352325b9992e4043))
|
||||
* **dark mode:** removing custom css rules so clarity can handle dark/light modes. Handsontable css for dark mode ([2c0afd0](https://git.datacontroller.io/dc/dc/commit/2c0afd02684cdf3bda374731b0359665e00ed95d))
|
||||
|
||||
## [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)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* ci sheet lib, submit message auto focus ([c5e4650](https://git.datacontroller.io/dc/dc/commit/c5e46503272f3f3d9cd83ac04225babf79d4de44))
|
||||
* **clarity:** new version style issues ([8c7de5a](https://git.datacontroller.io/dc/dc/commit/8c7de5aad7e7e32a64769696af9b93eb9a6225d3))
|
||||
* cypress tests ([3dd85cc](https://git.datacontroller.io/dc/dc/commit/3dd85cc60bd5ac99bc930b6b9c89a8e707e4d51d))
|
||||
* ensuring that only restorable versions are restorable ([a402856](https://git.datacontroller.io/dc/dc/commit/a4028562ce91b32ff971ab9821328b97cd23f381))
|
||||
* ensuring version history only includes loaded versions ([51ebd25](https://git.datacontroller.io/dc/dc/commit/51ebd25aa362aa8e66c83b29b2c64aa0f206f5bd))
|
||||
* final testing on restore feature ([297a84d](https://git.datacontroller.io/dc/dc/commit/297a84d3a4ebb47bef7f3ca9758978d727afed8d))
|
||||
* issue with multiple adds/deletes, [#84](https://git.datacontroller.io/dc/dc/issues/84) ([904ca30](https://git.datacontroller.io/dc/dc/commit/904ca30f918da085fa05dae066367b512933d1a9))
|
||||
* load_ref var ([aaad9f7](https://git.datacontroller.io/dc/dc/commit/aaad9f7207115599a006980fff099d59738dd2cd))
|
||||
* removing alerts dummy data, closes [#93](https://git.datacontroller.io/dc/dc/issues/93) ([eba21e9](https://git.datacontroller.io/dc/dc/commit/eba21e96b4fa34e63b4477281f47d9a01d621f2e))
|
||||
* restore table version improvement ([549f357](https://git.datacontroller.io/dc/dc/commit/549f35766ba7b5bbe55694845e85bfefc4193375))
|
||||
* **sas:** viewer versions fix ([c6595c1](https://git.datacontroller.io/dc/dc/commit/c6595c1f618803d9202cba1a1fe76986449cf2e2))
|
||||
* stage and approve buttons renaming ([ef81e33](https://git.datacontroller.io/dc/dc/commit/ef81e33f704d0b4f99405d96498e1d29ac817982))
|
||||
* supporting SCD2 data reversions ([fa8396f](https://git.datacontroller.io/dc/dc/commit/fa8396f0394cbddb6dbacb4b355de078fad49980))
|
||||
* table info modal, versions - column names ([801c8c6](https://git.datacontroller.io/dc/dc/commit/801c8c6a9fb95388a06a6c6284fec4dc25bb77c5))
|
||||
* **updates:** angular, clarity, resolved legacy-peer-deps ([c60dd65](https://git.datacontroller.io/dc/dc/commit/c60dd65a1637333f11a0c39ef697c7292a6ede07))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* backend to show in getchangeinfo whether a user is allowed to restore ([8769841](https://git.datacontroller.io/dc/dc/commit/8769841f08694f672ef7ae1a17beacd0dbedda52))
|
||||
* list versions of target tables (backend) ([f8a14d4](https://git.datacontroller.io/dc/dc/commit/f8a14d4bdef055b99930491d1f6fabe55a50a497))
|
||||
* restore ([604c2e7](https://git.datacontroller.io/dc/dc/commit/604c2e70bdeeeb1aa5bb18b94f525ebd049397fa))
|
||||
* SAS services & tests for RESTORE, [#84](https://git.datacontroller.io/dc/dc/issues/84) ([9ad7ae4](https://git.datacontroller.io/dc/dc/commit/9ad7ae47b5e793ce68ab21c9eeb8dee6cb85e496))
|
||||
* staging page, restore buttons ([02a8a1c](https://git.datacontroller.io/dc/dc/commit/02a8a1c5654350cafc53b749cceb686fc6848c33))
|
||||
* table metadata modal, versions tab (and link) ([b27fea5](https://git.datacontroller.io/dc/dc/commit/b27fea5b91e33b4673a3a991aedae558e366ca29))
|
||||
* **versions:** getting list of versions (plus test) ([8003da9](https://git.datacontroller.io/dc/dc/commit/8003da94e615463ed3ddfd60b0cbf2e58615eab1))
|
||||
|
||||
# [6.7.0](https://git.datacontroller.io/dc/dc/compare/v6.6.4...v6.7.0) (2024-04-01)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* numeric values in hot dropdown aligned right ([9635626](https://git.datacontroller.io/dc/dc/commit/963562621ddf0e8d24a29a8481c5e6da1b040708))
|
||||
|
||||
## [6.6.4](https://git.datacontroller.io/dc/dc/compare/v6.6.3...v6.6.4) (2024-04-01)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* ordering SOFTSELECT numerically in dropdown ([f522038](https://git.datacontroller.io/dc/dc/commit/f522038b8ddb1da14b8adbf8346d0a4539a94cc8)), closes [#85](https://git.datacontroller.io/dc/dc/issues/85)
|
||||
* reverting col ([fbbcf90](https://git.datacontroller.io/dc/dc/commit/fbbcf90956bf538b032b0107c07b8576d20353b9))
|
||||
* typo ([31d4e5c](https://git.datacontroller.io/dc/dc/commit/31d4e5c727f790d428fb2ea8da60dca929561805))
|
||||
|
||||
## [6.6.3](https://git.datacontroller.io/dc/dc/compare/v6.6.2...v6.6.3) (2024-02-26)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* allow empty clause value when NE or CONTAINS ([432450a](https://git.datacontroller.io/dc/dc/commit/432450a15b51a269821ba1d430854f5d1dd04703))
|
||||
|
||||
## [6.6.2](https://git.datacontroller.io/dc/dc/compare/v6.6.1...v6.6.2) (2024-02-22)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* excel with commas getting wrapped in quotes ([3860134](https://git.datacontroller.io/dc/dc/commit/38601346a529cfe3787bb286a639e0293c365020))
|
||||
|
||||
## [6.6.1](https://git.datacontroller.io/dc/dc/compare/v6.6.0...v6.6.1) (2024-02-19)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **client:** bumped @sasjs/adapter with fixed redirected login ([eb1c09d](https://git.datacontroller.io/dc/dc/commit/eb1c09d7909ba07faf763da261545dc1efaec1b3))
|
||||
|
||||
# [6.6.0](https://git.datacontroller.io/dc/dc/compare/v6.5.2...v6.6.0) (2024-02-12)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* adjust the col numbers in extracted data ([cff5989](https://git.datacontroller.io/dc/dc/commit/cff598955930d2581349e5c6e8b2dd3f9ac96b4c))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* extra table metadata for [#75](https://git.datacontroller.io/dc/dc/issues/75) ([837821f](https://git.datacontroller.io/dc/dc/commit/837821fd01477d340524dfdaf8dd3d3758cf3095))
|
||||
* show dsnote on hover title ([6565834](https://git.datacontroller.io/dc/dc/commit/6565834ad4089ecf2de39967e6ed6f217ee4a0a5))
|
||||
|
||||
## [6.5.2](https://git.datacontroller.io/dc/dc/compare/v6.5.1...v6.5.2) (2024-02-06)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* ordering mpe_selectbox data by the data values after selectbox_order ([2b54034](https://git.datacontroller.io/dc/dc/commit/2b5403497317632a4be8a00f21455c036f1e6461))
|
||||
|
||||
## [6.5.1](https://git.datacontroller.io/dc/dc/compare/v6.5.0...v6.5.1) (2024-02-02)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* ensuring submitter email can be pulled from mpe_emails ([eac0104](https://git.datacontroller.io/dc/dc/commit/eac0104d7aebaf98ff1d1c504c1ce3b25d4a0ce8))
|
||||
|
||||
# [6.5.0](https://git.datacontroller.io/dc/dc/compare/v6.4.0...v6.5.0) (2024-01-26)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* filtering by reference to Variables as well as Values ([6eb1aa8](https://git.datacontroller.io/dc/dc/commit/6eb1aa85d29294d63e6af377e622fbed7fd1fab8))
|
||||
|
||||
# [6.4.0](https://git.datacontroller.io/dc/dc/compare/v6.3.1...v6.4.0) (2024-01-24)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* add dcLib to globals ([5d93346](https://git.datacontroller.io/dc/dc/commit/5d93346b52eda27c2829770e96686a713296d373))
|
||||
* add service to get xlmap rules and fixed interface name ([9ffa30a](https://git.datacontroller.io/dc/dc/commit/9ffa30ab747f5b62acbd452431a5e6e440afcb80))
|
||||
* increasing length of mpe_excel_map cols to ([2d4d068](https://git.datacontroller.io/dc/dc/commit/2d4d068413dcdac98581f08939e74bde65b73428))
|
||||
* providing info on mapids to FE ([fd94945](https://git.datacontroller.io/dc/dc/commit/fd94945466c1a797ddc89815258a65624a9cb0cf))
|
||||
* removing tables from EDIT menu that are in xlmaps ([9550ae4](https://git.datacontroller.io/dc/dc/commit/9550ae4d1154a0272f8a2427ac9d2afdfd699c96))
|
||||
* removing XLMAP_TARGETLIBDS from mpe_xlmaps_rules table ([93702c6](https://git.datacontroller.io/dc/dc/commit/93702c63dc280cdba1e46f0fd8fe0deaec879611))
|
||||
* renaming TABLE macvar to LOAD_REF in postdata.sas ([01915a2](https://git.datacontroller.io/dc/dc/commit/01915a2db9a4dfb94e4e8213e2c32181da36d349))
|
||||
* reverting xlmap in getdata change ([2d6e747](https://git.datacontroller.io/dc/dc/commit/2d6e747db9b84e9fb0dfcf9102a2f7dd2cb51891))
|
||||
* update edit tab to load ([516e5a2](https://git.datacontroller.io/dc/dc/commit/516e5a206216f79ab1dce9f4eab0d31115743160))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* adding ability to define the target table for excel maps ([c86fba9](https://git.datacontroller.io/dc/dc/commit/c86fba9dc75ddc6033132f469ad1c31b9131b12e))
|
||||
* adding ismap attribute to getdata response (and fixing test) ([2702bb3](https://git.datacontroller.io/dc/dc/commit/2702bb3c84c45903def1aa2b8cc20a6dd080281b))
|
||||
* Complex Excel Uploads ([cf19381](https://git.datacontroller.io/dc/dc/commit/cf193810606f287b8d6f864c4eb64d43c5ab5f3c)), closes [#69](https://git.datacontroller.io/dc/dc/issues/69)
|
||||
* Create Tables / Files dropdown under load tab ([b473b19](https://git.datacontroller.io/dc/dc/commit/b473b198a61f468dff74cd8e64692e7847084a80))
|
||||
* display list of maps in sidebar ([5aec024](https://git.datacontroller.io/dc/dc/commit/5aec0242429942f8a989b5fb79f8d3865e9de01a))
|
||||
* implemented the logic for xlmap component ([50696bb](https://git.datacontroller.io/dc/dc/commit/50696bb926dd00472db65a008771a4b6352871be))
|
||||
* model changes for [#69](https://git.datacontroller.io/dc/dc/issues/69) ([271543a](https://git.datacontroller.io/dc/dc/commit/271543a446a2116718f99f0540e3cd911f9f5fe7))
|
||||
* new getxlmaps service to return rules for a particular xlmap_id ([56264ec](https://git.datacontroller.io/dc/dc/commit/56264ecc6908bf6c8e3e666dfeba7068d6195df8))
|
||||
* validating the excel map after stage (adding load-ref) ([a485c3b](https://git.datacontroller.io/dc/dc/commit/a485c3b78724a36f7bacb264fb02140cc62d6512))
|
||||
|
||||
## [6.3.1](https://git.datacontroller.io/dc/dc/compare/v6.3.0...v6.3.1) (2024-01-01)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* enabling excel uploads to tables with retained keys, also adding more validation to MPE_TABLES updates ([3efccc4](https://git.datacontroller.io/dc/dc/commit/3efccc4cf3752763d049836724f2491c287f65db))
|
||||
|
||||
# [6.3.0](https://git.datacontroller.io/dc/dc/compare/v6.2.8...v6.3.0) (2023-12-04)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* viewer row handle ([dadac4f](https://git.datacontroller.io/dc/dc/commit/dadac4f13f85b5446198b6340cad28844defc94d))
|
||||
|
||||
## [6.2.8](https://git.datacontroller.io/dc/dc/compare/v6.2.7...v6.2.8) (2023-12-04)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* bumping sasjs/core to fix mp_loadformat issue ([a1d308e](https://git.datacontroller.io/dc/dc/commit/a1d308ea078786b27bf7ec940d018fc657d4c398))
|
||||
* new logic for -fc suffix. Closes [#63](https://git.datacontroller.io/dc/dc/issues/63) ([5579db0](https://git.datacontroller.io/dc/dc/commit/5579db0eafc668b1bc310099b7cc3062e0598fc4))
|
||||
|
||||
## [6.2.7](https://git.datacontroller.io/dc/dc/compare/v6.2.6...v6.2.7) (2023-11-09)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **audit:** updated crypto-js (hashing rows in dynamic cell validation) ([a7aa42a](https://git.datacontroller.io/dc/dc/commit/a7aa42a59b71597399924b8d2d06010c806321f3))
|
||||
* missing dependency and avoiding label length limit issue ([91f128c](https://git.datacontroller.io/dc/dc/commit/91f128c2fead1e4f72267d689e67f49ec9a2ab35))
|
||||
|
||||
## [6.2.6](https://git.datacontroller.io/dc/dc/compare/v6.2.5...v6.2.6) (2023-10-18)
|
||||
|
||||
|
||||
|
@ -28,3 +28,5 @@ For more information:
|
||||
* Main site: https://datacontroller.io
|
||||
* Docs: https://docs.datacontroller.io
|
||||
* Code: https://code.datacontroller.io
|
||||
|
||||
For support, contact support@4gl.io or reach out on [Matrix](https://matrix.to/#/#dc:4gl.io)!
|
@ -45,6 +45,7 @@
|
||||
"numbro",
|
||||
"@clr/icons",
|
||||
"@sasjs/adapter",
|
||||
"@sasjs/utils/types/serverType",
|
||||
"@sasjs/utils/input/validators",
|
||||
"@sasjs/utils/utils/bytesToSize",
|
||||
"base64-arraybuffer",
|
||||
@ -67,9 +68,9 @@
|
||||
"src/styles.scss"
|
||||
],
|
||||
"scripts": [
|
||||
"node_modules/@clr/icons/clr-icons.min.js",
|
||||
"node_modules/marked/marked.min.js"
|
||||
]
|
||||
],
|
||||
"webWorkerTsConfig": "tsconfig.worker.json"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
@ -116,10 +117,10 @@
|
||||
"builder": "@angular-devkit/build-angular:dev-server",
|
||||
"configurations": {
|
||||
"production": {
|
||||
"browserTarget": "datacontroller:build:production"
|
||||
"buildTarget": "datacontroller:build:production"
|
||||
},
|
||||
"development": {
|
||||
"browserTarget": "datacontroller:build:development"
|
||||
"buildTarget": "datacontroller:build:development"
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": "development"
|
||||
@ -127,31 +128,29 @@
|
||||
"extract-i18n": {
|
||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||
"options": {
|
||||
"browserTarget": "datacontroller:build"
|
||||
"buildTarget": "datacontroller:build"
|
||||
}
|
||||
},
|
||||
"test": {
|
||||
"builder": "@angular-devkit/build-angular:karma",
|
||||
"options": {
|
||||
"tsConfig": "tsconfig.spec.json",
|
||||
"inlineStyleLanguage": "scss",
|
||||
"codeCoverage": true,
|
||||
"polyfills": [
|
||||
"src/polyfills.ts",
|
||||
"zone.js",
|
||||
"zone.js/testing"
|
||||
],
|
||||
"styles": [
|
||||
"src/styles.scss"
|
||||
],
|
||||
"scripts": [
|
||||
|
||||
],
|
||||
"tsConfig": "tsconfig.spec.json",
|
||||
"inlineStyleLanguage": "scss",
|
||||
"assets": [
|
||||
"src/favicon.ico",
|
||||
"src/assets"
|
||||
],
|
||||
"karmaConfig": "karma.conf.js"
|
||||
"styles": [
|
||||
"src/styles.scss"
|
||||
],
|
||||
"scripts": [],
|
||||
"karmaConfig": "karma.conf.js",
|
||||
"webWorkerTsConfig": "tsconfig.worker.json"
|
||||
}
|
||||
},
|
||||
"lint": {
|
||||
|
@ -9,6 +9,8 @@ export default defineConfig({
|
||||
html: true,
|
||||
json: false,
|
||||
},
|
||||
viewportHeight: 900,
|
||||
viewportWidth: 1600,
|
||||
|
||||
chromeWebSecurity: false,
|
||||
defaultCommandTimeout: 30000,
|
||||
|
@ -15,9 +15,6 @@ context('editor tests: ', function () {
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
})
|
||||
@ -118,10 +115,6 @@ context('editor tests: ', function () {
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
this.afterEach(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
})
|
||||
|
||||
const clickOnEdit = (callback?: any) => {
|
||||
@ -221,13 +214,13 @@ const submitExcel = (callback?: any) => {
|
||||
|
||||
const rejectExcel = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
.includes('approve')
|
||||
) {
|
||||
approvalButton.click()
|
||||
break
|
||||
|
228
client/cypress/e2e/excel-multi-load.cy.ts
Normal file
228
client/cypress/e2e/excel-multi-load.cy.ts
Normal file
@ -0,0 +1,228 @@
|
||||
import { Callbacks } from 'cypress/types/jquery/index'
|
||||
|
||||
const username = Cypress.env('username')
|
||||
const password = Cypress.env('password')
|
||||
const hostUrl = Cypress.env('hosturl')
|
||||
const appLocation = Cypress.env('appLocation')
|
||||
const longerCommandTimeout = Cypress.env('longerCommandTimeout')
|
||||
const serverType = Cypress.env('serverType')
|
||||
const libraryToOpenIncludes = Cypress.env(`libraryToOpenIncludes_${serverType}`)
|
||||
const fixturePath = 'excels_multi_load/'
|
||||
|
||||
const library = 'DC996664'
|
||||
const mpeXTestTable = 'MPE_X_TEST'
|
||||
const mpeTablesTable = 'MPE_TABLES'
|
||||
|
||||
context('excel multi load tests: ', function () {
|
||||
this.beforeAll(() => {
|
||||
cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
cy.loginAndUpdateValidKey(true)
|
||||
})
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
|
||||
visitPage('home/multi-load')
|
||||
|
||||
colorLog(
|
||||
`TEST START ---> ${
|
||||
Cypress.mocha.getRunner().suite.ctx.currentTest.title
|
||||
}`,
|
||||
'#3498DB'
|
||||
)
|
||||
})
|
||||
|
||||
it('1 | Uploads Excel file with multiple sheets, 3 sheets including data, 2 sheets matched with dataset', (done) => {
|
||||
attachExcelFile('multi_load_test_2.xlsx', () => {
|
||||
checkHotUserDatasetTable('hotTableUserDataset', [
|
||||
[library, mpeXTestTable],
|
||||
[library, mpeTablesTable]
|
||||
], () => {
|
||||
cy.get('#continue-btn').trigger('click').then(() => {
|
||||
checkIfTreeHasTables([`${library}.${mpeXTestTable}`, `${library}.${mpeTablesTable}`], undefined, (includes: boolean) => {
|
||||
if (includes) {
|
||||
// MPE_TABLES sheet does not have data so 1 error image must be shown
|
||||
hasErrorTables(1, (valid: boolean) => {
|
||||
if (valid) done()
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('2 | Uploads Excel file with multiple sheets, 2 sheets matched with dataset, 1 matched sheet does not have data', (done) => {
|
||||
attachExcelFile('multi_load_test_1.xlsx', () => {
|
||||
checkHotUserDatasetTable('hotTableUserDataset', [
|
||||
[library, mpeXTestTable],
|
||||
[library, mpeTablesTable]
|
||||
], () => {
|
||||
cy.get('#continue-btn').trigger('click').then(() => {
|
||||
checkIfTreeHasTables([`${library}.${mpeXTestTable}`, `${library}.${mpeTablesTable}`], `${library}.${mpeXTestTable}`, (includes: boolean) => {
|
||||
if (includes) {
|
||||
cy.get('#hotTable').should('be.visible').then(() => {
|
||||
checkHotUserDatasetTable('hotTable', [
|
||||
['No', '1', 'more dummy data'],
|
||||
['No', '1', 'It was a dark and stormy night. The wind was blowing a gale! The captain said to his mate - mate, tell us a tale. And this, is the tale he told: It was a dark and stormy night. The wind was blowing a gale! The captain said to his mate - mate, tell us a tale. And this, is the tale he told: It was a dark and stormy night. The wind was blowing a gale! The captain said to his mate - mate, tell us a tale. And this, is the tale he told: It was a dark and stormy night. The wind was blowing a gale! The captain said to his mate - mate, tell us a tale. And this, is the tale he told:'],
|
||||
['No', '1', 'if you can fill the unforgiving minute']
|
||||
], () => {
|
||||
submitTables()
|
||||
|
||||
hasSuccessSubmits(2, (valid: boolean) => {
|
||||
if (valid) done()
|
||||
})
|
||||
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('3 | Uploads Excel file with multiple sheets, 1 sheets has 2 tables', (done) => {
|
||||
attachExcelFile('multi_load_test_1.xlsx', () => {
|
||||
checkHotUserDatasetTable('hotTableUserDataset', [
|
||||
[library, mpeXTestTable],
|
||||
[library, mpeTablesTable]
|
||||
], () => {
|
||||
cy.get('#continue-btn').trigger('click').then(() => {
|
||||
checkIfTreeHasTables([`${library}.${mpeXTestTable}`, `${library}.${mpeTablesTable}`], `${library}.${mpeXTestTable}`, (includes: boolean) => {
|
||||
if (includes) {
|
||||
cy.get('#hotTable').should('be.visible').then(() => {
|
||||
checkHotUserDatasetTable('hotTable', [
|
||||
['No', '1', 'more dummy data'],
|
||||
['No', '1', 'It was a dark and stormy night. The wind was blowing a gale! The captain said to his mate - mate, tell us a tale. And this, is the tale he told: It was a dark and stormy night. The wind was blowing a gale! The captain said to his mate - mate, tell us a tale. And this, is the tale he told: It was a dark and stormy night. The wind was blowing a gale! The captain said to his mate - mate, tell us a tale. And this, is the tale he told: It was a dark and stormy night. The wind was blowing a gale! The captain said to his mate - mate, tell us a tale. And this, is the tale he told:'],
|
||||
['No', '1', 'if you can fill the unforgiving minute']
|
||||
], () => {
|
||||
clickOnTreeNode('DC996664.MPE_TABLES', () => {
|
||||
cy.wait(1000).then(() => {
|
||||
cy.get('#hotTable').should('be.visible').then(() => {
|
||||
checkHotUserDatasetTable('hotTable', [
|
||||
['No', 'DC914286', 'MPE_COLUMN_LEVEL_SECURITY'],
|
||||
['No', 'DC914286', 'MPE_XLMAP_INFO'],
|
||||
['No', 'DC914286', 'MPE_XLMAP_RULES']
|
||||
], () => {
|
||||
submitTables()
|
||||
|
||||
hasSuccessSubmits(2, (valid: boolean) => {
|
||||
if (valid) done()
|
||||
})
|
||||
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
this.afterEach(() => {
|
||||
colorLog(`TEST END -------------`, '#3498DB')
|
||||
})
|
||||
})
|
||||
|
||||
const attachExcelFile = (excelFilename: string, callback?: any) => {
|
||||
cy.get('#browse-file')
|
||||
.should('exist')
|
||||
.click()
|
||||
.then(() => {
|
||||
cy.get('input[type="file"]#file-upload')
|
||||
.attachFile(`/${fixturePath}/${excelFilename}`)
|
||||
.then(() => {
|
||||
if (callback) callback()
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
const checkHotUserDatasetTable = (hotId: string, dataToContain: any[][], callback?: () => void) => {
|
||||
cy.get(`#${hotId}`, { timeout: longerCommandTimeout })
|
||||
.find('div.ht_master.handsontable')
|
||||
.find('div.wtHolder')
|
||||
.find('div.wtHider')
|
||||
.find('div.wtSpreader')
|
||||
.find('table.htCore')
|
||||
.find('tbody')
|
||||
.then((data) => {
|
||||
cy.wait(2000).then(() => {
|
||||
for (let rowI = 0; rowI < dataToContain.length; rowI++) {
|
||||
for (let colI = 0; colI < dataToContain[rowI].length; colI++) {
|
||||
expect(data[0].children[rowI].children[colI]).to.contain(dataToContain[rowI][colI])
|
||||
}
|
||||
}
|
||||
|
||||
if (callback) callback()
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
const clickOnTreeNode = (clickOnNode: string, callback?: () => void) => {
|
||||
cy.get('.nav-tree clr-tree > clr-tree-node').then((treeNodes: any) => {
|
||||
for (let node of treeNodes) {
|
||||
if (node.innerText.toUpperCase().trim().includes(clickOnNode)) {
|
||||
cy.get(node).trigger('click')
|
||||
if (callback) callback()
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const checkIfTreeHasTables = (tables: string[], clickOnNode?: string, callback?: (includes: boolean) => void) => {
|
||||
cy.get('.nav-tree clr-tree > clr-tree-node').then((treeNodes: any) => {
|
||||
let datasets = tables
|
||||
let nodesCorrect = true
|
||||
let nodeToClick
|
||||
|
||||
for (let node of treeNodes) {
|
||||
if (!datasets.includes(node.innerText.toUpperCase().trim())) {
|
||||
nodesCorrect = false
|
||||
}
|
||||
|
||||
if (clickOnNode) {
|
||||
if (node.innerText.toUpperCase().trim().includes(clickOnNode)) {
|
||||
nodeToClick = node
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (nodeToClick) {
|
||||
cy.wait(1000)
|
||||
cy.get(nodeToClick).trigger('click')
|
||||
}
|
||||
|
||||
if (callback) callback(nodesCorrect)
|
||||
})
|
||||
}
|
||||
|
||||
const submitTables = () => {
|
||||
cy.get('#submit-all').trigger('click')
|
||||
cy.get('#submit-tables').trigger('click')
|
||||
cy.wait(1000)
|
||||
}
|
||||
|
||||
const hasSuccessSubmits = (expectedNoOfSubmits: number, callback: (valid: boolean) => void) => {
|
||||
cy.get('.nav-tree clr-tree > clr-tree-node cds-icon[status="success"]').should('be.visible').then(($nodes) => {
|
||||
callback(expectedNoOfSubmits === $nodes.length)
|
||||
})
|
||||
}
|
||||
|
||||
const hasErrorTables = (expectedNoOfErrors: number, callback: (valid: boolean) => void) => {
|
||||
cy.get('.nav-tree clr-tree > clr-tree-node cds-icon[status="danger"]').should('be.visible').then(($nodes) => {
|
||||
callback(expectedNoOfErrors === $nodes.length)
|
||||
})
|
||||
}
|
||||
|
||||
const visitPage = (url: string) => {
|
||||
cy.visit(`${hostUrl}${appLocation}/#/${url}`)
|
||||
}
|
||||
|
||||
const colorLog = (msg: string, color: string) => {
|
||||
console.log('%c' + msg, 'color:' + color + ';font-weight:bold;')
|
||||
}
|
@ -17,9 +17,6 @@ context('excel tests: ', function () {
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
|
||||
@ -112,13 +109,8 @@ context('excel tests: ', function () {
|
||||
openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
|
||||
|
||||
attachExcelFile('duplicate_column_excel.xlsx', () => {
|
||||
cy.get('.abortMsg', { timeout: longerCommandTimeout })
|
||||
.should('exist')
|
||||
.then((elements: any) => {
|
||||
if (elements[0]) {
|
||||
if (elements[0].innerText.toLowerCase().includes('missing')) done()
|
||||
}
|
||||
})
|
||||
submitExcel()
|
||||
rejectExcel(done)
|
||||
})
|
||||
})
|
||||
|
||||
@ -337,7 +329,6 @@ context('excel tests: ', function () {
|
||||
|
||||
this.afterEach(() => {
|
||||
colorLog(`TEST END -------------`, '#3498DB')
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
})
|
||||
|
||||
@ -405,13 +396,13 @@ const submitExcel = (callback?: any) => {
|
||||
|
||||
const rejectExcel = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
.includes('approve')
|
||||
) {
|
||||
approvalButton.click()
|
||||
break
|
||||
@ -438,13 +429,13 @@ const rejectExcel = (callback?: any) => {
|
||||
|
||||
const acceptExcel = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
.includes('approve')
|
||||
) {
|
||||
approvalButton.click()
|
||||
break
|
||||
|
@ -15,9 +15,7 @@ context('filtering tests: ', function () {
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation, { timeout: longerCommandTimeout })
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
|
||||
visitPage('home')
|
||||
})
|
||||
@ -159,24 +157,21 @@ context('filtering tests: ', function () {
|
||||
})
|
||||
})
|
||||
|
||||
it('7 | filter bestnum field BETWEEN', (done) => {
|
||||
openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
|
||||
// TODO: fix
|
||||
// it('7 | filter bestnum field BETWEEN', (done) => {
|
||||
// openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
|
||||
|
||||
openFilterPopup(() => {
|
||||
setFilterWithValue('SOME_BESTNUM', '0-10', 'between', () => {
|
||||
checkInfoBarIncludes(
|
||||
`AND,AND,0,SOME_BESTNUM,BETWEEN,0 AND 10`,
|
||||
(includes: boolean) => {
|
||||
if (includes) done()
|
||||
}
|
||||
)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
this.afterEach(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
// openFilterPopup(() => {
|
||||
// setFilterWithValue('SOME_BESTNUM', '0-10', 'between', () => {
|
||||
// checkInfoBarIncludes(
|
||||
// `AND,AND,0,SOME_BESTNUM,BETWEEN,0 AND 10`,
|
||||
// (includes: boolean) => {
|
||||
// if (includes) done()
|
||||
// }
|
||||
// )
|
||||
// })
|
||||
// })
|
||||
// })
|
||||
})
|
||||
|
||||
const checkInfoBarIncludes = (text: string, callback: any) => {
|
||||
|
@ -23,15 +23,12 @@ interface EditConfigTableCells {
|
||||
|
||||
context('licensing tests: ', function () {
|
||||
this.beforeAll(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
|
||||
cy.loginAndUpdateValidKey()
|
||||
})
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
})
|
||||
@ -375,9 +372,7 @@ context('licensing tests: ', function () {
|
||||
})
|
||||
}
|
||||
|
||||
this.afterEach(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
const logout = (callback?: any) => {
|
||||
@ -699,13 +694,13 @@ const submitTable = (callback?: any) => {
|
||||
|
||||
const approveTable = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
.includes('approve')
|
||||
) {
|
||||
approvalButton.click()
|
||||
break
|
||||
|
@ -18,9 +18,6 @@ context('liveness tests: ', function () {
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
})
|
||||
@ -125,13 +122,13 @@ const submitExcel = (callback?: any) => {
|
||||
|
||||
const rejectExcel = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
.includes('approve')
|
||||
) {
|
||||
approvalButton.click()
|
||||
break
|
||||
|
@ -16,7 +16,6 @@ context('editor tests: ', function () {
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
|
||||
cy.wait(2000)
|
||||
|
||||
cy.get('body').then(($body) => {
|
||||
@ -393,10 +392,6 @@ context('editor tests: ', function () {
|
||||
// }
|
||||
// )
|
||||
// })
|
||||
|
||||
this.afterEach(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
})
|
||||
|
||||
const removeAllColumns = () => {
|
||||
|
BIN
client/cypress/fixtures/excels_multi_load/multi_load_test_1.xlsx
Normal file
BIN
client/cypress/fixtures/excels_multi_load/multi_load_test_1.xlsx
Normal file
Binary file not shown.
BIN
client/cypress/fixtures/excels_multi_load/multi_load_test_2.xlsx
Normal file
BIN
client/cypress/fixtures/excels_multi_load/multi_load_test_2.xlsx
Normal file
Binary file not shown.
BIN
client/cypress/fixtures/excels_multi_load/multi_load_test_3.xlsx
Normal file
BIN
client/cypress/fixtures/excels_multi_load/multi_load_test_3.xlsx
Normal file
Binary file not shown.
@ -15,9 +15,6 @@ context('editor tests: ', function () {
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
})
|
||||
@ -118,10 +115,6 @@ context('editor tests: ', function () {
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
this.afterEach(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
})
|
||||
|
||||
const clickOnEdit = (callback?: any) => {
|
||||
@ -221,14 +214,10 @@ const submitExcel = (callback?: any) => {
|
||||
|
||||
const rejectExcel = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
) {
|
||||
if (approvalButton.innerText.toLowerCase().includes('approve')) {
|
||||
approvalButton.click()
|
||||
break
|
||||
}
|
||||
|
@ -19,9 +19,6 @@ context('excel tests: ', function () {
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
|
||||
@ -339,7 +336,6 @@ context('excel tests: ', function () {
|
||||
|
||||
this.afterEach(() => {
|
||||
colorLog(`TEST END -------------`, '#3498DB')
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
})
|
||||
|
||||
@ -407,14 +403,10 @@ const submitExcel = (callback?: any) => {
|
||||
|
||||
const rejectExcel = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
) {
|
||||
if (approvalButton.innerText.toLowerCase().includes('approve')) {
|
||||
approvalButton.click()
|
||||
break
|
||||
}
|
||||
@ -440,14 +432,10 @@ const rejectExcel = (callback?: any) => {
|
||||
|
||||
const acceptExcel = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
) {
|
||||
if (approvalButton.innerText.toLowerCase().includes('approve')) {
|
||||
approvalButton.click()
|
||||
break
|
||||
}
|
||||
|
@ -15,9 +15,6 @@ context('filtering tests: ', function () {
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation, { timeout: longerCommandTimeout })
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
})
|
||||
@ -173,10 +170,6 @@ context('filtering tests: ', function () {
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
this.afterEach(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
})
|
||||
|
||||
const checkInfoBarIncludes = (text: string, callback: any) => {
|
||||
|
@ -23,15 +23,11 @@ interface EditConfigTableCells {
|
||||
|
||||
context('licensing tests: ', function () {
|
||||
this.beforeAll(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
cy.loginAndUpdateValidKey()
|
||||
})
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
})
|
||||
@ -374,10 +370,6 @@ context('licensing tests: ', function () {
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
this.afterEach(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
})
|
||||
|
||||
const logout = (callback?: any) => {
|
||||
@ -699,14 +691,10 @@ const submitTable = (callback?: any) => {
|
||||
|
||||
const approveTable = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
) {
|
||||
if (approvalButton.innerText.toLowerCase().includes('approve')) {
|
||||
approvalButton.click()
|
||||
break
|
||||
}
|
||||
|
@ -18,10 +18,6 @@ context('liveness tests: ', function () {
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
|
||||
// cy.get('input.username').type(username)
|
||||
// cy.get('input.password').type(password)
|
||||
// cy.get('.login-group button').click()
|
||||
|
||||
visitPage('home')
|
||||
})
|
||||
|
||||
@ -125,14 +121,10 @@ const submitExcel = (callback?: any) => {
|
||||
|
||||
const rejectExcel = (callback?: any) => {
|
||||
cy.get('button', { timeout: longerCommandTimeout })
|
||||
.should('contain', 'Go to approvals screen')
|
||||
.should('contain', 'Approve')
|
||||
.then((allButtons: any) => {
|
||||
for (let approvalButton of allButtons) {
|
||||
if (
|
||||
approvalButton.innerText
|
||||
.toLowerCase()
|
||||
.includes('go to approvals screen')
|
||||
) {
|
||||
if (approvalButton.innerText.toLowerCase().includes('approve')) {
|
||||
approvalButton.click()
|
||||
break
|
||||
}
|
||||
|
@ -17,7 +17,6 @@ context('editor tests: ', function () {
|
||||
|
||||
this.beforeEach(() => {
|
||||
cy.visit(hostUrl + appLocation)
|
||||
|
||||
cy.wait(2000)
|
||||
|
||||
cy.get('body').then(($body) => {
|
||||
@ -386,10 +385,6 @@ context('editor tests: ', function () {
|
||||
}
|
||||
)
|
||||
})
|
||||
|
||||
this.afterEach(() => {
|
||||
// cy.visit(`${hostUrl}/SASLogon/logout`)
|
||||
})
|
||||
})
|
||||
|
||||
const checkColumns = (columns: string[], callback: () => void) => {
|
||||
|
BIN
client/libraries/sheet-crypto.tgz.gpg
Normal file
BIN
client/libraries/sheet-crypto.tgz.gpg
Normal file
Binary file not shown.
@ -10,7 +10,7 @@ const check = (cwd) => {
|
||||
onlyAllow:
|
||||
'AFLv2.1;Apache 2.0;Apache-2.0;Apache*;Artistic-2.0;0BSD;BSD*;BSD-2-Clause;BSD-3-Clause;CC0-1.0;CC-BY-3.0;CC-BY-4.0;ISC;MIT;MPL-2.0;ODC-By-1.0;Python-2.0;Unlicense;',
|
||||
excludePackages:
|
||||
'@cds/city@1.1.0;@handsontable/angular@13.1.0;handsontable@13.1.0;hyperformula@2.5.0;jackspeak@2.2.0;path-scurry@1.7.0'
|
||||
'@cds/city@1.1.0;@handsontable/angular@14.4.0;handsontable@14.4.0;hyperformula@2.7.0;jackspeak@2.2.0;path-scurry@1.7.0'
|
||||
},
|
||||
(error, json) => {
|
||||
if (error) {
|
||||
|
25797
client/package-lock.json
generated
25797
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -18,8 +18,8 @@
|
||||
"deploy_sasjs": "rsync -avhe ssh ./dist/* --delete root@${npm_config_account}.4gl.io:/var/www/html/dc/dev",
|
||||
"viyabuild": "cd build; ./viyabuild.sh",
|
||||
"lint": "cd .. && npm run lint",
|
||||
"test": "ng test",
|
||||
"test:headless": "ng test --browsers ChromeHeadless",
|
||||
"test": "npx ng test",
|
||||
"test:headless": "npx ng test --no-watch --no-progress --browsers ChromeHeadlessCI",
|
||||
"watch": "ng test watch=true",
|
||||
"pree2e": "webdriver-manager update",
|
||||
"e2e": "protractor protractor.config.js",
|
||||
@ -35,32 +35,32 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^16.1.2",
|
||||
"@angular/cdk": "^15.2.0",
|
||||
"@angular/common": "^16.1.2",
|
||||
"@angular/compiler": "^16.1.2",
|
||||
"@angular/core": "^16.1.2",
|
||||
"@angular/forms": "^16.1.2",
|
||||
"@angular/platform-browser": "^16.1.2",
|
||||
"@angular/platform-browser-dynamic": "^16.1.2",
|
||||
"@angular/router": "^16.1.2",
|
||||
"@cds/core": "^6.4.2",
|
||||
"@clr/angular": "^13.17.0",
|
||||
"@angular/animations": "^17.3.3",
|
||||
"@angular/cdk": "^17.3.3",
|
||||
"@angular/common": "^17.3.3",
|
||||
"@angular/compiler": "^17.3.3",
|
||||
"@angular/core": "^17.3.3",
|
||||
"@angular/forms": "^17.3.3",
|
||||
"@angular/platform-browser": "^17.3.3",
|
||||
"@angular/platform-browser-dynamic": "^17.3.3",
|
||||
"@angular/router": "^17.3.3",
|
||||
"@cds/core": "^6.10.0",
|
||||
"@clr/angular": "^17.0.1",
|
||||
"@clr/icons": "^13.0.2",
|
||||
"@clr/ui": "^13.17.0",
|
||||
"@handsontable/angular": "^13.1.0",
|
||||
"@sasjs/adapter": "4.10.1",
|
||||
"@clr/ui": "^17.0.1",
|
||||
"@handsontable/angular": "^14.3.0",
|
||||
"@sasjs/adapter": "4.10.2",
|
||||
"@sasjs/utils": "^3.4.0",
|
||||
"@sheet/crypto": "1.20211122.1",
|
||||
"@sheet/crypto": "file:libraries/sheet-crypto.tgz",
|
||||
"@types/d3-graphviz": "^2.6.7",
|
||||
"@types/text-encoding": "0.0.35",
|
||||
"base64-arraybuffer": "^0.2.0",
|
||||
"buffer": "^5.4.3",
|
||||
"crypto-browserify": "3.12.0",
|
||||
"crypto-js": "^3.3.0",
|
||||
"crypto-js": "^4.2.0",
|
||||
"d3-graphviz": "^5.0.2",
|
||||
"fs-extra": "^7.0.1",
|
||||
"handsontable": "^13.1.0",
|
||||
"handsontable": "^14.3.0",
|
||||
"https-browserify": "1.0.0",
|
||||
"hyperformula": "^2.5.0",
|
||||
"iconv-lite": "^0.5.0",
|
||||
@ -78,24 +78,27 @@
|
||||
"stream-http": "3.2.0",
|
||||
"text-encoding": "^0.7.0",
|
||||
"tslib": "^2.3.0",
|
||||
"zone.js": "~0.13.0"
|
||||
"vm": "^0.1.0",
|
||||
"webpack": "^5.91.0",
|
||||
"xlsx": "^0.18.5",
|
||||
"zone.js": "~0.14.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "^16.1.0",
|
||||
"@angular-eslint/builder": "16.0.3",
|
||||
"@angular-eslint/eslint-plugin": "16.0.3",
|
||||
"@angular-eslint/eslint-plugin-template": "16.0.3",
|
||||
"@angular-eslint/schematics": "16.0.3",
|
||||
"@angular-eslint/template-parser": "16.0.3",
|
||||
"@angular/cli": "^16.1.0",
|
||||
"@angular/compiler-cli": "^16.1.2",
|
||||
"@angular-devkit/build-angular": "^17.3.3",
|
||||
"@angular-eslint/builder": "17.3.0",
|
||||
"@angular-eslint/eslint-plugin": "17.3.0",
|
||||
"@angular-eslint/eslint-plugin-template": "17.3.0",
|
||||
"@angular-eslint/schematics": "17.3.0",
|
||||
"@angular-eslint/template-parser": "17.3.0",
|
||||
"@angular/cli": "^17.3.3",
|
||||
"@angular/compiler-cli": "^17.3.3",
|
||||
"@babel/plugin-proposal-private-methods": "^7.18.6",
|
||||
"@compodoc/compodoc": "^1.1.21",
|
||||
"@cypress/webpack-preprocessor": "^5.17.1",
|
||||
"@types/core-js": "^2.5.5",
|
||||
"@types/crypto-js": "^4.0.1",
|
||||
"@types/crypto-js": "^4.2.1",
|
||||
"@types/es6-shim": "^0.31.39",
|
||||
"@types/jasmine": "~3.6.0",
|
||||
"@types/jasmine": "~5.1.4",
|
||||
"@types/lodash-es": "^4.17.3",
|
||||
"@types/marked": "^4.3.0",
|
||||
"@types/node": "12.20.50",
|
||||
@ -109,12 +112,12 @@
|
||||
"es6-shim": "^0.35.5",
|
||||
"eslint": "^8.33.0",
|
||||
"git-describe": "^4.0.4",
|
||||
"jasmine-core": "~3.6.0",
|
||||
"karma": "~6.3.0",
|
||||
"karma-chrome-launcher": "~3.1.0",
|
||||
"karma-coverage": "~2.1.0",
|
||||
"karma-jasmine": "~4.0.0",
|
||||
"karma-jasmine-html-reporter": "~1.7.0",
|
||||
"jasmine-core": "~5.1.2",
|
||||
"karma": "~6.4.3",
|
||||
"karma-chrome-launcher": "~3.2.0",
|
||||
"karma-coverage": "~2.2.1",
|
||||
"karma-jasmine": "~5.1.0",
|
||||
"karma-jasmine-html-reporter": "~2.1.0",
|
||||
"license-checker": "25.0.1",
|
||||
"lodash-es": "^4.17.21",
|
||||
"mochawesome": "^7.1.3",
|
||||
@ -123,9 +126,7 @@
|
||||
"rimraf": "3.0.2",
|
||||
"ts-loader": "^9.2.8",
|
||||
"ts-node": "^3.3.0",
|
||||
"typedoc": "^0.24.8",
|
||||
"typedoc-plugin-external-module-name": "^4.0.6",
|
||||
"typescript": "~4.9.4",
|
||||
"typescript": "~5.4.4",
|
||||
"wait-on": "^6.0.1",
|
||||
"watch": "^1.0.2"
|
||||
}
|
||||
|
@ -37,6 +37,16 @@ export const initFilter: { filter: FilterCache } = {
|
||||
}
|
||||
}
|
||||
|
||||
export interface XLMapListItem {
|
||||
id: string
|
||||
description: string
|
||||
targetDS: string
|
||||
}
|
||||
|
||||
export interface HandsontableStaticConfig {
|
||||
darkTableHeaderClass: string
|
||||
}
|
||||
|
||||
/**
|
||||
* Cached filtering values across whole app (editor, viewer, viewboxes)
|
||||
* Cached lineage libraries, tables
|
||||
@ -46,6 +56,8 @@ export const initFilter: { filter: FilterCache } = {
|
||||
*/
|
||||
export const globals: {
|
||||
rootParam: string
|
||||
dcLib: string
|
||||
xlmaps: XLMapListItem[]
|
||||
editor: any
|
||||
viewer: any
|
||||
viewboxes: ViewboxCache
|
||||
@ -54,14 +66,17 @@ export const globals: {
|
||||
viyaApi: any
|
||||
usernav: any
|
||||
operators: any
|
||||
handsontable: HandsontableStaticConfig
|
||||
[key: string]: any
|
||||
} = {
|
||||
rootParam: <string>'',
|
||||
dcLib: '',
|
||||
xlmaps: [],
|
||||
editor: {
|
||||
startupSet: <boolean>false,
|
||||
treeNodeLibraries: <any[] | null>[],
|
||||
libsAndTables: <any[]>[],
|
||||
libraries: <String[] | undefined>[],
|
||||
libraries: <string[] | undefined>[],
|
||||
library: <string>'',
|
||||
table: <string>'',
|
||||
filter: <FilterCache>{
|
||||
@ -130,5 +145,8 @@ export const globals: {
|
||||
operators: {
|
||||
numOperators: ['=', '<', '>', '<=', '>=', 'BETWEEN', 'IN', 'NOT IN', 'NE'],
|
||||
charOperators: ['=', '<', '>', '<=', '>=', 'CONTAINS', 'IN', 'NOT IN', 'NE']
|
||||
},
|
||||
handsontable: {
|
||||
darkTableHeaderClass: 'darkTH'
|
||||
}
|
||||
}
|
||||
|
@ -12,7 +12,7 @@
|
||||
<div class="alert-items">
|
||||
<div class="alert-item static">
|
||||
<div class="alert-icon-wrapper">
|
||||
<clr-icon class="mt-2" shape="warning-standard"></clr-icon>
|
||||
<cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
|
||||
</div>
|
||||
<div class="alert-text">
|
||||
Data Controller (FREE Tier) - to upgrade contact
|
||||
@ -30,7 +30,7 @@
|
||||
<div class="alert-items">
|
||||
<div class="alert-item static">
|
||||
<div class="alert-icon-wrapper">
|
||||
<clr-icon class="mt-2" shape="warning-standard"></clr-icon>
|
||||
<cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
|
||||
</div>
|
||||
<div class="alert-text">
|
||||
Data Controller (FREE Tier) - Problem with licence
|
||||
@ -55,7 +55,7 @@
|
||||
<div class="alert-items">
|
||||
<div class="alert-item static">
|
||||
<div class="alert-icon-wrapper">
|
||||
<clr-icon class="mt-2" shape="warning-standard"></clr-icon>
|
||||
<cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
|
||||
</div>
|
||||
|
||||
<div class="alert-text">
|
||||
@ -85,7 +85,7 @@
|
||||
<div class="alert-items">
|
||||
<div class="alert-item static">
|
||||
<div class="alert-icon-wrapper">
|
||||
<clr-icon class="mt-2" shape="warning-standard"></clr-icon>
|
||||
<cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
|
||||
</div>
|
||||
|
||||
<div class="alert-text">
|
||||
@ -168,7 +168,7 @@
|
||||
</button>
|
||||
<clr-dropdown-menu *clrIfOpen clrPosition="bottom-left">
|
||||
<a [routerLink]="['/view']" clrDropdownItem>VIEW</a>
|
||||
<a [routerLink]="['/home']" clrDropdownItem>EDIT</a>
|
||||
<a [routerLink]="['/home']" clrDropdownItem>LOAD</a>
|
||||
<a [routerLink]="['/review/submitted']" clrDropdownItem>REVIEW</a>
|
||||
</clr-dropdown-menu>
|
||||
</clr-dropdown>
|
||||
@ -189,7 +189,7 @@
|
||||
router.url.includes('edit-record') ||
|
||||
router.url.includes('home')
|
||||
"
|
||||
>EDIT</a
|
||||
>LOAD</a
|
||||
>
|
||||
<a
|
||||
[routerLink]="['/review/submitted']"
|
||||
@ -204,14 +204,7 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<div class="header-actions">
|
||||
<div class="nav-text">
|
||||
<app-loading-indicator></app-loading-indicator>
|
||||
</div>
|
||||
<div class="dropdown">
|
||||
<app-user-nav-dropdown></app-user-nav-dropdown>
|
||||
</div>
|
||||
</div>
|
||||
<app-header-actions></app-header-actions>
|
||||
</header>
|
||||
<nav
|
||||
*ngIf="
|
||||
@ -252,6 +245,7 @@
|
||||
|
||||
<app-alerts *ngIf="!errTop"></app-alerts>
|
||||
<app-requests-modal [(opened)]="requestsModal"></app-requests-modal>
|
||||
<app-excel-password-modal></app-excel-password-modal>
|
||||
|
||||
<!-- <app-terms *ngIf="showRegistration"></app-terms> -->
|
||||
|
||||
|
@ -1,3 +1,5 @@
|
||||
@import '../colors.scss';
|
||||
|
||||
// Copyright (c) 2016 VMware, Inc. All Rights Reserved.
|
||||
// This software is released under MIT license.
|
||||
// The full license information can be found in LICENSE in the root directory of this project.
|
||||
@ -6,7 +8,7 @@ app-requests-modal {
|
||||
}
|
||||
|
||||
header.app-header {
|
||||
background: #314351 !important;
|
||||
background: $headerBackground !important;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
@ -42,7 +44,7 @@ header.app-header {
|
||||
align-items: center;
|
||||
padding: 30px;
|
||||
z-index: 110;
|
||||
background: #314351;
|
||||
background: $headerBackground;
|
||||
|
||||
.expired-notice {
|
||||
color: #e0e0e0;
|
||||
@ -91,33 +93,12 @@ header {
|
||||
}
|
||||
}
|
||||
|
||||
.nav
|
||||
.nav-link {
|
||||
color: #fafafa;
|
||||
opacity: .9;
|
||||
line-height: 1.45rem;
|
||||
}
|
||||
|
||||
.nav .nav-link:hover {
|
||||
box-shadow: inset 0 -3px 0 transparent;
|
||||
transition: box-shadow .2s ease-in;
|
||||
}
|
||||
|
||||
.nav
|
||||
.nav-link:hover {
|
||||
.nav-link:hover {
|
||||
color: #fafafa;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.nav .nav-link.active {
|
||||
background: #61717D;
|
||||
opacity: 1;
|
||||
box-shadow: inset 0 -3px transparent;
|
||||
// padding: 0 1rem 0 1rem;
|
||||
}
|
||||
|
||||
.nav .nav-item {
|
||||
margin-right: 1rem;
|
||||
.nav-link.active {
|
||||
background: #61717D;
|
||||
}
|
||||
}
|
||||
|
||||
@ -127,15 +108,6 @@ header {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.btn.btn-success {
|
||||
border-color: #62a420;
|
||||
background-color: #16a57a!important;
|
||||
color: #fff;
|
||||
}
|
||||
.btn.btn-success:hover {
|
||||
background-color: #2add39;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.toggle-switch input[type=checkbox]:checked+label:before {
|
||||
border-color: #61717D;
|
||||
@ -163,59 +135,50 @@ header {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.navBarResp {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
background: #495A67;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.main-container .sub-nav.clr-nav-level-1 .nav .nav-link, .main-container .sub-nav.clr-nav-level-2 .nav .nav-link, .main-container .subnav.clr-nav-level-1 .nav .nav-link, .main-container .subnav.clr-nav-level-2 .nav .nav-link {
|
||||
padding: 0 .5rem 0 1rem;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
border-radius: .125rem 0 0 .125rem;
|
||||
color: #95c84b;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.card-block, .card-footer {
|
||||
padding: 10px 0px 0px 0px;
|
||||
}
|
||||
|
||||
.main-container[_ngcontent-c0] .content-container[_ngcontent-c0] .content-area[_ngcontent-c0] {
|
||||
padding: 0rem 0rem 0rem 0rem;
|
||||
}
|
||||
|
||||
}
|
||||
::ng-deep {
|
||||
.htInvalid {
|
||||
background: black!important;
|
||||
}
|
||||
background: black!important;
|
||||
}
|
||||
|
||||
@media screen and (max-width:480px) {
|
||||
h2 {
|
||||
font-size: .7rem!important;
|
||||
|
||||
h2 {
|
||||
font-size: .7rem!important;
|
||||
}
|
||||
h3 {
|
||||
font-size: .7rem;
|
||||
}
|
||||
}
|
||||
h3 {
|
||||
font-size: .7rem;
|
||||
}
|
||||
}
|
||||
|
||||
.nav-link {
|
||||
padding: 0rem 1rem 0rem 1rem;
|
||||
}
|
||||
|
||||
.btn-primary .btn, .btn.btn-primary {
|
||||
border-color: #314351;
|
||||
background-color: #314351;
|
||||
color: #fff;
|
||||
body[cds-theme="light"] {
|
||||
.btn-primary .btn, .btn.btn-primary {
|
||||
border-color: $headerBackground;
|
||||
background-color: $headerBackground;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
body[cds-theme="dark"] {
|
||||
.btn-primary .btn, .btn.btn-primary {
|
||||
border-color: #5e7382;
|
||||
background-color: #5e7382;
|
||||
color: #fff;
|
||||
|
||||
clr-icon, cds-icon {
|
||||
color: #fff
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btn-primary .btn, .btn.btn-primary {
|
||||
&:disabled {
|
||||
opacity: 0.65;
|
||||
}
|
||||
}
|
||||
|
||||
.btn {
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
@ -236,36 +199,32 @@ header {
|
||||
font-weight: 500;
|
||||
height: 1.5rem;
|
||||
padding: 0 .5rem;
|
||||
border-color: #314351;
|
||||
background-color: transparent;
|
||||
color: #314351;
|
||||
}
|
||||
|
||||
.btn.btn-outline {
|
||||
border-color: #314351;
|
||||
background-color: transparent;
|
||||
color: #314351;
|
||||
}
|
||||
|
||||
.btn.btn-outline:hover {
|
||||
border-color: #314351;
|
||||
border-color: $headerBackground;
|
||||
background-color: #495A67;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.btn.btn-success-outline:hover {
|
||||
background-color: #5ea71f;
|
||||
color: #fff7f7;
|
||||
border-color: #9a9696;
|
||||
}
|
||||
// .btn.btn-success-outline {
|
||||
// border-color: #266900;
|
||||
// background-color: transparent;
|
||||
// color: #318700;
|
||||
// }
|
||||
// .wtSpreader {
|
||||
|
||||
// }
|
||||
body[cds-theme="dark"] {
|
||||
.btn.btn-icon.btn-dimmed {
|
||||
color: #7295ae;
|
||||
}
|
||||
}
|
||||
|
||||
body[cds-theme="light"] {
|
||||
.btn.btn-icon.btn-dimmed {
|
||||
color: $headerBackground;
|
||||
}
|
||||
|
||||
.btn.btn-outline {
|
||||
border-color: $headerBackground;
|
||||
background-color: transparent;
|
||||
color: $headerBackground;
|
||||
}
|
||||
}
|
||||
|
||||
.htMobileEditorContainer .inputs textarea {
|
||||
font-size: 13pt;
|
||||
@ -298,65 +257,68 @@ header {
|
||||
width: 350px;
|
||||
}
|
||||
|
||||
.handsontable {
|
||||
background-color: #ffffff;
|
||||
// border: 1px solid #ccc;
|
||||
border-radius: 3px;
|
||||
}
|
||||
.handsontable th {
|
||||
background-color: #fafafa;
|
||||
}
|
||||
|
||||
/* Left and right */
|
||||
.ht_clone_left th {
|
||||
border-right: 1px solid #ccc;
|
||||
border-left: 1px solid #ccc;
|
||||
}
|
||||
|
||||
/* Column headers */
|
||||
.ht_clone_top th {
|
||||
border-top: 1px solid #ccc;
|
||||
border-right: 1px solid #ccc;
|
||||
border-bottom: 1px solid #ccc;
|
||||
|
||||
body[cds-theme="light"] {
|
||||
.wtBorder {
|
||||
background-color: #495A67!important;
|
||||
}
|
||||
|
||||
.ht_master tr:nth-of-type(odd) > td {
|
||||
filter: brightness(0.95);
|
||||
}
|
||||
}
|
||||
|
||||
.ht_clone_top_left_corner th {
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
$darkBorderColor: #697c85;
|
||||
|
||||
.ht_master tr:nth-of-type(odd) > td {
|
||||
background-color: #f3f3f3;
|
||||
border: 1px solid rgb(197, 197, 197);
|
||||
border-bottom: 1px solid rgb(236, 235, 235);
|
||||
// padding: 1px 1px;
|
||||
}
|
||||
body[cds-theme="dark"] {
|
||||
.ht_master tr:nth-of-type(odd) > td {
|
||||
filter: brightness(1.2);
|
||||
}
|
||||
|
||||
.ht_master tr:nth-of-type(even) > td {
|
||||
background-color: white;
|
||||
border: 1px solid rgb(197, 197, 197);
|
||||
border-bottom: 1px solid rgb(236, 235, 235);
|
||||
// padding: 1px 1px;
|
||||
}
|
||||
.ht_master:not(.emptyColumns) ~ .handsontable tbody tr th, .ht_master:not(.emptyColumns) ~ .handsontable:not(.ht_clone_top) thead tr th:first-child {
|
||||
background-color: #2d4048;
|
||||
border-color: $darkBorderColor;
|
||||
}
|
||||
|
||||
.wtBorder {
|
||||
background-color: #495A67!important;
|
||||
.handsontable td {
|
||||
// border-right: 1px solid #697c85;
|
||||
// border-bottom: 1px solid #697c85;
|
||||
border-color: $darkBorderColor;
|
||||
}
|
||||
|
||||
.handsontable tr:first-child th, .handsontable tr:first-child td {
|
||||
border-color: $darkBorderColor;
|
||||
}
|
||||
|
||||
.handsontable .handsontable.ht_clone_top .wtHider {
|
||||
border-color: $darkBorderColor;
|
||||
}
|
||||
|
||||
.handsontable .changeType {
|
||||
background-color: #3c5662;
|
||||
border-color: $darkBorderColor;
|
||||
}
|
||||
|
||||
.handsontableInput {
|
||||
background-color: #708b98;
|
||||
}
|
||||
}
|
||||
|
||||
.handsontable .handsontable.ht_clone_top .wtHider {
|
||||
padding: 0 0 0px 0!important;
|
||||
margin: 0px;
|
||||
border-bottom: 3px solid #d6d3d3;
|
||||
}
|
||||
|
||||
.content-container {
|
||||
background: #F5F6FF;
|
||||
}
|
||||
|
||||
.card {
|
||||
box-shadow: 0 0.125rem 0 0 #d7d7d7;
|
||||
border-radius: .0rem;
|
||||
border: 1px solid transparent;
|
||||
// min-height: calc(100vh - 150px);
|
||||
body[cds-theme="light"] {
|
||||
.content-container {
|
||||
// background: red;
|
||||
background: #F5F6FF;
|
||||
}
|
||||
}
|
||||
|
||||
.datagrid-compact, .datagrid-history{
|
||||
@ -364,8 +326,6 @@ header {
|
||||
border-collapse: separate;
|
||||
border: 1px solid transparent;
|
||||
border-radius: .125rem;
|
||||
background-color: #fff;
|
||||
color: #565656;
|
||||
margin: 0;
|
||||
margin-top: 1rem;
|
||||
max-width: 100%;
|
||||
@ -387,8 +347,8 @@ header {
|
||||
}
|
||||
.datagrid-footer {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 2px;
|
||||
right: 30px;
|
||||
top: 1px;
|
||||
}
|
||||
.datagrid .datagrid-head {
|
||||
background-color: #fff;
|
||||
@ -408,7 +368,6 @@ header {
|
||||
-webkit-box-direction: normal;
|
||||
-ms-flex-direction: column;
|
||||
flex-direction: column;
|
||||
background: #f5f6ff;
|
||||
padding: .5rem 0;
|
||||
border: 1px solid #ccc;
|
||||
box-shadow: 0 1px 0.125rem hsla(0,0%,45%,.25);
|
||||
@ -423,8 +382,6 @@ header {
|
||||
border-collapse: separate;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 0px;
|
||||
background-color: #fff;
|
||||
color: #565656;
|
||||
margin: 0;
|
||||
margin-top: 1rem;
|
||||
max-width: 100%;
|
||||
@ -435,7 +392,6 @@ header {
|
||||
font-size: .45833rem;
|
||||
font-weight: 600;
|
||||
letter-spacing: .03em;
|
||||
background-color: #fff;
|
||||
vertical-align: bottom;
|
||||
border-bottom: 1px solid #ccc;
|
||||
text-transform: uppercase;
|
||||
@ -459,3 +415,33 @@ header {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 768px) {
|
||||
.navBarResp {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
background: #495A67;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.main-container .sub-nav.clr-nav-level-1 .nav .nav-link, .main-container .sub-nav.clr-nav-level-2 .nav .nav-link, .main-container .subnav.clr-nav-level-1 .nav .nav-link, .main-container .subnav.clr-nav-level-2 .nav .nav-link {
|
||||
padding: 0 .5rem 0 1rem;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
border-radius: .125rem 0 0 .125rem;
|
||||
color: #95c84b;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.card-block, .card-footer {
|
||||
padding: 10px 0px 0px 0px;
|
||||
}
|
||||
|
||||
.main-container[_ngcontent-c0] .content-container[_ngcontent-c0] .content-area[_ngcontent-c0] {
|
||||
padding: 0rem 0rem 0rem 0rem;
|
||||
}
|
||||
|
||||
}
|
@ -13,6 +13,25 @@ import { InfoModal } from './models/InfoModal'
|
||||
import { DcAdapterSettings } from './models/DcAdapterSettings'
|
||||
import { AppStoreService } from './services/app-store.service'
|
||||
import { LicenceService } from './services/licence.service'
|
||||
import '@cds/core/icon/register.js'
|
||||
import {
|
||||
ClarityIcons,
|
||||
exclamationTriangleIcon,
|
||||
moonIcon,
|
||||
processOnVmIcon,
|
||||
sunIcon,
|
||||
tableIcon,
|
||||
trashIcon
|
||||
} from '@cds/core/icon'
|
||||
|
||||
ClarityIcons.addIcons(
|
||||
moonIcon,
|
||||
sunIcon,
|
||||
exclamationTriangleIcon,
|
||||
tableIcon,
|
||||
trashIcon,
|
||||
processOnVmIcon
|
||||
)
|
||||
|
||||
@Component({
|
||||
selector: 'my-app',
|
||||
|
@ -20,10 +20,10 @@ import { UsernavRouteComponent } from './routes/usernav-route/usernav-route.comp
|
||||
import { AppService } from './services/app.service'
|
||||
import { InfoModalComponent } from './shared/abort-modal/info-modal.component'
|
||||
import { RequestsModalComponent } from './shared/requests-modal/requests-modal.component'
|
||||
import { HomeModule } from './home/home.module'
|
||||
import { DirectivesModule } from './directives/directives.module'
|
||||
import { ViyaApiExplorerComponent } from './viya-api-explorer/viya-api-explorer.component'
|
||||
import { NgxJsonViewerModule } from 'ngx-json-viewer'
|
||||
import { AppSettingsService } from './services/app-settings.service'
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
@ -46,12 +46,11 @@ import { NgxJsonViewerModule } from 'ngx-json-viewer'
|
||||
SharedModule,
|
||||
ClarityModule,
|
||||
AppSharedModule,
|
||||
HomeModule,
|
||||
PipesModule,
|
||||
DirectivesModule,
|
||||
NgxJsonViewerModule
|
||||
],
|
||||
providers: [AppService, SasStoreService, LicensingGuard],
|
||||
providers: [AppService, SasStoreService, LicensingGuard, AppSettingsService],
|
||||
bootstrap: [AppComponent]
|
||||
})
|
||||
export class AppModule {}
|
||||
|
@ -4,19 +4,19 @@
|
||||
* The full license information can be found in LICENSE in the root directory of this project.
|
||||
*/
|
||||
import { ModuleWithProviders } from '@angular/core'
|
||||
import { Routes, RouterModule } from '@angular/router'
|
||||
import { RouterModule, Routes } from '@angular/router'
|
||||
|
||||
import { HomeComponent } from './home/home.component'
|
||||
import { NotFoundComponent } from './not-found/not-found.component'
|
||||
|
||||
import { DeployModule } from './deploy/deploy.module'
|
||||
import { EditorModule } from './editor/editor.module'
|
||||
import { HomeModule } from './home/home.module'
|
||||
import { LicensingModule } from './licensing/licensing.module'
|
||||
import { ReviewModule } from './review/review.module'
|
||||
import { ReviewRouteComponent } from './routes/review-route/review-route.component'
|
||||
import { StageModule } from './stage/stage.module'
|
||||
import { EditorModule } from './editor/editor.module'
|
||||
import { ViewerModule } from './viewer/viewer.module'
|
||||
import { ReviewModule } from './review/review.module'
|
||||
import { DeployModule } from './deploy/deploy.module'
|
||||
import { LicensingModule } from './licensing/licensing.module'
|
||||
import { SystemModule } from './system/system.module'
|
||||
import { ViewerModule } from './viewer/viewer.module'
|
||||
|
||||
/**
|
||||
* Defining routes
|
||||
@ -45,7 +45,10 @@ export const ROUTES: Routes = [
|
||||
path: 'licensing',
|
||||
loadChildren: () => LicensingModule
|
||||
},
|
||||
{ path: 'home', component: HomeComponent },
|
||||
{
|
||||
path: 'home',
|
||||
loadChildren: () => HomeModule
|
||||
},
|
||||
{
|
||||
/**
|
||||
* Load editor module with subroutes
|
||||
|
@ -1,6 +1,7 @@
|
||||
import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core'
|
||||
import SASjs, { SASjsConfig } from '@sasjs/adapter'
|
||||
import { DcAdapterSettings } from 'src/app/models/DcAdapterSettings'
|
||||
import { RequestWrapperResponse } from 'src/app/models/request-wrapper/RequestWrapperResponse'
|
||||
import { DeployService } from 'src/app/services/deploy.service'
|
||||
import { EventService } from 'src/app/services/event.service'
|
||||
import { LoggerService } from 'src/app/services/logger.service'
|
||||
@ -303,10 +304,10 @@ export class ManualComponent implements OnInit {
|
||||
|
||||
this.sasService
|
||||
.request('public/startupservice', null)
|
||||
.then((res: any) => {
|
||||
this.loggerService.log(res)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.loggerService.log(res.adapterResponse)
|
||||
|
||||
if (res.saslibs) {
|
||||
if (res.adapterResponse.saslibs) {
|
||||
this.validationState = 'success'
|
||||
} else {
|
||||
this.validationState = 'error'
|
||||
|
@ -3,6 +3,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
|
||||
import SASjs, { SASjsConfig } from '@sasjs/adapter'
|
||||
import { ServerType } from '@sasjs/utils/types/serverType'
|
||||
import { DcAdapterSettings } from 'src/app/models/DcAdapterSettings'
|
||||
import { RequestWrapperResponse } from 'src/app/models/request-wrapper/RequestWrapperResponse'
|
||||
import { SASGroup } from 'src/app/models/sas/public-getgroups.model'
|
||||
import { SASjsApiServerInfo } from 'src/app/models/sasjs-api/SASjsApiServerInfo.model'
|
||||
import { SasService } from 'src/app/services/sas.service'
|
||||
@ -68,11 +69,11 @@ export class SasjsConfiguratorComponent implements OnInit {
|
||||
this.loading = true
|
||||
|
||||
this.sasService.request('usernav/usergroupsbymember', null).then(
|
||||
(res: any) => {
|
||||
this.METAPERSON = res.MF_GETUSER
|
||||
this.SYSUSERID = res.SYSUSERID
|
||||
this.SYSHOSTNAME = res.SYSHOSTNAME
|
||||
this.SYSVLONG = res.SYSVLONG
|
||||
(res: RequestWrapperResponse) => {
|
||||
this.METAPERSON = res.adapterResponse.MF_GETUSER
|
||||
this.SYSUSERID = res.adapterResponse.SYSUSERID
|
||||
this.SYSHOSTNAME = res.adapterResponse.SYSHOSTNAME
|
||||
this.SYSVLONG = res.adapterResponse.SYSVLONG
|
||||
|
||||
/*
|
||||
We would like to present a default DCPATH (deployment path) to the
|
||||
@ -88,12 +89,14 @@ export class SasjsConfiguratorComponent implements OnInit {
|
||||
*/
|
||||
this.dcDirectory =
|
||||
this.tmpDirectories[
|
||||
['L', 'H', 'A', 'S'].includes(res.SYSSCPL.substring(0, 1))
|
||||
['L', 'H', 'A', 'S'].includes(
|
||||
res.adapterResponse.SYSSCPL.substring(0, 1)
|
||||
)
|
||||
? 'linux'
|
||||
: 'windows'
|
||||
]
|
||||
|
||||
this.dcAdminGroupList = res.groups
|
||||
this.dcAdminGroupList = res.adapterResponse.groups
|
||||
this.dcAdminGroup = this.dcAdminGroupList[0].GROUPNAME
|
||||
|
||||
this.loading = false
|
||||
|
@ -4,20 +4,23 @@ import { NgVarDirective } from './ng-var.directive'
|
||||
import { DragNdropDirective } from './drag-ndrop.directive'
|
||||
import { FileDropDirective } from './file-drop.directive'
|
||||
import { FileSelectDirective } from './file-select.directive'
|
||||
import { StealFocusDirective } from './steal-focus.directive'
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
NgVarDirective,
|
||||
DragNdropDirective,
|
||||
FileDropDirective,
|
||||
FileSelectDirective
|
||||
FileSelectDirective,
|
||||
StealFocusDirective
|
||||
],
|
||||
imports: [CommonModule],
|
||||
exports: [
|
||||
NgVarDirective,
|
||||
DragNdropDirective,
|
||||
FileDropDirective,
|
||||
FileSelectDirective
|
||||
FileSelectDirective,
|
||||
StealFocusDirective
|
||||
]
|
||||
})
|
||||
export class DirectivesModule {}
|
||||
|
17
client/src/app/directives/steal-focus.directive.ts
Normal file
17
client/src/app/directives/steal-focus.directive.ts
Normal file
@ -0,0 +1,17 @@
|
||||
import { Directive, HostListener } from '@angular/core'
|
||||
|
||||
@Directive({
|
||||
selector: '[appStealFocus]'
|
||||
})
|
||||
export class StealFocusDirective {
|
||||
constructor() {}
|
||||
|
||||
/**
|
||||
* For some reason newest version of Clarity v17.0.1 is stealing focus when
|
||||
* clicking on the input inside of the clr-tree-view
|
||||
* This is workaround
|
||||
*/
|
||||
@HostListener('click', ['$event']) onClick(event: any) {
|
||||
event.target.focus()
|
||||
}
|
||||
}
|
@ -24,8 +24,8 @@
|
||||
generatedRecordUrl
|
||||
? 'copy to clipboard'
|
||||
: generateEditRecordUrlLoading
|
||||
? 'Generating url...'
|
||||
: 'Link to this record'
|
||||
? 'Generating url...'
|
||||
: 'Link to this record'
|
||||
}}
|
||||
</button>
|
||||
</ng-container>
|
||||
@ -112,7 +112,7 @@
|
||||
|
||||
<div
|
||||
*ngIf="
|
||||
['autocomplete'].includes(
|
||||
['autocomplete', 'autocomplete.custom'].includes(
|
||||
$any(currentRecordValidator?.getRule(col.key)?.editor)
|
||||
)
|
||||
"
|
||||
@ -163,7 +163,7 @@
|
||||
|
||||
<div
|
||||
*ngIf="
|
||||
['autocomplete'].includes(
|
||||
['autocomplete', 'autocomplete.custom'].includes(
|
||||
$any(currentRecordValidator?.getRule(col.key)?.editor)
|
||||
)
|
||||
"
|
||||
@ -277,7 +277,7 @@
|
||||
<div>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-outline focusable"
|
||||
class="btn btn-outline focusable mr-5i"
|
||||
(click)="currentRecord!.noLinkOption = false; closeRecordEdit()"
|
||||
>
|
||||
Cancel
|
||||
|
@ -38,7 +38,6 @@
|
||||
app-soft-select {
|
||||
display: block;
|
||||
width: 224px;
|
||||
background: #fff;
|
||||
border: 1px solid #999;
|
||||
color: #000;
|
||||
padding: calc(.25rem + 2px) .5rem;
|
||||
@ -49,7 +48,6 @@
|
||||
input {
|
||||
width: 100%;
|
||||
border: 0;
|
||||
background-color: #fff;
|
||||
|
||||
&:focus {
|
||||
background: none;
|
||||
@ -132,7 +130,6 @@
|
||||
|
||||
clr-input-container {
|
||||
width: 224px;
|
||||
background: #fff;
|
||||
border: 1px solid #999;
|
||||
color: #000;
|
||||
padding: calc(.25rem + 2px) .5rem;
|
||||
|
@ -3,7 +3,7 @@
|
||||
appFileDrop
|
||||
(fileOver)="fileOverBase($event)"
|
||||
[uploader]="uploader"
|
||||
(fileDrop)="getFileDesc($event, true)"
|
||||
(fileDrop)="attachFile($event, true)"
|
||||
[clrModalSize]="'xl'"
|
||||
[clrModalStaticBackdrop]="false"
|
||||
[clrModalClosable]="excelUploadState === 'Validating-DQ'"
|
||||
@ -81,7 +81,7 @@
|
||||
type="file"
|
||||
appFileSelect
|
||||
[uploader]="uploader"
|
||||
(change)="getFileDesc($event)"
|
||||
(change)="attachFile($event)"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@ -92,7 +92,7 @@
|
||||
<button
|
||||
[disabled]="true"
|
||||
class="btnView btn btn-sm btn-success profile-buttons w-100"
|
||||
(click)="getFile()"
|
||||
(click)="uploadParsedFiles()"
|
||||
>
|
||||
Upload
|
||||
</button>
|
||||
@ -164,19 +164,28 @@
|
||||
<div
|
||||
class="card-header clr-row buttonBar headerBar clr-flex-md-row clr-justify-content-center clr-justify-content-lg-end"
|
||||
>
|
||||
<div *ngIf="tableTrue" class="clr-col-12 clr-col-lg-4 backBtn">
|
||||
<span class="btn btn-sm" [routerLink]="['/home']">
|
||||
<clr-icon shape="caret" dir="left" size="20"></clr-icon>Back to
|
||||
table selection
|
||||
<div
|
||||
*ngIf="tableTrue"
|
||||
class="clr-col-12 clr-col-md-3 clr-col-lg-4 backBtn"
|
||||
>
|
||||
<span
|
||||
class="btn icon-collapse btn-sm btn-icon btn-dimmed"
|
||||
[routerLink]="['/home']"
|
||||
>
|
||||
<clr-icon shape="caret" dir="left" size="20"></clr-icon>
|
||||
<span class="text">Back to table selection</span>
|
||||
</span>
|
||||
<span (click)="viewboxManager()" class="btn btn-sm viewbox-open">
|
||||
<span
|
||||
(click)="viewboxManager()"
|
||||
class="btn icon-collapse btn-sm btn-icon btn-dimmed viewbox-open"
|
||||
>
|
||||
<clr-icon shape="view-cards" size="20"></clr-icon>
|
||||
Viewboxes
|
||||
<span class="text">Viewboxes</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="clr-col-12 clr-col-lg-4 d-flex flex-column align-items-center"
|
||||
class="clr-col-12 clr-col-md-5 clr-col-lg-4 d-flex flex-column align-items-center"
|
||||
[class.clr-col-lg-12]="!tableTrue"
|
||||
>
|
||||
<h4
|
||||
@ -186,24 +195,40 @@
|
||||
} as libdsParsed"
|
||||
class="editor-title text-center mt-0-i"
|
||||
>
|
||||
<clr-icon
|
||||
(click)="datasetInfo = true"
|
||||
shape="info-circle"
|
||||
class="is-highlight cursor-pointer"
|
||||
size="24"
|
||||
></clr-icon>
|
||||
<clr-tooltip>
|
||||
<clr-icon
|
||||
clrTooltipTrigger
|
||||
(click)="datasetInfo = true"
|
||||
shape="info-circle"
|
||||
class="is-highlight cursor-pointer"
|
||||
size="24"
|
||||
></clr-icon>
|
||||
|
||||
<clr-icon
|
||||
*ngIf="libdsParsed.tableName.includes('-FC')"
|
||||
shape="bolt"
|
||||
class="color-yellow"
|
||||
></clr-icon>
|
||||
<clr-icon
|
||||
*ngIf="libdsParsed.tableName.includes('-FC')"
|
||||
shape="bolt"
|
||||
class="color-yellow"
|
||||
></clr-icon>
|
||||
|
||||
<span clrTooltipTrigger>
|
||||
{{ libdsParsed.libName }}.<a
|
||||
class="mr-10 view-table"
|
||||
[routerLink]="'/view/data/' + libds!"
|
||||
>{{ libdsParsed.tableName.replace('-FC', '') }}</a
|
||||
>
|
||||
</span>
|
||||
|
||||
<ng-container *ngIf="this.dsNote && this.dsNote.length > 0">
|
||||
<clr-tooltip-content
|
||||
clrPosition="bottom-left"
|
||||
clrSize="lg"
|
||||
*clrIfOpen
|
||||
>
|
||||
{{ this.dsNote }}
|
||||
</clr-tooltip-content>
|
||||
</ng-container>
|
||||
</clr-tooltip>
|
||||
|
||||
{{ libdsParsed.libName }}.<a
|
||||
class="mr-10"
|
||||
[routerLink]="'/view/data/' + libds!"
|
||||
>{{ libdsParsed.tableName.replace('-FC', '') }}</a
|
||||
>
|
||||
<ng-container *ngIf="dataSource">
|
||||
<ng-container *ngIf="!zeroFilterRows">
|
||||
({{ dataSource.length | thousandSeparator: ',' }}
|
||||
@ -215,34 +240,37 @@
|
||||
</ng-container>
|
||||
</h4>
|
||||
</div>
|
||||
<div *ngIf="tableTrue" class="clr-col-12 clr-col-lg-4 btnCtrl">
|
||||
<div
|
||||
*ngIf="tableTrue"
|
||||
class="clr-col-12 clr-col-md-4 clr-col-lg-4 btnCtrl"
|
||||
>
|
||||
<ng-container *ngIf="hotTable.readOnly && !uploadPreview">
|
||||
<button
|
||||
type="button"
|
||||
class="btnView btn btn-sm btn-icon btn-block"
|
||||
class="btnView btn icon-collapse btn-sm btn-icon btn-block btn-dimmed"
|
||||
(click)="openQb()"
|
||||
>
|
||||
<clr-icon shape="filter"></clr-icon>
|
||||
<span>Filter</span>
|
||||
<span class="text">Filter</span>
|
||||
</button>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-primary btn-block"
|
||||
class="btn icon-collapse btn-sm btn-primary btn-block"
|
||||
(click)="editTable()"
|
||||
>
|
||||
<clr-icon shape="note"></clr-icon>
|
||||
<span>Edit</span>
|
||||
<span class="text">Edit</span>
|
||||
</button>
|
||||
|
||||
<button
|
||||
*ngIf="!columnLevelSecurityFlag"
|
||||
(click)="onShowUploadModal()"
|
||||
type="button"
|
||||
class="btn btn-sm btn-success btn-block mr-0"
|
||||
class="btn icon-collapse btn-sm btn-success btn-block mr-0"
|
||||
>
|
||||
<clr-icon shape="upload"></clr-icon>
|
||||
<span>Upload</span>
|
||||
<span class="text">Upload</span>
|
||||
</button>
|
||||
</ng-container>
|
||||
|
||||
@ -280,7 +308,7 @@
|
||||
licenceState.value.editor_rows_allowed === 1
|
||||
? 'row'
|
||||
: 'rows'
|
||||
}}, contact support@datacontroller.io</span
|
||||
}}, contact support@datacontroller.io</span
|
||||
>
|
||||
</clr-tooltip-content>
|
||||
</clr-tooltip>
|
||||
@ -346,8 +374,8 @@
|
||||
<ng-container *ngIf="!getdataError">
|
||||
<span class="spinner"> Loading... </span>
|
||||
|
||||
<div>
|
||||
<h3>Loading table</h3>
|
||||
<div class="mt-10">
|
||||
<p cds-text="section">Loading table</p>
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
@ -356,8 +384,8 @@
|
||||
<clr-icon shape="error-standard" class="error-icon"></clr-icon>
|
||||
</span>
|
||||
|
||||
<div>
|
||||
<h3>Loading table error</h3>
|
||||
<div class="mt-10">
|
||||
<p cds-text="section">Loading table error</p>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
@ -382,6 +410,7 @@
|
||||
hotId="hotInstance"
|
||||
id="hotTable"
|
||||
class="edit-hot"
|
||||
className="htDark"
|
||||
[class.hidden]="hotTable.hidden"
|
||||
[licenseKey]="hotTable.licenseKey"
|
||||
>
|
||||
@ -417,7 +446,7 @@
|
||||
licenceState.value.editor_rows_allowed === 1
|
||||
? 'row'
|
||||
: 'rows'
|
||||
}}, contact support@datacontroller.io</span
|
||||
}}, contact support@datacontroller.io</span
|
||||
>
|
||||
</clr-tooltip-content>
|
||||
</clr-tooltip>
|
||||
@ -467,14 +496,18 @@
|
||||
: 'rows'
|
||||
}}
|
||||
will be submitted. To remove the restriction, contact
|
||||
support@datacontroller.io</span
|
||||
support@datacontroller.io</span
|
||||
>
|
||||
<div *ngIf="tableTrue" class="clr-offset-md-2 clr-col-md-8">
|
||||
<div class="form-group">
|
||||
<label for="formFields_8">Message</label>
|
||||
<div class="text-area-full-width">
|
||||
<label for="formFields_8" class="mb-5 d-block"
|
||||
>Message</label
|
||||
>
|
||||
<textarea
|
||||
clrTextarea
|
||||
[(ngModel)]="message"
|
||||
[disabled]="!validationDone"
|
||||
tabindex="0"
|
||||
[value]="
|
||||
!validationDone
|
||||
? 'Please wait while we validate ' +
|
||||
@ -482,10 +515,9 @@
|
||||
' cells.'
|
||||
: ''
|
||||
"
|
||||
class="w-100"
|
||||
class="submit-reason"
|
||||
type="text"
|
||||
id="formFields_8"
|
||||
rows="5"
|
||||
></textarea>
|
||||
</div>
|
||||
<!-- TODO:approvers list -->
|
||||
@ -504,6 +536,7 @@
|
||||
[disabled]="!validationDone"
|
||||
type="submit"
|
||||
class="btn btn-sm btn-success-outline m-0"
|
||||
tabindex="0"
|
||||
(click)="saveTable(hotTable.data)"
|
||||
>
|
||||
Submit
|
||||
@ -512,6 +545,7 @@
|
||||
id="cancelSubmitBtn"
|
||||
type="button"
|
||||
class="btn btn-sm btn-outline"
|
||||
tabindex="0"
|
||||
(click)="cancelSubmit(); submit = false; validationDone = 0"
|
||||
>
|
||||
Cancel
|
||||
@ -528,7 +562,7 @@
|
||||
Due to current licence, only
|
||||
{{ licenceState.value.submit_rows_limit }} rows in a file will
|
||||
be submitted. To remove the restriction, contact
|
||||
support@datacontroller.io
|
||||
support@datacontroller.io
|
||||
</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
@ -542,7 +576,7 @@
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-primary"
|
||||
(click)="getFile(); submitLimitNotice = false"
|
||||
(click)="uploadParsedFiles(); submitLimitNotice = false"
|
||||
>
|
||||
Submit
|
||||
</button>
|
||||
@ -830,6 +864,12 @@
|
||||
</div>
|
||||
</clr-modal>
|
||||
|
||||
<app-dataset-info [(open)]="datasetInfo" [dsmeta]="dsmeta"></app-dataset-info>
|
||||
<app-dataset-info
|
||||
[(open)]="datasetInfo"
|
||||
[dsmeta]="dsmeta"
|
||||
[versions]="versions"
|
||||
(rowClicked)="datasetInfoModalRowClicked($event)"
|
||||
>
|
||||
</app-dataset-info>
|
||||
|
||||
<app-viewboxes [(viewboxModal)]="viewboxes"></app-viewboxes>
|
||||
|
@ -21,12 +21,12 @@ hot-table {
|
||||
|
||||
.handsontable tbody th.ht__highlight, .handsontable thead th.ht__highlight {
|
||||
&.primaryKeyHeaderStyle {
|
||||
background: #306b00b0;
|
||||
background-color: #306b00b0 !important;
|
||||
}
|
||||
}
|
||||
|
||||
.primaryKeyHeaderStyle {
|
||||
background: #306b006e;
|
||||
background-color: #306b006e !important;
|
||||
}
|
||||
|
||||
th.readonlyCell {
|
||||
@ -41,6 +41,12 @@ hot-table {
|
||||
}
|
||||
}
|
||||
|
||||
.submit-reason {
|
||||
min-height: 120px;
|
||||
max-height: 120px;
|
||||
height: 120px;
|
||||
}
|
||||
|
||||
.infoBar {
|
||||
margin-top:14px;
|
||||
background: #495967;
|
||||
@ -80,8 +86,7 @@ hot-table {
|
||||
-webkit-box-align: center;
|
||||
-ms-flex-align: center;
|
||||
align-items: center;
|
||||
background: #ffffff;
|
||||
background: #f5f6fe;
|
||||
background: var(--clr-vertical-nav-bg-color);
|
||||
}
|
||||
|
||||
.error-icon {
|
||||
@ -196,6 +201,7 @@ hot-table {
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: flex-start;
|
||||
|
||||
margin: 1px;
|
||||
|
||||
@ -206,7 +212,10 @@ hot-table {
|
||||
span {
|
||||
font-size: 20px;
|
||||
margin-top: 20px;
|
||||
color: #fff;
|
||||
padding: 10px;
|
||||
background: #dbdbdb;
|
||||
border-radius: 5px;
|
||||
color: black;
|
||||
}
|
||||
}
|
||||
|
||||
@ -214,6 +223,20 @@ hot-table {
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
.view-table {
|
||||
font-size: inherit !important;
|
||||
}
|
||||
|
||||
// When width is smaller remove the text from the buttons
|
||||
// keep only the icons
|
||||
@media (max-width: 992px) {
|
||||
.icon-collapse {
|
||||
.text {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME
|
||||
// Let's leave it here for a reference if there
|
||||
// is an issue with viewboxes/filter modal overlaying
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -12,7 +12,6 @@ import { EditRecordComponent } from './components/edit-record/edit-record.compon
|
||||
import { UploadStaterComponent } from './components/upload-stater/upload-stater.component'
|
||||
import { EditorRoutingModule } from './editor-routing.module'
|
||||
import { EditorComponent } from './editor.component'
|
||||
import { HomeModule } from '../home/home.module'
|
||||
import { DcTreeModule } from '../shared/dc-tree/dc-tree.module'
|
||||
import { DragDropModule } from '@angular/cdk/drag-drop'
|
||||
import { ViewboxesModule } from '../shared/viewboxes/viewboxes.module'
|
||||
@ -33,7 +32,6 @@ registerAllModules()
|
||||
AppSharedModule,
|
||||
DirectivesModule,
|
||||
SharedModule,
|
||||
HomeModule,
|
||||
PipesModule,
|
||||
DcTreeModule,
|
||||
DragDropModule,
|
||||
|
@ -11,9 +11,11 @@ export const errorRenderer = (
|
||||
value: any,
|
||||
cellProperties: any
|
||||
) => {
|
||||
addDarkClass(td)
|
||||
|
||||
td.innerHTML = `${
|
||||
value ? value.toString() : ''
|
||||
} <clr-icon shape="exclamation-circle" status="warning"></clr-icon>`
|
||||
} <cds-icon shape="exclamation-triangle" status="warning"></cds-icon>`
|
||||
|
||||
return td
|
||||
}
|
||||
@ -31,6 +33,8 @@ export const noSpinnerRenderer = (
|
||||
value: any,
|
||||
cellProperties: any
|
||||
) => {
|
||||
addDarkClass(td)
|
||||
|
||||
td.innerHTML = value ? value : ''
|
||||
|
||||
return td
|
||||
@ -50,9 +54,20 @@ export const spinnerRenderer = (
|
||||
value: any,
|
||||
cellProperties: any
|
||||
) => {
|
||||
addDarkClass(td)
|
||||
|
||||
td.innerHTML = `${
|
||||
value ? value.toString() : ''
|
||||
} <span class="spinner spinner-sm vertical-align-middle"></span>`
|
||||
|
||||
return td
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a htDark class to a TD element if not existing
|
||||
*/
|
||||
const addDarkClass = (td: any) => {
|
||||
if (!td.classList.contains('htDark')) {
|
||||
td.classList.add('htDark')
|
||||
}
|
||||
}
|
||||
|
@ -3,6 +3,7 @@
|
||||
<clr-tree-node *ngIf="groups" class="search-node">
|
||||
<div class="tree-search-wrapper">
|
||||
<input
|
||||
appStealFocus
|
||||
clrInput
|
||||
#searchLibTreeInput
|
||||
placeholder="Filter by Groups"
|
||||
@ -27,7 +28,7 @@
|
||||
<clr-tree-node
|
||||
(click)="groupOnClick(group)"
|
||||
*ngIf="!group['hidden']"
|
||||
[class.table-active]="group.GROUPURI === groupUri"
|
||||
[class.active]="group.GROUPURI === groupUri"
|
||||
>
|
||||
<p class="m-0 cursor-pointer list-padding">
|
||||
<clr-icon shape="users"></clr-icon>
|
||||
|
@ -1,3 +1,43 @@
|
||||
@import '../../colors.scss';
|
||||
|
||||
::ng-deep body[cds-theme="dark"] {
|
||||
.group-info {
|
||||
background-color: $headerBackground;
|
||||
border-color: $headerBackground;
|
||||
}
|
||||
|
||||
.group-data {
|
||||
background-color: $headerBackground;
|
||||
border-color: $headerBackground;
|
||||
}
|
||||
|
||||
.member-table tbody{
|
||||
tr:hover{
|
||||
background-color: #29404b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
::ng-deep body[cds-theme="light"] {
|
||||
.group-info{
|
||||
background-color: #f9f9f9;
|
||||
border-color: #a7a7a7;
|
||||
box-shadow: 0px 2px 5px #dad7d7;
|
||||
}
|
||||
|
||||
.group-data {
|
||||
background-color: #f9f9f9;
|
||||
border-color: #a7a7a7;
|
||||
box-shadow: 0px 2px 5px #dad7d7;
|
||||
}
|
||||
|
||||
.member-table tbody{
|
||||
tr:hover{
|
||||
background-color: #e6e6e6;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.sidebar-height{
|
||||
height: 100%;
|
||||
}
|
||||
@ -6,21 +46,18 @@
|
||||
font-size: 20px;
|
||||
}
|
||||
.group-info{
|
||||
background-color: #f9f9f9;
|
||||
border: 1px solid #a7a7a7;
|
||||
border: 1px solid;
|
||||
border-radius: 3px;
|
||||
box-shadow: 0px 2px 5px #dad7d7;
|
||||
}
|
||||
.group-info td{
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.group-data{
|
||||
background-color: #f9f9f9;
|
||||
border: 1px solid #a7a7a7;
|
||||
border: 1px solid;
|
||||
border-radius: 3px;
|
||||
box-shadow: 0px 2px 5px #dad7d7;
|
||||
}
|
||||
|
||||
.group-data{
|
||||
min-height: auto;
|
||||
h3, h5{
|
||||
@ -28,15 +65,11 @@
|
||||
}
|
||||
|
||||
.member-table{
|
||||
background-color: #f9f9f9;
|
||||
width: 100%;
|
||||
}
|
||||
.member-table thead{
|
||||
background-color: #dadada;
|
||||
}
|
||||
|
||||
.member-table tbody{
|
||||
tr:hover{
|
||||
background-color: #e6e6e6;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
@ -6,6 +6,7 @@ import { ServerType } from '@sasjs/utils/types/serverType'
|
||||
import { HelperService } from '../services/helper.service'
|
||||
import { SasService } from '../services/sas.service'
|
||||
import { globals } from '../_globals'
|
||||
import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapperResponse'
|
||||
|
||||
@Component({
|
||||
selector: 'app-group',
|
||||
@ -82,11 +83,13 @@ export class GroupComponent implements OnInit {
|
||||
globals.usernav.groupList = groups
|
||||
})
|
||||
} else {
|
||||
this.sasService.request('public/getgroups', null).then((res: any) => {
|
||||
this.loading = false
|
||||
this.groups = res.groups
|
||||
globals.usernav.groupList = res.groups
|
||||
})
|
||||
this.sasService
|
||||
.request('public/getgroups', null)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.loading = false
|
||||
this.groups = res.adapterResponse.groups
|
||||
globals.usernav.groupList = res.adapterResponse.groups
|
||||
})
|
||||
}
|
||||
} else {
|
||||
this.groups = globals.usernav.groupList
|
||||
@ -128,14 +131,15 @@ export class GroupComponent implements OnInit {
|
||||
let data = { iwant: [{ groupid: this.paramURI }] }
|
||||
this.sasService
|
||||
.request('usernav/usermembersbygroup', data)
|
||||
.then((res: any) => {
|
||||
this.groupMembers = res.sasmembers
|
||||
this.groupMemberCount = res.sasmembers.length
|
||||
if (res.sasmembers[0] !== undefined) {
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.groupMembers = res.adapterResponse.sasmembers
|
||||
this.groupMemberCount = res.adapterResponse.sasmembers.length
|
||||
if (res.adapterResponse.sasmembers[0] !== undefined) {
|
||||
this.loading = false
|
||||
this.groupUri = res.sasmembers[0].URIMEM || this.paramURI
|
||||
this.groupName = res.sasmembers[0].GROUPNAME
|
||||
this.groupDesc = res.sasmembers[0].GROUPDESC
|
||||
this.groupUri =
|
||||
res.adapterResponse.sasmembers[0].URIMEM || this.paramURI
|
||||
this.groupName = res.adapterResponse.sasmembers[0].GROUPNAME
|
||||
this.groupDesc = res.adapterResponse.sasmembers[0].GROUPDESC
|
||||
|
||||
if (!this.groupName) {
|
||||
this.groupName = this.paramURI
|
||||
@ -202,13 +206,13 @@ export class GroupComponent implements OnInit {
|
||||
|
||||
this.sasService
|
||||
.request('usernav/usermembersbygroup', data)
|
||||
.then((res: any) => {
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.loading = false
|
||||
this.groupUri = group.GROUPURI
|
||||
this.groupName = group.GROUPNAME
|
||||
this.groupDesc = group.GROUPDESC
|
||||
this.groupMembers = res.sasmembers
|
||||
this.groupMemberCount = res.sasmembers.length
|
||||
this.groupMembers = res.adapterResponse.sasmembers
|
||||
this.groupMemberCount = res.adapterResponse.sasmembers.length
|
||||
})
|
||||
}
|
||||
}
|
||||
|
25
client/src/app/home/home-routing.module.ts
Normal file
25
client/src/app/home/home-routing.module.ts
Normal file
@ -0,0 +1,25 @@
|
||||
import { NgModule } from '@angular/core'
|
||||
import { RouterModule, Routes } from '@angular/router'
|
||||
import { HomeRouteComponent } from '../routes/home-route/home-route.component'
|
||||
import { HomeComponent } from './home.component'
|
||||
import { XLMapModule } from '../xlmap/xlmap.module'
|
||||
import { MultiDatasetModule } from '../multi-dataset/multi-dataset.module'
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
component: HomeRouteComponent,
|
||||
children: [
|
||||
{ path: '', pathMatch: 'full', redirectTo: 'tables' },
|
||||
{ path: 'tables', component: HomeComponent },
|
||||
{ path: 'excel-maps', loadChildren: () => XLMapModule },
|
||||
{ path: 'multi-load', loadChildren: () => MultiDatasetModule }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forChild(routes)],
|
||||
exports: [RouterModule]
|
||||
})
|
||||
export class HomeRoutingModule {}
|
@ -4,6 +4,7 @@
|
||||
<div class="tree-search-wrapper">
|
||||
<input
|
||||
clrInput
|
||||
appStealFocus
|
||||
#searchLibTreeInput
|
||||
placeholder="Libraries"
|
||||
name="input"
|
||||
@ -46,6 +47,7 @@
|
||||
<clr-tree-node *ngIf="library['tables']" class="search-node">
|
||||
<div class="tree-search-wrapper">
|
||||
<input
|
||||
appStealFocus
|
||||
clrInput
|
||||
#searchTreeInput
|
||||
placeholder="Tables"
|
||||
@ -85,7 +87,7 @@
|
||||
(click)="!tableLocked ? onTableClick(libTable, library) : ''"
|
||||
class="clr-treenode-link"
|
||||
[class.dc-locked-control]="tableLocked"
|
||||
[class.table-active]="libTabActive(library.LIBRARYREF, libTable)"
|
||||
[class.active]="libTabActive(library.LIBRARYREF, libTable)"
|
||||
>
|
||||
<ng-container [ngSwitch]="libTable.includes('-FC')">
|
||||
<clr-icon *ngSwitchCase="true" shape="bolt"></clr-icon>
|
||||
@ -94,15 +96,17 @@
|
||||
{{ libTable.replace('-FC', '') }}
|
||||
</button>
|
||||
|
||||
<clr-tooltip-content
|
||||
clrPosition="bottom-right"
|
||||
clrSize="lg"
|
||||
*clrIfOpen
|
||||
>
|
||||
<span *ngIf="tableLocked">
|
||||
To unlock all tables, contact support@datacontroller.io
|
||||
</span>
|
||||
</clr-tooltip-content>
|
||||
<ng-container *ngIf="tableLocked">
|
||||
<clr-tooltip-content
|
||||
clrPosition="bottom-right"
|
||||
clrSize="lg"
|
||||
*clrIfOpen
|
||||
>
|
||||
<span>
|
||||
To unlock all tables, contact support@datacontroller.io
|
||||
</span>
|
||||
</clr-tooltip-content>
|
||||
</ng-container>
|
||||
</clr-tooltip>
|
||||
</clr-tree-node>
|
||||
</clr-tree-node>
|
||||
@ -124,12 +128,20 @@
|
||||
size="60"
|
||||
class="is-info icon-dc-fill"
|
||||
></clr-icon>
|
||||
<h3 *ngIf="treeNodeLibraries?.length! > 0" class="text-center color-gray">
|
||||
<p
|
||||
*ngIf="treeNodeLibraries?.length! > 0"
|
||||
class="text-center color-gray mt-10"
|
||||
cds-text="section"
|
||||
>
|
||||
Please select a table
|
||||
</h3>
|
||||
<h3 *ngIf="treeNodeLibraries?.length! < 1" class="text-center color-gray">
|
||||
</p>
|
||||
<p
|
||||
*ngIf="treeNodeLibraries?.length! < 1"
|
||||
class="text-center color-gray mt-10"
|
||||
cds-text="section"
|
||||
>
|
||||
No Editable Tables Configured
|
||||
</h3>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1,15 +1,18 @@
|
||||
import { NgModule } from '@angular/core'
|
||||
import { CommonModule } from '@angular/common'
|
||||
import { HomeComponent } from './home.component'
|
||||
import { ClarityModule } from '@clr/angular'
|
||||
import { NgModule } from '@angular/core'
|
||||
import { FormsModule } from '@angular/forms'
|
||||
import { ClarityModule } from '@clr/angular'
|
||||
import { AppSharedModule } from '../app-shared.module'
|
||||
import { DcTreeModule } from '../shared/dc-tree/dc-tree.module'
|
||||
import { DirectivesModule } from '../directives/directives.module'
|
||||
import { HomeRouteComponent } from '../routes/home-route/home-route.component'
|
||||
import { DcTreeModule } from '../shared/dc-tree/dc-tree.module'
|
||||
import { HomeRoutingModule } from './home-routing.module'
|
||||
import { HomeComponent } from './home.component'
|
||||
|
||||
@NgModule({
|
||||
declarations: [HomeComponent],
|
||||
declarations: [HomeComponent, HomeRouteComponent],
|
||||
imports: [
|
||||
HomeRoutingModule,
|
||||
FormsModule,
|
||||
ClarityModule,
|
||||
AppSharedModule,
|
||||
|
@ -2,147 +2,152 @@
|
||||
<div class="card-header">Licencing</div>
|
||||
|
||||
<div [ngSwitch]="action" class="card-block">
|
||||
<ng-container *ngSwitchCase="'key'">
|
||||
<p class="key-error" *ngIf="!keyError">
|
||||
Licence key is invalid. We can't provide you more details at the moment
|
||||
<div class="card-text">
|
||||
<ng-container *ngSwitchCase="'key'">
|
||||
<p class="key-error" *ngIf="!keyError">
|
||||
Licence key is invalid. We can't provide you more details at the
|
||||
moment
|
||||
</p>
|
||||
|
||||
<p
|
||||
class="key-error"
|
||||
*ngIf="keyError"
|
||||
[innerHTML]="licenseErrors[keyError]"
|
||||
></p>
|
||||
|
||||
<p *ngIf="errorDetails"><strong>Details:</strong> {{ errorDetails }}</p>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngSwitchCase="'limit'">
|
||||
<p class="key-error">
|
||||
The registered number of users reached the limit specified for your
|
||||
licence. Please contact
|
||||
<contact-link classes="color-green" />
|
||||
or your reseller to arrange additional licences for this product.
|
||||
</p>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngSwitchCase="'update'">
|
||||
<p class="key-error">
|
||||
Update the license key by uploading the licence file or by pasting a
|
||||
license key and activation key in the inputs below.
|
||||
</p>
|
||||
</ng-container>
|
||||
|
||||
<p>
|
||||
<strong>SYSSITE:</strong>
|
||||
<span
|
||||
*ngFor="let id of syssite.value; let i = index"
|
||||
[class.misskey]="missmatchedKey && missmatchedKey === id"
|
||||
>
|
||||
{{ id }}{{ i === syssite.value?.length! - 1 ? '' : ',' }}
|
||||
</span>
|
||||
|
||||
<a
|
||||
class="tooltip tooltip-md tooltip-top-right"
|
||||
(click)="copySyssite(copyIcon, copyTooltip, syssite.value || [])"
|
||||
>
|
||||
<clr-icon
|
||||
#copyIcon
|
||||
class="cursor-pointer"
|
||||
shape="copy"
|
||||
size="15"
|
||||
></clr-icon>
|
||||
<span #copyTooltip class="tooltip-content">Copy to clipboard</span>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<p
|
||||
class="key-error"
|
||||
*ngIf="keyError"
|
||||
[innerHTML]="licenseErrors[keyError]"
|
||||
></p>
|
||||
|
||||
<p *ngIf="errorDetails"><strong>Details:</strong> {{ errorDetails }}</p>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngSwitchCase="'limit'">
|
||||
<p class="key-error">
|
||||
The registered number of users reached the limit specified for your
|
||||
licence. Please contact
|
||||
<contact-link classes="color-green" />
|
||||
or your reseller to arrange additional licences for this product.
|
||||
<p *ngIf="licenseKeyData && userCountLimitation" class="m-0">
|
||||
<strong>Allowed users:</strong>
|
||||
{{ licenseKeyData.users_allowed }}
|
||||
</p>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngSwitchCase="'update'">
|
||||
<p class="key-error">
|
||||
Update the license key by uploading the licence file or by pasting a
|
||||
license key and activation key in the inputs below.
|
||||
</p>
|
||||
</ng-container>
|
||||
|
||||
<p>
|
||||
<strong>SYSSITE:</strong>
|
||||
<span
|
||||
*ngFor="let id of syssite.value; let i = index"
|
||||
[class.misskey]="missmatchedKey && missmatchedKey === id"
|
||||
>
|
||||
{{ id }}{{ i === syssite.value?.length! - 1 ? '' : ',' }}
|
||||
</span>
|
||||
|
||||
<a
|
||||
class="tooltip tooltip-md tooltip-top-right"
|
||||
(click)="copySyssite(copyIcon, copyTooltip, syssite.value || [])"
|
||||
>
|
||||
<clr-icon
|
||||
#copyIcon
|
||||
class="cursor-pointer"
|
||||
shape="copy"
|
||||
size="15"
|
||||
></clr-icon>
|
||||
<span #copyTooltip class="tooltip-content">Copy to clipboard</span>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<p *ngIf="licenseKeyData && userCountLimitation" class="m-0">
|
||||
<strong>Allowed users:</strong>
|
||||
{{ licenseKeyData.users_allowed }}
|
||||
</p>
|
||||
|
||||
<clr-tabs>
|
||||
<clr-tab>
|
||||
<button clrTabLink>Upload licence</button>
|
||||
<clr-tab-content>
|
||||
<input
|
||||
#licenceFile
|
||||
(change)="onFileCapture($event)"
|
||||
type="file"
|
||||
hidden
|
||||
/>
|
||||
<div
|
||||
(click)="licenceFile.click()"
|
||||
appFileDrop
|
||||
(fileDrop)="onFileCapture($event, true)"
|
||||
class="drop-area"
|
||||
>
|
||||
<clr-spinner
|
||||
class="spinner-sm"
|
||||
*ngIf="licenceFileLoading"
|
||||
></clr-spinner>
|
||||
<ng-container *ngIf="!licenceFileLoading">
|
||||
<div *ngIf="licencefile.filename === ''">
|
||||
Drop / Browse licence file
|
||||
</div>
|
||||
<div *ngIf="licencefile.filename !== ''">
|
||||
Selected file: <strong>{{ licencefile.filename }}</strong>
|
||||
</div>
|
||||
<div *ngIf="licenceFileError">
|
||||
<strong>{{ licenceFileError }}</strong>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</clr-tab-content>
|
||||
</clr-tab>
|
||||
|
||||
<clr-tab>
|
||||
<button clrTabLink>Paste licence</button>
|
||||
<clr-tab-content>
|
||||
<form class="clr-form license-key-form">
|
||||
<p>Licence key:</p>
|
||||
<div class="clr-control-container">
|
||||
<textarea
|
||||
[(ngModel)]="licenceKeyValue"
|
||||
(mouseleave)="trimKeys()"
|
||||
name="license-key-area"
|
||||
placeholder="Paste licence key here"
|
||||
class="clr-textarea"
|
||||
></textarea>
|
||||
<clr-tabs>
|
||||
<clr-tab>
|
||||
<button clrTabLink>Upload licence</button>
|
||||
<clr-tab-content>
|
||||
<input
|
||||
#licenceFile
|
||||
(change)="onFileCapture($event)"
|
||||
type="file"
|
||||
hidden
|
||||
/>
|
||||
<div
|
||||
(click)="licenceFile.click()"
|
||||
appFileDrop
|
||||
(fileDrop)="onFileCapture($event, true)"
|
||||
class="drop-area"
|
||||
>
|
||||
<clr-spinner
|
||||
class="spinner-sm"
|
||||
*ngIf="licenceFileLoading"
|
||||
></clr-spinner>
|
||||
<ng-container *ngIf="!licenceFileLoading">
|
||||
<div *ngIf="licencefile.filename === ''">
|
||||
Drop / Browse licence file
|
||||
</div>
|
||||
<div *ngIf="licencefile.filename !== ''">
|
||||
Selected file: <strong>{{ licencefile.filename }}</strong>
|
||||
</div>
|
||||
<div *ngIf="licenceFileError">
|
||||
<strong>{{ licenceFileError }}</strong>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</form>
|
||||
</clr-tab-content>
|
||||
</clr-tab>
|
||||
|
||||
<form class="clr-form activation-key-form">
|
||||
<p>Activation key:</p>
|
||||
<div class="clr-control-container">
|
||||
<textarea
|
||||
[(ngModel)]="activationKeyValue"
|
||||
(mouseleave)="trimKeys()"
|
||||
name="activation-key-area"
|
||||
placeholder="Paste activation key here"
|
||||
class="clr-textarea"
|
||||
></textarea>
|
||||
</div>
|
||||
</form>
|
||||
</clr-tab-content>
|
||||
</clr-tab>
|
||||
</clr-tabs>
|
||||
<clr-tab>
|
||||
<button clrTabLink>Paste licence</button>
|
||||
<clr-tab-content>
|
||||
<form class="clr-form license-key-form">
|
||||
<p>Licence key:</p>
|
||||
<div class="clr-control-container">
|
||||
<textarea
|
||||
[(ngModel)]="licenceKeyValue"
|
||||
(mouseleave)="trimKeys()"
|
||||
name="license-key-area"
|
||||
placeholder="Paste licence key here"
|
||||
class="clr-textarea"
|
||||
></textarea>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<button
|
||||
(click)="applyKeys()"
|
||||
class="btn btn-primary apply-keys"
|
||||
[clrLoading]="applyingKeys"
|
||||
[disabled]="disableApplyButton"
|
||||
>
|
||||
Apply licence keys
|
||||
</button>
|
||||
<form class="clr-form activation-key-form">
|
||||
<p>Activation key:</p>
|
||||
<div class="clr-control-container">
|
||||
<textarea
|
||||
[(ngModel)]="activationKeyValue"
|
||||
(mouseleave)="trimKeys()"
|
||||
name="activation-key-area"
|
||||
placeholder="Paste activation key here"
|
||||
class="clr-textarea"
|
||||
></textarea>
|
||||
</div>
|
||||
</form>
|
||||
</clr-tab-content>
|
||||
</clr-tab>
|
||||
</clr-tabs>
|
||||
</div>
|
||||
|
||||
<button
|
||||
*ngIf="isAppFreeTier.value"
|
||||
routerLink="/"
|
||||
class="btn btn-sm btn-link"
|
||||
>
|
||||
Continue with free tier
|
||||
</button>
|
||||
<div class="card-footer d-flex clr-align-items-center">
|
||||
<button
|
||||
(click)="applyKeys()"
|
||||
class="btn btn-primary apply-keys"
|
||||
[clrLoading]="applyingKeys"
|
||||
[disabled]="disableApplyButton"
|
||||
>
|
||||
Apply licence keys
|
||||
</button>
|
||||
|
||||
<button
|
||||
*ngIf="isAppFreeTier.value"
|
||||
routerLink="/"
|
||||
class="btn btn-sm btn-link"
|
||||
>
|
||||
Continue with free tier
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -33,7 +33,6 @@
|
||||
|
||||
.apply-keys {
|
||||
height: 40px;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
.drop-area {
|
||||
|
@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'
|
||||
import { ActivatedRoute, Router } from '@angular/router'
|
||||
import { AppService, LicenceService, SasService } from '../services'
|
||||
import { LicenseKeyData } from '../models/LicenseKeyData'
|
||||
import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapperResponse'
|
||||
|
||||
enum LicenseActions {
|
||||
key = 'key',
|
||||
@ -116,8 +117,12 @@ export class LicensingComponent implements OnInit {
|
||||
|
||||
this.sasService
|
||||
.request('admin/registerkey', table)
|
||||
.then((res: any) => {
|
||||
if (res.return && res.return[0] && res.return[0].MSG === 'SUCCESS') {
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
if (
|
||||
res.adapterResponse.return &&
|
||||
res.adapterResponse.return[0] &&
|
||||
res.adapterResponse.return[0].MSG === 'SUCCESS'
|
||||
) {
|
||||
location.replace(location.href.split('#')[0])
|
||||
}
|
||||
})
|
||||
|
@ -3,6 +3,7 @@
|
||||
<clr-tree-node *ngIf="libraryList" class="search-node">
|
||||
<div class="tree-search-wrapper">
|
||||
<input
|
||||
appStealFocus
|
||||
clrInput
|
||||
#searchLibTreeInput
|
||||
placeholder="Libraries"
|
||||
@ -42,6 +43,7 @@
|
||||
<clr-tree-node *ngIf="library['tables']" class="search-node">
|
||||
<div class="tree-search-wrapper">
|
||||
<input
|
||||
appStealFocus
|
||||
clrInput
|
||||
#searchTreeInput
|
||||
placeholder="Tables"
|
||||
@ -85,6 +87,7 @@
|
||||
<clr-tree-node *ngIf="libTable['columns']" class="search-node">
|
||||
<div class="tree-search-wrapper">
|
||||
<input
|
||||
appStealFocus
|
||||
clrInput
|
||||
#searchTreeInput
|
||||
placeholder="Columns"
|
||||
@ -138,7 +141,9 @@
|
||||
size="60"
|
||||
class="is-info icon-dc-fill"
|
||||
></clr-icon>
|
||||
<h3 class="text-center color-gray">Please select a column or table</h3>
|
||||
<p class="text-center color-gray mt-10" cds-text="section">
|
||||
Please select a column or table
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<ng-container *ngIf="column || table">
|
||||
@ -180,13 +185,13 @@
|
||||
<button
|
||||
(click)="limitDotDepth = true"
|
||||
type="button"
|
||||
class="btn btn-outline"
|
||||
class="btn btn-outline mr-5"
|
||||
>
|
||||
Limit depth
|
||||
</button>
|
||||
|
||||
<!-- <button class="btn btn-outline" (click)='showSvg()'> Open in New Tab </button> -->
|
||||
<div class="btn-group d-block">
|
||||
<div class="btn-group direction d-block">
|
||||
<div
|
||||
class="radio btn"
|
||||
(click)="
|
||||
|
@ -1,6 +1,8 @@
|
||||
@import '../../colors.scss';
|
||||
|
||||
.toggle-switch input[type=checkbox]:checked+label:before {
|
||||
border-color: #314351;
|
||||
background-color: #314351!important;
|
||||
border-color: $headerBackground;
|
||||
background-color: $headerBackground !important;
|
||||
transition: .15s ease-in;
|
||||
transition-property: border-color,background-color;
|
||||
}
|
||||
@ -41,6 +43,10 @@ clr-tree-node button {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.btn-group.direction {
|
||||
margin-left: var(--cds-global-space-6);
|
||||
}
|
||||
|
||||
.graph-render-spinner {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
|
@ -9,6 +9,7 @@ import { SasService } from '../services/sas.service'
|
||||
import * as saveSvg from 'save-svg-as-png'
|
||||
import { LoggerService } from '../services/logger.service'
|
||||
import { LicenceService } from '../services/licence.service'
|
||||
import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapperResponse'
|
||||
const moment = require('moment')
|
||||
|
||||
@Component({
|
||||
@ -115,8 +116,8 @@ export class LineageComponent {
|
||||
|
||||
await this.sasService
|
||||
.request('lineage/getmetacols', libTable)
|
||||
.then((res: any) => {
|
||||
this.columnsList = res.metacols
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.columnsList = res.adapterResponse.metacols
|
||||
if (this.columnsList && this.columnsList.length > 0) {
|
||||
// this.column = this.columnsList[0]['COLURI']
|
||||
|
||||
@ -174,8 +175,8 @@ export class LineageComponent {
|
||||
let libTable = { SASControlTable: [{ liburi: $event }] }
|
||||
await this.sasService
|
||||
.request('lineage/getmetatables', libTable)
|
||||
.then((res: any) => {
|
||||
this.tablesList = res.metatables
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.tablesList = res.adapterResponse.metatables
|
||||
|
||||
if (this.tablesList && this.tablesList.length > 0) {
|
||||
library['tables'] = this.tablesList
|
||||
@ -295,8 +296,8 @@ export class LineageComponent {
|
||||
} else {
|
||||
await this.sasService
|
||||
.request('public/viewlibs', null)
|
||||
.then((res: any) => {
|
||||
this.libraryList = res.saslibs
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.libraryList = res.adapterResponse.saslibs
|
||||
this.helperService.displayLibraries(this.libraryList)
|
||||
|
||||
if (this.libraryList) {
|
||||
@ -402,8 +403,8 @@ export class LineageComponent {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
this.sasService
|
||||
.request('lineage/fetchtablelineage', libTable)
|
||||
.then(async (res: any) => {
|
||||
if (res.flatdata.length > 0) {
|
||||
.then(async (res: RequestWrapperResponse) => {
|
||||
if (res.adapterResponse.flatdata.length > 0) {
|
||||
if (this.licenceService.checkLineageLimit()) {
|
||||
this.eventService.showInfoModal(
|
||||
'Notice',
|
||||
@ -421,20 +422,22 @@ export class LineageComponent {
|
||||
}
|
||||
|
||||
this.lineageTableName =
|
||||
res.info[0].LIBREF + '.' + res.info[0].TABLENAME
|
||||
res.adapterResponse.info[0].LIBREF +
|
||||
'.' +
|
||||
res.adapterResponse.info[0].TABLENAME
|
||||
|
||||
let dotArray = res.finalfinal
|
||||
let dotArray = res.adapterResponse.finalfinal
|
||||
let vizTmp: string = ''
|
||||
|
||||
for (let i = 0; i < dotArray.length; i++) {
|
||||
vizTmp += unescape(dotArray[i].LINE) + '\n'
|
||||
}
|
||||
|
||||
this.flatdata = res.flatdata
|
||||
this.flatdata = res.adapterResponse.flatdata
|
||||
|
||||
if (this.libraryList) {
|
||||
let libraryToSelect = this.libraryList.find((library: any) =>
|
||||
res.info[0].LIBURI.toUpperCase().includes(
|
||||
res.adapterResponse.info[0].LIBURI.toUpperCase().includes(
|
||||
library.LIBRARYID.toUpperCase()
|
||||
)
|
||||
)
|
||||
@ -450,7 +453,7 @@ export class LineageComponent {
|
||||
if (libraryToSelect['tables']) {
|
||||
tableToSelect = libraryToSelect['tables'].find((table: any) =>
|
||||
table.TABLEURI.toUpperCase().includes(
|
||||
res.info[0].TABLEID.toUpperCase()
|
||||
res.adapterResponse.info[0].TABLEID.toUpperCase()
|
||||
)
|
||||
)
|
||||
|
||||
@ -495,10 +498,10 @@ export class LineageComponent {
|
||||
.replace(/\sds:/g, '\nds:')
|
||||
.replace(/\s\n/g, '\n')
|
||||
|
||||
this.idlookup = res.idlookup
|
||||
this.idlookup = res.adapterResponse.idlookup
|
||||
|
||||
if (res.finalfinal.length > this.largeDotFileLimit) {
|
||||
this.largeDotFileLines = res.finalfinal.length
|
||||
if (res.adapterResponse.finalfinal.length > this.largeDotFileLimit) {
|
||||
this.largeDotFileLines = res.adapterResponse.finalfinal.length
|
||||
} else {
|
||||
this.buildGraph()
|
||||
}
|
||||
@ -619,8 +622,8 @@ export class LineageComponent {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
this.sasService
|
||||
.request('lineage/fetchcollineage', libTable)
|
||||
.then(async (res: any) => {
|
||||
if (res.flatdata.length > 0) {
|
||||
.then(async (res: RequestWrapperResponse) => {
|
||||
if (res.adapterResponse.flatdata.length > 0) {
|
||||
if (this.licenceService.checkLineageLimit()) {
|
||||
this.eventService.showInfoModal(
|
||||
'Notice',
|
||||
@ -631,18 +634,21 @@ export class LineageComponent {
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof res === 'string') {
|
||||
if (typeof res.adapterResponse === 'string') {
|
||||
this.vizInput = 'digraph G {SAS Error}'
|
||||
this.buildGraph()
|
||||
return
|
||||
}
|
||||
|
||||
this.lineageTableName = res.info[0].LIBREF + '.' + res.info[0].TABNAME
|
||||
this.lineageColumnName = res.info[0].COLNAME
|
||||
this.lineageTableName =
|
||||
res.adapterResponse.info[0].LIBREF +
|
||||
'.' +
|
||||
res.adapterResponse.info[0].TABNAME
|
||||
this.lineageColumnName = res.adapterResponse.info[0].COLNAME
|
||||
|
||||
this.idlookup = res.idlookup
|
||||
this.idlookup = res.adapterResponse.idlookup
|
||||
|
||||
let dotArray = res.fromsas
|
||||
let dotArray = res.adapterResponse.fromsas
|
||||
let vizTmp: string = ''
|
||||
for (let i = 0; i < dotArray.length; i++) {
|
||||
vizTmp += unescape(dotArray[i].STRING) + '\n'
|
||||
@ -653,14 +659,13 @@ export class LineageComponent {
|
||||
.replace(/\sds:/g, '\nds:')
|
||||
.replace(/\s\n/g, '\n')
|
||||
|
||||
this.flatdata = res.flatdata
|
||||
this.flatdata = res.adapterResponse.flatdata
|
||||
|
||||
if (this.libraryList) {
|
||||
let libraryToSelect = this.libraryList.find(
|
||||
(library: any) =>
|
||||
res.info[0]?.LIBURI?.toUpperCase()?.includes(
|
||||
library?.LIBRARYID?.toUpperCase()
|
||||
)
|
||||
let libraryToSelect = this.libraryList.find((library: any) =>
|
||||
res.adapterResponse.info[0]?.LIBURI?.toUpperCase()?.includes(
|
||||
library?.LIBRARYID?.toUpperCase()
|
||||
)
|
||||
)
|
||||
|
||||
let tableToSelect: any
|
||||
@ -673,7 +678,8 @@ export class LineageComponent {
|
||||
|
||||
if (libraryToSelect['tables']) {
|
||||
tableToSelect = libraryToSelect['tables'].find(
|
||||
(table: any) => table.TABLEURI === res.info[0].TABURI
|
||||
(table: any) =>
|
||||
table.TABLEURI === res.adapterResponse.info[0].TABURI
|
||||
)
|
||||
|
||||
if (tableToSelect) {
|
||||
@ -715,8 +721,8 @@ export class LineageComponent {
|
||||
}
|
||||
}
|
||||
|
||||
if (res.fromsas.length > this.largeDotFileLimit) {
|
||||
this.largeDotFileLines = res.fromsas.length
|
||||
if (res.adapterResponse.fromsas.length > this.largeDotFileLimit) {
|
||||
this.largeDotFileLines = res.adapterResponse.fromsas.length
|
||||
} else {
|
||||
this.buildGraph()
|
||||
}
|
||||
|
@ -22,6 +22,7 @@
|
||||
<clr-tree-node *ngIf="metaDataList" class="search-node">
|
||||
<div class="tree-search-wrapper">
|
||||
<input
|
||||
appStealFocus
|
||||
clrInput
|
||||
#searchLibTreeInput
|
||||
placeholder="search SAS Types"
|
||||
@ -72,7 +73,9 @@
|
||||
size="60"
|
||||
class="is-info icon-dc-fill"
|
||||
></clr-icon>
|
||||
<h3 class="text-center color-gray">Please select a type</h3>
|
||||
<p class="text-center color-gray mt-10" cds-text="section">
|
||||
Please select a type
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="loadingSpinner" *ngIf="loading">
|
||||
@ -123,12 +126,18 @@
|
||||
[class.object-header]="!entry.count"
|
||||
class="full-width"
|
||||
>
|
||||
<clr-icon
|
||||
*ngIf="!entry.count"
|
||||
shape="rack-server"
|
||||
></clr-icon>
|
||||
<clr-icon *ngIf="entry.count" shape="block"></clr-icon>
|
||||
{{ entry.display }}
|
||||
<div>
|
||||
<clr-icon
|
||||
*ngIf="!entry.count"
|
||||
shape="rack-server"
|
||||
></clr-icon>
|
||||
<clr-icon
|
||||
*ngIf="entry.count"
|
||||
shape="block"
|
||||
></clr-icon>
|
||||
{{ entry.display }}
|
||||
</div>
|
||||
|
||||
<p class="float-right object-uri" *ngIf="!entry.count">
|
||||
{{ entry.URI }}
|
||||
</p>
|
||||
@ -163,9 +172,15 @@
|
||||
[clrExpandable]="true"
|
||||
>
|
||||
<div [class.object-header]="!entry.count" class="full-width">
|
||||
<clr-icon *ngIf="!entry.count" shape="rack-server"></clr-icon>
|
||||
<clr-icon *ngIf="entry.count" shape="block"></clr-icon>
|
||||
{{ entry.display }}
|
||||
<div>
|
||||
<clr-icon
|
||||
*ngIf="!entry.count"
|
||||
shape="rack-server"
|
||||
></clr-icon>
|
||||
<clr-icon *ngIf="entry.count" shape="block"></clr-icon>
|
||||
{{ entry.display }}
|
||||
</div>
|
||||
|
||||
<p class="float-right object-uri" *ngIf="!entry.count">
|
||||
{{ entry.URI }}
|
||||
</p>
|
||||
|
@ -1,14 +1,27 @@
|
||||
::ng-deep body[cds-theme="dark"] {
|
||||
.object-header:hover {
|
||||
background-color: #405560;
|
||||
}
|
||||
}
|
||||
|
||||
::ng-deep body[cds-theme="light"] {
|
||||
.objects-col {
|
||||
background: white;
|
||||
}
|
||||
|
||||
.object-header:hover {
|
||||
background-color: #d8e3e9;
|
||||
}
|
||||
}
|
||||
|
||||
.objects-col{
|
||||
height: 75vh;
|
||||
overflow: scroll;
|
||||
border: 1px solid #cccccc;
|
||||
background: white;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.cols-head {
|
||||
background: #fafafa;
|
||||
border: 1px solid #cccccc;
|
||||
padding: 10px;
|
||||
display: flex;
|
||||
@ -40,11 +53,13 @@
|
||||
margin-top: 5px;
|
||||
}
|
||||
.object-header{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-left: 3px;
|
||||
padding-right: 3px;
|
||||
}
|
||||
.object-header:hover{
|
||||
background-color: #d8e3e9;
|
||||
border-radius: 3px;
|
||||
}
|
||||
.datagrid-host{
|
||||
|
@ -9,6 +9,7 @@ import { SasService } from '../services/sas.service'
|
||||
import { globals } from '../_globals'
|
||||
|
||||
import { Injectable } from '@angular/core'
|
||||
import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapperResponse'
|
||||
|
||||
interface MetaData {
|
||||
NAME: any
|
||||
@ -109,44 +110,52 @@ export class MetadataComponent implements OnInit {
|
||||
this.metatypesLoading = false
|
||||
this.metaDataSearch = globals.metadata.metaDataSearch
|
||||
} else {
|
||||
this.sasService.request('metanav/metatypes', null).then((res: any) => {
|
||||
this.metaDataList = res.types
|
||||
globals.metadata.metaDataList = this.metaDataList
|
||||
this.loading = false
|
||||
this.metatypesLoading = false
|
||||
})
|
||||
this.sasService
|
||||
.request('metanav/metatypes', null)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.metaDataList = res.adapterResponse.types
|
||||
globals.metadata.metaDataList = this.metaDataList
|
||||
this.loading = false
|
||||
this.metatypesLoading = false
|
||||
})
|
||||
|
||||
this.sasService.request('metanav/metarepos', null).then((res: any) => {
|
||||
let foundation = false
|
||||
this.repositories = []
|
||||
for (let index = 0; index < res.outrepos.length; index++) {
|
||||
this.repositories.push(res.outrepos[index].NAME)
|
||||
if (res.outrepos[index].NAME === 'Foundation') {
|
||||
foundation = true
|
||||
this.sasService
|
||||
.request('metanav/metarepos', null)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
let foundation = false
|
||||
this.repositories = []
|
||||
for (
|
||||
let index = 0;
|
||||
index < res.adapterResponse.outrepos.length;
|
||||
index++
|
||||
) {
|
||||
this.repositories.push(res.adapterResponse.outrepos[index].NAME)
|
||||
if (res.adapterResponse.outrepos[index].NAME === 'Foundation') {
|
||||
foundation = true
|
||||
}
|
||||
}
|
||||
}
|
||||
if (foundation) {
|
||||
this.repository = 'Foundation'
|
||||
} else {
|
||||
this.repository = res.outrepos[0].NAME
|
||||
}
|
||||
globals.metadata.metaRepositories = this.repositories
|
||||
globals.metadata.selectedRepository = this.repository
|
||||
if (this.objectRoute) {
|
||||
this.eventService.closeSidebar()
|
||||
this.showData = true
|
||||
let name = ''
|
||||
let id = this.route.snapshot.params['objectID']
|
||||
// let temp = this.router.url.split("%20").join(" ").split("/").reverse();
|
||||
this.metaObjectList = []
|
||||
this.metaObjectList.push({ ID: id, NAME: name })
|
||||
this.metaObjectShowList = this.metaObjectList
|
||||
this.metaObjectOnClick(
|
||||
this.metaObjectShowList[0].ID,
|
||||
this.metaObjectShowList[0]
|
||||
)
|
||||
}
|
||||
})
|
||||
if (foundation) {
|
||||
this.repository = 'Foundation'
|
||||
} else {
|
||||
this.repository = res.adapterResponse.outrepos[0].NAME
|
||||
}
|
||||
globals.metadata.metaRepositories = this.repositories
|
||||
globals.metadata.selectedRepository = this.repository
|
||||
if (this.objectRoute) {
|
||||
this.eventService.closeSidebar()
|
||||
this.showData = true
|
||||
let name = ''
|
||||
let id = this.route.snapshot.params['objectID']
|
||||
// let temp = this.router.url.split("%20").join(" ").split("/").reverse();
|
||||
this.metaObjectList = []
|
||||
this.metaObjectList.push({ ID: id, NAME: name })
|
||||
this.metaObjectShowList = this.metaObjectList
|
||||
this.metaObjectOnClick(
|
||||
this.metaObjectShowList[0].ID,
|
||||
this.metaObjectShowList[0]
|
||||
)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@ -183,56 +192,64 @@ export class MetadataComponent implements OnInit {
|
||||
const data: any = {
|
||||
SASControlTable: [{ metatype: $event, repo: this.repository }]
|
||||
}
|
||||
this.sasService.request('metanav/metaobjects', data).then((res: any) => {
|
||||
this.metaObjectList = res.objects
|
||||
this.getMetaObjectAttributes(this.metaObjectSize)
|
||||
this.loading = false
|
||||
this.assoTypeSelected = $event
|
||||
this.eventService.closeSidebar()
|
||||
this.showData = true
|
||||
})
|
||||
this.sasService
|
||||
.request('metanav/metaobjects', data)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.metaObjectList = res.adapterResponse.objects
|
||||
this.getMetaObjectAttributes(this.metaObjectSize)
|
||||
this.loading = false
|
||||
this.assoTypeSelected = $event
|
||||
this.eventService.closeSidebar()
|
||||
this.showData = true
|
||||
})
|
||||
}
|
||||
|
||||
public async selectmetaObject($event: any, metaData?: any) {
|
||||
let data: any = {
|
||||
SASControlTable: [{ objecturi: $event }]
|
||||
}
|
||||
this.sasService.request('metanav/metadetails', data).then((res: any) => {
|
||||
this.metaObjectAssociations = res.associations
|
||||
this.root$ = of(this.getAssosiationsCount(res.associations))
|
||||
this.showAcc = true
|
||||
this.showTable = true
|
||||
let metaObjectName = res.attributes.find(
|
||||
(x: any) => x.NAME === 'Name'
|
||||
).VALUE
|
||||
this.assoObjectSelected = metaObjectName
|
||||
metaData.NAME = metaObjectName
|
||||
let url = this.router.url
|
||||
if (this.objectRoute) {
|
||||
// this.location.replaceState(url.slice(0, url.lastIndexOf("object")) + "object/" + $event.slice(1 + $event.indexOf("\\")) + "/" + escape(metaData.NAME));
|
||||
this.location.replaceState(
|
||||
url.slice(0, url.lastIndexOf('object')) +
|
||||
'object/' +
|
||||
$event.slice(1 + $event.indexOf('\\'))
|
||||
this.sasService
|
||||
.request('metanav/metadetails', data)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.metaObjectAssociations = res.adapterResponse.associations
|
||||
this.root$ = of(
|
||||
this.getAssosiationsCount(res.adapterResponse.associations)
|
||||
)
|
||||
} else {
|
||||
// this.location.replaceState(url + "/object/" + $event.slice(1 + $event.indexOf("\\")) + "/" + escape(metaData.NAME));
|
||||
this.location.replaceState(
|
||||
url + '/object/' + $event.slice(1 + $event.indexOf('\\'))
|
||||
)
|
||||
}
|
||||
this.metaObjectAttributes = res.attributes
|
||||
})
|
||||
this.showAcc = true
|
||||
this.showTable = true
|
||||
let metaObjectName = res.adapterResponse.attributes.find(
|
||||
(x: any) => x.NAME === 'Name'
|
||||
).VALUE
|
||||
this.assoObjectSelected = metaObjectName
|
||||
metaData.NAME = metaObjectName
|
||||
let url = this.router.url
|
||||
if (this.objectRoute) {
|
||||
// this.location.replaceState(url.slice(0, url.lastIndexOf("object")) + "object/" + $event.slice(1 + $event.indexOf("\\")) + "/" + escape(metaData.NAME));
|
||||
this.location.replaceState(
|
||||
url.slice(0, url.lastIndexOf('object')) +
|
||||
'object/' +
|
||||
$event.slice(1 + $event.indexOf('\\'))
|
||||
)
|
||||
} else {
|
||||
// this.location.replaceState(url + "/object/" + $event.slice(1 + $event.indexOf("\\")) + "/" + escape(metaData.NAME));
|
||||
this.location.replaceState(
|
||||
url + '/object/' + $event.slice(1 + $event.indexOf('\\'))
|
||||
)
|
||||
}
|
||||
this.metaObjectAttributes = res.adapterResponse.attributes
|
||||
})
|
||||
}
|
||||
|
||||
public async selectAssosiationsDetails($event: any, metaData?: any) {
|
||||
let data: any = {
|
||||
SASControlTable: [{ objecturi: $event }]
|
||||
}
|
||||
this.sasService.request('metanav/metadetails', data).then((res: any) => {
|
||||
this.metaObjectAttributes = res.attributes
|
||||
this.showTable = true
|
||||
})
|
||||
this.sasService
|
||||
.request('metanav/metadetails', data)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.metaObjectAttributes = res.adapterResponse.attributes
|
||||
this.showTable = true
|
||||
})
|
||||
}
|
||||
|
||||
public getAssosiationsCount(assosiationList: Array<any>) {
|
||||
@ -244,7 +261,7 @@ export class MetadataComponent implements OnInit {
|
||||
details: []
|
||||
})
|
||||
}
|
||||
let assocObj = assosiationsHash.get(assosiation.ASSOC)
|
||||
let assocObj: any = assosiationsHash.get(assosiation.ASSOC)
|
||||
assocObj.count++
|
||||
assocObj.details.push({
|
||||
ASSOCURI: assosiation.ASSOCURI,
|
||||
@ -254,7 +271,7 @@ export class MetadataComponent implements OnInit {
|
||||
})
|
||||
}
|
||||
let assocGrouped: Array<any> = []
|
||||
assosiationsHash.forEach(function (val, key) {
|
||||
assosiationsHash.forEach(function (val: any, key) {
|
||||
assocGrouped.push({
|
||||
ASSOC: key,
|
||||
count: val.count,
|
||||
@ -294,9 +311,9 @@ export class MetadataComponent implements OnInit {
|
||||
}
|
||||
return this.sasService
|
||||
.request('metanav/metadetails', data)
|
||||
.then((res: any) => {
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.showTable = true
|
||||
this.metaObjectAttributes = res.attributes
|
||||
this.metaObjectAttributes = res.adapterResponse.attributes
|
||||
this.assoObjectSelected = asso.NAME
|
||||
let url = this.router.url
|
||||
if (this.objectRoute) {
|
||||
@ -314,7 +331,7 @@ export class MetadataComponent implements OnInit {
|
||||
asso.ASSOCURI.slice(1 + asso.ASSOCURI.indexOf('\\'))
|
||||
)
|
||||
}
|
||||
return this.getAssosiationsCount(res.associations)
|
||||
return this.getAssosiationsCount(res.adapterResponse.associations)
|
||||
})
|
||||
}
|
||||
|
||||
|
9
client/src/app/models/AppSettings.ts
Normal file
9
client/src/app/models/AppSettings.ts
Normal file
@ -0,0 +1,9 @@
|
||||
export interface AppSettings {
|
||||
persistSelectedTheme: boolean
|
||||
selectedTheme: AppThemes
|
||||
}
|
||||
|
||||
export enum AppThemes {
|
||||
light = 'light',
|
||||
dark = 'dark'
|
||||
}
|
1
client/src/app/models/FileUploadEncoding.ts
Normal file
1
client/src/app/models/FileUploadEncoding.ts
Normal file
@ -0,0 +1 @@
|
||||
export type FileUploadEncoding = 'UTF-8' | 'WLATIN1'
|
@ -6,6 +6,7 @@ export interface FilterClause {
|
||||
operators: string[]
|
||||
type: string
|
||||
value: any
|
||||
valueVariable: boolean
|
||||
values: { formatted: string; unformatted: any }[]
|
||||
variable: string
|
||||
}
|
||||
|
29
client/src/app/models/ParseParams.interface.ts
Normal file
29
client/src/app/models/ParseParams.interface.ts
Normal file
@ -0,0 +1,29 @@
|
||||
import { DcValidator } from '../shared/dc-validator/dc-validator'
|
||||
import { FileUploadEncoding } from './FileUploadEncoding'
|
||||
import { FileUploader } from './FileUploader.class'
|
||||
import { ExcelRule } from './TableData'
|
||||
import XLSX from 'xlsx'
|
||||
|
||||
export interface ParseParams {
|
||||
file: File
|
||||
password?: string
|
||||
dcValidator: DcValidator
|
||||
/**
|
||||
* If workbook is provided, parse function will not run a XLSX.read()
|
||||
* it will use this property instead. So the client must do a file read beforehand
|
||||
*/
|
||||
workbook?: XLSX.WorkBook
|
||||
/**
|
||||
* Parse function will manipulate and return the uploader array which can be provided with files already in the queue
|
||||
* Otherwise new empty instance will be created.
|
||||
*/
|
||||
uploader?: FileUploader
|
||||
headerPks: string[]
|
||||
headerArray: string[]
|
||||
headerShow: string[]
|
||||
timeHeaders: string[]
|
||||
dateHeaders: string[]
|
||||
dateTimeHeaders: string[]
|
||||
xlRules: ExcelRule[]
|
||||
encoding?: FileUploadEncoding
|
||||
}
|
15
client/src/app/models/ParseResult.interface.ts
Normal file
15
client/src/app/models/ParseResult.interface.ts
Normal file
@ -0,0 +1,15 @@
|
||||
import { FileUploader } from './FileUploader.class'
|
||||
import FoundRangeInfo from './RangeInfo'
|
||||
|
||||
export interface ParseResult {
|
||||
/**
|
||||
* In case of CSV file, won't be returned
|
||||
*/
|
||||
data?: any[]
|
||||
/**
|
||||
* In case of CSV file, won't be returned
|
||||
*/
|
||||
headerShow?: string[]
|
||||
rangeSheetRes?: FoundRangeInfo
|
||||
uploader: FileUploader
|
||||
}
|
13
client/src/app/models/RangeInfo.ts
Normal file
13
client/src/app/models/RangeInfo.ts
Normal file
@ -0,0 +1,13 @@
|
||||
export default interface FoundRangeInfo {
|
||||
found: boolean
|
||||
sheetName: string
|
||||
rangeStartAddress: string
|
||||
rangeEndAddress: string
|
||||
rangeAddress: string
|
||||
missingHeaders: MissingHeaders[]
|
||||
}
|
||||
|
||||
export interface MissingHeaders {
|
||||
sheetName: string
|
||||
missingHeaders: string[]
|
||||
}
|
13
client/src/app/models/SearchDataExcelResult.interface.ts
Normal file
13
client/src/app/models/SearchDataExcelResult.interface.ts
Normal file
@ -0,0 +1,13 @@
|
||||
import { MissingHeaders } from './RangeInfo'
|
||||
|
||||
export interface SearchDataExcelResult {
|
||||
missing?: MissingHeaders[]
|
||||
found?: {
|
||||
data: any
|
||||
arrayData: any[]
|
||||
sheetName: string
|
||||
headers: string[]
|
||||
startAddress?: string
|
||||
endAddress?: string
|
||||
}
|
||||
}
|
@ -7,4 +7,5 @@ export default interface SheetInfo {
|
||||
missingHeaders: string[]
|
||||
rangeStartRow: number
|
||||
rangeStartCol: number
|
||||
rangeAddress?: string
|
||||
}
|
||||
|
4
client/src/app/models/UploadFile.ts
Normal file
4
client/src/app/models/UploadFile.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export interface UploadFileResponse {
|
||||
adapterResponse: any
|
||||
log?: string
|
||||
}
|
@ -0,0 +1,4 @@
|
||||
export interface RequestWrapperResponse<responseType = any> {
|
||||
adapterResponse: responseType
|
||||
log?: string
|
||||
}
|
@ -4,12 +4,12 @@ import { DQData, SASParam } from '../TableData'
|
||||
import { BaseSASResponse } from './common/BaseSASResponse'
|
||||
import { DataFormat } from './common/DateFormat'
|
||||
|
||||
export interface EditorsGetdataServiceResponse {
|
||||
data: EditorsGetdataSASResponse
|
||||
export interface EditorsGetDataServiceResponse {
|
||||
data: EditorsGetDataSASResponse
|
||||
libds: string
|
||||
}
|
||||
|
||||
export interface EditorsGetdataSASResponse extends BaseSASResponse {
|
||||
export interface EditorsGetDataSASResponse extends BaseSASResponse {
|
||||
$sasdata: $DataFormats
|
||||
sasdata: Sasdata[]
|
||||
sasparams: SASParam[]
|
||||
@ -17,6 +17,7 @@ export interface EditorsGetdataSASResponse extends BaseSASResponse {
|
||||
dqrules: DQRule[]
|
||||
dsmeta: DSMeta[]
|
||||
dqdata: DQData[]
|
||||
versions: Version[]
|
||||
cols: Col[]
|
||||
maxvarlengths: Maxvarlength[]
|
||||
xl_rules: any[]
|
||||
@ -27,6 +28,18 @@ export interface DSMeta {
|
||||
ODS_TABLE: string
|
||||
NAME: string
|
||||
VALUE: string
|
||||
[key: string]: string
|
||||
}
|
||||
|
||||
export interface Version {
|
||||
LOAD_REF: string
|
||||
USER_NM: string
|
||||
VERSION_DTTM: string
|
||||
VERSION_DESC: string
|
||||
CHANGED_RECORDS: number
|
||||
NEW_RECORDS: number
|
||||
DELETED_RECORDS: number
|
||||
[key: string]: string | number
|
||||
}
|
||||
|
||||
export interface Sasdata {
|
||||
|
9
client/src/app/models/sas/editors-restore.model.ts
Normal file
9
client/src/app/models/sas/editors-restore.model.ts
Normal file
@ -0,0 +1,9 @@
|
||||
import { BaseSASResponse } from './common/BaseSASResponse'
|
||||
|
||||
export interface EditorsRestoreServiceResponse extends BaseSASResponse {
|
||||
restore_out: RestoreOut[]
|
||||
}
|
||||
|
||||
export interface RestoreOut {
|
||||
LOADREF: string
|
||||
}
|
34
client/src/app/models/sas/editors-stagedata.model.ts
Normal file
34
client/src/app/models/sas/editors-stagedata.model.ts
Normal file
@ -0,0 +1,34 @@
|
||||
import { BaseSASResponse } from './common/BaseSASResponse'
|
||||
|
||||
export interface EditorsStageDataSASResponse extends BaseSASResponse {
|
||||
SYSDATE: string
|
||||
SYSTIME: string
|
||||
sasparams: Sasparam[]
|
||||
_DEBUG: string
|
||||
_PROGRAM: string
|
||||
AUTOEXEC: string
|
||||
MF_GETUSER: string
|
||||
SYSCC: string
|
||||
SYSENCODING: string
|
||||
SYSERRORTEXT: string
|
||||
SYSHOSTINFOLONG: string
|
||||
SYSHOSTNAME: string
|
||||
SYSPROCESSID: string
|
||||
SYSPROCESSMODE: string
|
||||
SYSPROCESSNAME: string
|
||||
SYSJOBID: string
|
||||
SYSSCPL: string
|
||||
SYSSITE: string
|
||||
SYSTCPIPHOSTNAME: string
|
||||
SYSUSERID: string
|
||||
SYSVLONG: string
|
||||
SYSWARNINGTEXT: string
|
||||
END_DTTM: string
|
||||
MEMSIZE: string
|
||||
}
|
||||
|
||||
export interface Sasparam {
|
||||
STATUS: string | 'SUCCESS'
|
||||
DSID: string
|
||||
URL: string
|
||||
}
|
19
client/src/app/multi-dataset/multi-dataset-routing.module.ts
Normal file
19
client/src/app/multi-dataset/multi-dataset-routing.module.ts
Normal file
@ -0,0 +1,19 @@
|
||||
import { NgModule } from '@angular/core'
|
||||
import { RouterModule, Routes } from '@angular/router'
|
||||
|
||||
import { MultiDatasetRouteComponent } from '../routes/multi-dataset-route/multi-dataset-route.component'
|
||||
import { MultiDatasetComponent } from './multi-dataset.component'
|
||||
|
||||
const routes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
component: MultiDatasetRouteComponent,
|
||||
children: [{ path: '', component: MultiDatasetComponent }]
|
||||
}
|
||||
]
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forChild(routes)],
|
||||
exports: [RouterModule]
|
||||
})
|
||||
export class MultiDatasetRoutingModule {}
|
543
client/src/app/multi-dataset/multi-dataset.component.html
Normal file
543
client/src/app/multi-dataset/multi-dataset.component.html
Normal file
@ -0,0 +1,543 @@
|
||||
<app-sidebar>
|
||||
<div *ngIf="datasetsLoading" class="my-10-mx-auto text-center">
|
||||
<clr-spinner clrMedium></clr-spinner>
|
||||
</div>
|
||||
|
||||
<div *ngIf="!parsedDatasets.length" class="text-center mb-10">
|
||||
<button
|
||||
(click)="fileUploadInput.click()"
|
||||
id="browse-file"
|
||||
class="btn btn-primary btn-sm"
|
||||
[disabled]="selectedFile !== null || submittingCsv"
|
||||
>
|
||||
Browse file
|
||||
</button>
|
||||
<input
|
||||
hidden
|
||||
#fileUploadInput
|
||||
id="file-upload"
|
||||
type="file"
|
||||
(change)="onFileChange($event)"
|
||||
multiple
|
||||
/>
|
||||
</div>
|
||||
|
||||
<ng-container *ngIf="parsedDatasets.length && !submittedCsvDatasets.length">
|
||||
<div *ngIf="!excelsSubmitted" class="text-center mb-10">
|
||||
<button (click)="onDiscard()" class="btn btn-danger btn-sm mr-10">
|
||||
Discard
|
||||
</button>
|
||||
<button
|
||||
(click)="onSubmitAll()"
|
||||
id="submit-all"
|
||||
class="btn btn-primary btn-sm"
|
||||
>
|
||||
Submit All
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<p cds-text="caption" class="ml-10 mb-10">Found tables:</p>
|
||||
<clr-tree>
|
||||
<clr-tree-node *ngFor="let dataset of parsedDatasets">
|
||||
<button
|
||||
(click)="onParsedDatasetClick(dataset)"
|
||||
class="clr-treenode-link whitespace-nowrap d-flex clr-align-items-center"
|
||||
[class.active]="dataset.active"
|
||||
>
|
||||
<ng-container *ngIf="dataset.submitResult">
|
||||
<cds-icon
|
||||
*ngIf="dataset.submitResult.error"
|
||||
status="danger"
|
||||
shape="exclamation-circle"
|
||||
></cds-icon>
|
||||
<cds-icon
|
||||
*ngIf="dataset.submitResult.success"
|
||||
status="success"
|
||||
shape="check-circle"
|
||||
></cds-icon>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="!dataset.submitResult">
|
||||
<ng-container *ngIf="dataset.datasource">
|
||||
<cds-icon
|
||||
*ngIf="!(dataset.datasource.length && dataset.parseResult)"
|
||||
status="danger"
|
||||
shape="exclamation-circle"
|
||||
></cds-icon>
|
||||
<cds-icon
|
||||
*ngIf="dataset.datasource.length && dataset.parseResult"
|
||||
shape="table"
|
||||
></cds-icon>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="!dataset.datasource">
|
||||
<cds-icon *ngIf="!dataset.parsingTable" shape="table"></cds-icon>
|
||||
|
||||
<clr-spinner *ngIf="dataset.parsingTable" clrSmall></clr-spinner>
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
|
||||
<span class="ml-5"> {{ dataset.libds }} </span>
|
||||
</button>
|
||||
</clr-tree-node>
|
||||
</clr-tree>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="submittedCsvDatasets.length">
|
||||
<p cds-text="caption" class="ml-10 mb-10 mt-10">Submitted tables:</p>
|
||||
<clr-tree>
|
||||
<clr-tree-node *ngFor="let dataset of submittedCsvDatasets">
|
||||
<button
|
||||
(click)="onSubmittedCsvDatasetClick(dataset)"
|
||||
class="clr-treenode-link whitespace-nowrap"
|
||||
[class.active]="dataset.active"
|
||||
>
|
||||
<cds-icon
|
||||
*ngIf="dataset.error"
|
||||
status="danger"
|
||||
shape="exclamation-circle"
|
||||
></cds-icon>
|
||||
<cds-icon
|
||||
*ngIf="dataset.success"
|
||||
status="success"
|
||||
shape="check-circle"
|
||||
></cds-icon>
|
||||
<cds-icon shape="table"></cds-icon>
|
||||
{{ dataset.libds }}
|
||||
</button>
|
||||
</clr-tree-node>
|
||||
</clr-tree>
|
||||
</ng-container>
|
||||
|
||||
<!-- <div *ngIf="librariesPaging" class="w-100 text-center">
|
||||
<span class="spinner spinner-sm"> Loading... </span>
|
||||
</div> -->
|
||||
</app-sidebar>
|
||||
|
||||
<div #contentArea class="content-area">
|
||||
<div class="card no-borders h-100 d-flex clr-flex-column">
|
||||
<div
|
||||
class="header-row clr-row justify-content-between clr-justify-content-center w-100 m-0"
|
||||
>
|
||||
<p cds-text="section">Multi Dataset Load</p>
|
||||
</div>
|
||||
|
||||
<div
|
||||
*ngIf="selectedFile === null && !submittingCsv"
|
||||
class="no-table-selected pointer-events-none"
|
||||
>
|
||||
<clr-icon
|
||||
shape="warning-standard"
|
||||
size="40"
|
||||
class="is-info icon-dc-fill"
|
||||
></clr-icon>
|
||||
<p class="text-center color-gray mt-10" cds-text="section">
|
||||
Please upload a file
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<ng-container *ngIf="selectedFile !== null || submittingCsv">
|
||||
<ng-container *ngIf="!parsedDatasets.length && selectedFile !== null">
|
||||
<div class="d-flex clr-justify-content-center mt-15">
|
||||
<div class="dataset-input-wrapper">
|
||||
<p cds-text="secondary regular" class="mb-5">
|
||||
Selected file: <strong>{{ selectedFile.name }}</strong>
|
||||
<clr-tooltip>
|
||||
<cds-icon
|
||||
clrTooltipTrigger
|
||||
(click)="onDiscardFile()"
|
||||
shape="trash"
|
||||
status="danger"
|
||||
class="ml-5 cursor-pointer"
|
||||
></cds-icon>
|
||||
<clr-tooltip-content> Discard the file </clr-tooltip-content>
|
||||
</clr-tooltip>
|
||||
</p>
|
||||
<p cds-text="secondary regular" class="mb-20">
|
||||
File size: <strong>{{ selectedFile.sizeMB }} MB</strong>
|
||||
</p>
|
||||
<p cds-text="secondary regular" class="mb-15">
|
||||
Paste or type the list of datasets to upload:
|
||||
</p>
|
||||
|
||||
<clr-control-helper class="mb-5"
|
||||
>Each row is one dataset. We will automatically detect tables by
|
||||
the sheetname and populate if any.</clr-control-helper
|
||||
>
|
||||
|
||||
<hot-table
|
||||
hotId="hotInstanceUserDataset"
|
||||
id="hotTableUserDataset"
|
||||
class="mt-15"
|
||||
[afterGetColHeader]="afterGetColHeader"
|
||||
[settings]="hotUserDatasets"
|
||||
[licenseKey]="hotTableLicenseKey"
|
||||
stretchH="all"
|
||||
>
|
||||
</hot-table>
|
||||
|
||||
<div class="dataset-selection-actions text-right mt-10">
|
||||
<button
|
||||
(click)="onStartParsingFile()"
|
||||
id="continue-btn"
|
||||
class="btn btn-primary btn-sm"
|
||||
[disabled]="!matchedDatasets.length"
|
||||
[clrLoading]="uploadLoading"
|
||||
>
|
||||
Continue
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<ng-container
|
||||
*ngIf="parsedDatasets.length && !submittedCsvDatasets.length"
|
||||
>
|
||||
<div
|
||||
*ngIf="!activeParsedDataset"
|
||||
class="no-table-selected pointer-events-none"
|
||||
>
|
||||
<ng-container *ngIf="fileLoadingState !== FileLoadingState.parsed">
|
||||
<clr-icon
|
||||
shape="process-on-vm"
|
||||
size="40"
|
||||
class="is-info icon-dc-fill"
|
||||
></clr-icon>
|
||||
|
||||
<p class="text-center color-gray mt-10" cds-text="section">
|
||||
{{ fileLoadingState }}...
|
||||
</p>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="fileLoadingState === FileLoadingState.parsed">
|
||||
<clr-icon
|
||||
shape="warning-standard"
|
||||
size="40"
|
||||
class="is-info icon-dc-fill"
|
||||
></clr-icon>
|
||||
<p class="text-center color-gray mt-10" cds-text="section">
|
||||
Please select a dataset on the left to review the data
|
||||
</p>
|
||||
</ng-container>
|
||||
</div>
|
||||
|
||||
<ng-container *ngIf="activeParsedDataset">
|
||||
<div
|
||||
*ngIf="activeParsedDataset.submitResult"
|
||||
class="d-flex clr-justify-content-between p-10 mt-15 submission-results"
|
||||
>
|
||||
<div>
|
||||
<p cds-text="secondary regular" class="mb-10">
|
||||
Submit Status:
|
||||
<span
|
||||
*ngIf="activeParsedDataset.submitResult?.success"
|
||||
class="color-green"
|
||||
><strong>SUCCESS</strong></span
|
||||
>
|
||||
<span
|
||||
*ngIf="activeParsedDataset.submitResult?.error"
|
||||
class="color-red"
|
||||
><strong>ERROR</strong></span
|
||||
>
|
||||
</p>
|
||||
<p
|
||||
*ngIf="activeParsedDataset.submitResult?.error"
|
||||
cds-text="secondary regular"
|
||||
>
|
||||
Error details:
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<button
|
||||
*ngIf="
|
||||
!submittingCsv && activeParsedDataset.submitResult?.error
|
||||
"
|
||||
(click)="reSubmitTable(activeParsedDataset)"
|
||||
class="btn btn-primary mt-10"
|
||||
[clrLoading]="submitLoading"
|
||||
>
|
||||
Resubmit
|
||||
</button>
|
||||
<button
|
||||
(click)="
|
||||
downloadFile(
|
||||
activeParsedDataset.submitResult.log ||
|
||||
activeParsedDataset.submitResult.success ||
|
||||
activeParsedDataset.submitResult.error
|
||||
)
|
||||
"
|
||||
class="btn btn-primary-outline mt-10"
|
||||
>
|
||||
Download log
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
*ngIf="activeParsedDataset.submitResult?.error"
|
||||
class="error-field mt-15"
|
||||
>
|
||||
<div class="log-wrapper">
|
||||
{{ activeParsedDataset.submitResult?.error | json }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex clr-justify-content-between p-10 mt-15">
|
||||
<div>
|
||||
<p cds-text="secondary regular" class="mb-10">
|
||||
Found in range:
|
||||
|
||||
<ng-container *ngIf="activeParsedDataset.parseResult">
|
||||
<strong
|
||||
>"{{
|
||||
activeParsedDataset.parseResult.rangeSheetRes?.sheetName
|
||||
}}"!{{
|
||||
activeParsedDataset.parseResult.rangeSheetRes
|
||||
?.rangeAddress
|
||||
}}</strong
|
||||
>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="!activeParsedDataset.parseResult">
|
||||
<strong *ngIf="!activeParsedDataset.parsingTable"
|
||||
>No data found</strong
|
||||
>
|
||||
|
||||
<span
|
||||
*ngIf="activeParsedDataset.parsingTable"
|
||||
class="d-flex clr-align-items-center"
|
||||
>
|
||||
<strong>Searching for the data...</strong>
|
||||
<clr-spinner class="ml-5" clrSmall></clr-spinner>
|
||||
</span>
|
||||
</ng-container>
|
||||
</p>
|
||||
<p cds-text="secondary regular">
|
||||
Dataset:
|
||||
<strong>
|
||||
<clr-tooltip>
|
||||
<a
|
||||
clrTooltipTrigger
|
||||
[routerLink]="'/editor/' + activeParsedDataset.libds"
|
||||
>{{ activeParsedDataset.libds }}</a
|
||||
>
|
||||
<clr-tooltip-content
|
||||
[clrPosition]="'top-right'"
|
||||
[clrSize]="'sm'"
|
||||
>
|
||||
Click to edit the table
|
||||
</clr-tooltip-content>
|
||||
</clr-tooltip>
|
||||
</strong>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<clr-toggle-wrapper>
|
||||
<input
|
||||
type="checkbox"
|
||||
clrToggle
|
||||
[(ngModel)]="activeParsedDataset.includeInSubmission"
|
||||
name="options"
|
||||
[disabled]="
|
||||
!(
|
||||
activeParsedDataset.datasource &&
|
||||
activeParsedDataset.parseResult
|
||||
)
|
||||
"
|
||||
required
|
||||
value="option1"
|
||||
/>
|
||||
<label>Include in submission</label>
|
||||
</clr-toggle-wrapper>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="isHotHidden" class="text-center w-100">
|
||||
<clr-spinner class="spinner-md"></clr-spinner>
|
||||
</div>
|
||||
|
||||
<hot-table
|
||||
hotId="hotInstance"
|
||||
id="hotTable"
|
||||
class="mt-15"
|
||||
[afterGetColHeader]="afterGetColHeader"
|
||||
[className]="['htDark', 'htCustomHidden']"
|
||||
[licenseKey]="hotTableLicenseKey"
|
||||
[multiColumnSorting]="true"
|
||||
[viewportRowRenderingOffset]="50"
|
||||
[manualColumnResize]="true"
|
||||
[filters]="true"
|
||||
stretchH="all"
|
||||
>
|
||||
</hot-table>
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="submittedCsvDatasets.length">
|
||||
<div
|
||||
*ngIf="!activeSubmittedCsvDataset"
|
||||
class="no-table-selected pointer-events-none"
|
||||
>
|
||||
<clr-icon
|
||||
shape="warning-standard"
|
||||
size="40"
|
||||
class="is-info icon-dc-fill"
|
||||
></clr-icon>
|
||||
<p class="text-center color-gray mt-10" cds-text="section">
|
||||
Please select a dataset on the left to review the submit results
|
||||
</p>
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="activeSubmittedCsvDataset">
|
||||
<div class="d-flex clr-justify-content-between p-10">
|
||||
<div>
|
||||
<p cds-text="secondary regular" class="mb-10">
|
||||
Matched with dataset:
|
||||
<strong>
|
||||
<clr-tooltip>
|
||||
<a
|
||||
clrTooltipTrigger
|
||||
[routerLink]="'/editor/' + activeSubmittedCsvDataset.libds"
|
||||
>{{ activeSubmittedCsvDataset.libds }}</a
|
||||
>
|
||||
<clr-tooltip-content
|
||||
[clrPosition]="'top-right'"
|
||||
[clrSize]="'sm'"
|
||||
>
|
||||
Click to edit the table
|
||||
</clr-tooltip-content>
|
||||
</clr-tooltip>
|
||||
</strong>
|
||||
</p>
|
||||
<p cds-text="secondary regular" class="mb-10">
|
||||
Status:
|
||||
<span
|
||||
*ngIf="activeSubmittedCsvDataset.success"
|
||||
class="color-green"
|
||||
><strong>SUCCESS</strong></span
|
||||
>
|
||||
<span *ngIf="activeSubmittedCsvDataset.error" class="color-red"
|
||||
><strong>ERROR</strong></span
|
||||
>
|
||||
</p>
|
||||
<p
|
||||
*ngIf="activeSubmittedCsvDataset.error"
|
||||
cds-text="secondary regular"
|
||||
>
|
||||
Error details:
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<button
|
||||
(click)="
|
||||
downloadFile(
|
||||
activeSubmittedCsvDataset.success ||
|
||||
activeSubmittedCsvDataset.error
|
||||
)
|
||||
"
|
||||
class="btn btn-primary-outline mt-10"
|
||||
>
|
||||
Download log
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="activeSubmittedCsvDataset.error" class="error-field mt-15">
|
||||
<div class="log-wrapper">
|
||||
{{ activeSubmittedCsvDataset.error | json }}
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
</ng-container>
|
||||
|
||||
<!-- <div>
|
||||
<p
|
||||
*ngIf="
|
||||
licenceState.value.viewer_rows_allowed !== Infinity &&
|
||||
hotTable.data &&
|
||||
hotTable.data.length > licenceState.value.viewer_rows_allowed
|
||||
"
|
||||
class="mt-2-i w-100 text-center"
|
||||
>
|
||||
To display more than {{ licenceState.value.viewer_rows_allowed }} rows,
|
||||
contact <contact-link />
|
||||
</p>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<clr-modal [(clrModalOpen)]="showSubmitReasonModal" [clrModalClosable]="false">
|
||||
<h3 class="modal-title">
|
||||
Submit {{ tablesToSubmit.length }}
|
||||
{{ tablesToSubmit.length === 1 ? 'table' : 'tables' }} for approval
|
||||
</h3>
|
||||
<div class="modal-body">
|
||||
<p
|
||||
*ngIf="licenceState.value.submit_rows_limit !== Infinity"
|
||||
cds-text="body"
|
||||
class="licence-limit-notice mt-0 mb-15"
|
||||
>
|
||||
Due to current licence, only
|
||||
{{ licenceState.value.submit_rows_limit }} rows in each file will be
|
||||
submitted. To remove the restriction, contact
|
||||
support@datacontroller.io.
|
||||
</p>
|
||||
|
||||
<div class="text-area-full-width">
|
||||
<label for="formFields_8" class="mb-5 d-block">Message</label>
|
||||
<textarea
|
||||
clrTextarea
|
||||
[(ngModel)]="submitReasonMessage"
|
||||
tabindex="0"
|
||||
class="submit-reason"
|
||||
type="text"
|
||||
id="formFields_8"
|
||||
></textarea>
|
||||
</div>
|
||||
|
||||
<p cds-text="caption_clean" class="mt-10">
|
||||
Tables will be sent sequentially, logs will be available after all tables
|
||||
are submitted.
|
||||
</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-outline"
|
||||
[disabled]="submitLoading"
|
||||
(click)="showSubmitReasonModal = false"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
id="submit-tables"
|
||||
class="btn btn-primary"
|
||||
[clrLoading]="submitLoading"
|
||||
(click)="submitTables()"
|
||||
>
|
||||
Submit
|
||||
</button>
|
||||
</div>
|
||||
</clr-modal>
|
||||
|
||||
<clr-modal [(clrModalOpen)]="csvSubmitting" [clrModalClosable]="false">
|
||||
<h3 class="modal-title">
|
||||
Submitting {{ csvFiles.length }} CSV
|
||||
{{ csvFiles.length === 1 ? 'file' : 'files' }}
|
||||
</h3>
|
||||
<div class="modal-body">
|
||||
<div class="text-center">
|
||||
<clr-spinner clrMedium></clr-spinner>
|
||||
</div>
|
||||
|
||||
<p cds-text="caption_clean" class="mt-10 text-center">
|
||||
This will take few moments
|
||||
</p>
|
||||
</div>
|
||||
</clr-modal>
|
54
client/src/app/multi-dataset/multi-dataset.component.scss
Normal file
54
client/src/app/multi-dataset/multi-dataset.component.scss
Normal file
@ -0,0 +1,54 @@
|
||||
.no-table-selected {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
position: absolute;
|
||||
background: var(--clr-vertical-nav-bg-color);
|
||||
z-index: 10;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.header-row {
|
||||
padding: 15px 0;
|
||||
border-bottom: 1px solid #d3d3d3;
|
||||
}
|
||||
|
||||
.dataset-input-wrapper {
|
||||
max-width: 500px;
|
||||
width: 100%;
|
||||
|
||||
textarea {
|
||||
min-height: 200px;
|
||||
height: 200px;
|
||||
}
|
||||
}
|
||||
|
||||
.submit-reason {
|
||||
min-height: 70px;
|
||||
max-height: 70px;
|
||||
height: 70px;
|
||||
}
|
||||
|
||||
.log-wrapper {
|
||||
margin: 0 10px;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
::ng-deep td.not-matched {
|
||||
background-color: #ff000054;
|
||||
}
|
||||
|
||||
.dataset-selection-actions {
|
||||
border-top: 1px solid #d3d3d3;
|
||||
}
|
||||
|
||||
.licence-limit-notice {
|
||||
color: var(--cds-alias-status-warning-dark);
|
||||
}
|
||||
|
||||
.submission-results {
|
||||
border-bottom: 1px solid #d3d3d3;
|
||||
}
|
1093
client/src/app/multi-dataset/multi-dataset.component.ts
Normal file
1093
client/src/app/multi-dataset/multi-dataset.component.ts
Normal file
File diff suppressed because it is too large
Load Diff
31
client/src/app/multi-dataset/multi-dataset.module.ts
Normal file
31
client/src/app/multi-dataset/multi-dataset.module.ts
Normal file
@ -0,0 +1,31 @@
|
||||
import { CommonModule } from '@angular/common'
|
||||
import { NgModule } from '@angular/core'
|
||||
import { FormsModule } from '@angular/forms'
|
||||
import { ClarityModule } from '@clr/angular'
|
||||
import { HotTableModule } from '@handsontable/angular'
|
||||
import { registerAllModules } from 'handsontable/registry'
|
||||
import { AppSharedModule } from '../app-shared.module'
|
||||
import { DirectivesModule } from '../directives/directives.module'
|
||||
import { DcTreeModule } from '../shared/dc-tree/dc-tree.module'
|
||||
import { MultiDatasetComponent } from './multi-dataset.component'
|
||||
import { MultiDatasetRoutingModule } from './multi-dataset-routing.module'
|
||||
import { MultiDatasetRouteComponent } from '../routes/multi-dataset-route/multi-dataset-route.component'
|
||||
|
||||
// register Handsontable's modules
|
||||
registerAllModules()
|
||||
|
||||
@NgModule({
|
||||
declarations: [MultiDatasetRouteComponent, MultiDatasetComponent],
|
||||
imports: [
|
||||
HotTableModule,
|
||||
MultiDatasetRoutingModule,
|
||||
FormsModule,
|
||||
ClarityModule,
|
||||
AppSharedModule,
|
||||
CommonModule,
|
||||
DcTreeModule,
|
||||
DirectivesModule
|
||||
],
|
||||
exports: [MultiDatasetComponent]
|
||||
})
|
||||
export class MultiDatasetModule {}
|
@ -143,7 +143,6 @@
|
||||
(ngModelChange)="
|
||||
setVariableOperator(queryIndex, query.operator, clauseIndex)
|
||||
"
|
||||
class="mt-2"
|
||||
clrSelect
|
||||
>
|
||||
<option *ngFor="let opr of query.operators">{{ opr }}</option>
|
||||
@ -413,7 +412,10 @@
|
||||
>
|
||||
<app-soft-select
|
||||
label="Value"
|
||||
[secondLabel]="'Variable'"
|
||||
[emitOnlySelected]="query.valueVariable"
|
||||
[inputId]="'vals_' + queryIndex + '_' + clauseIndex"
|
||||
(selectedLabelChange)="selectedLabelChange($event, query)"
|
||||
[(value)]="query.value"
|
||||
[enableLoadMore]="query.nobs > query.values.length"
|
||||
(onInputEvent)="
|
||||
@ -423,9 +425,19 @@
|
||||
onAutocompleteLoadingMore($event, query.variable, queryIndex, clauseIndex)
|
||||
"
|
||||
>
|
||||
<option [value]="column.unformatted" *ngFor="let column of query.values">
|
||||
{{ column.formatted.trim() }}
|
||||
</option>
|
||||
<div *ngIf="!query.valueVariable">
|
||||
<option [value]="column.unformatted" *ngFor="let column of query.values">
|
||||
{{ column.formatted.trim() }}
|
||||
</option>
|
||||
</div>
|
||||
|
||||
<div *ngIf="query.valueVariable">
|
||||
<ng-container *ngFor="let column of cols">
|
||||
<option [value]="column.NAME" *ngIf="column.TYPE === query.type">
|
||||
{{ column.NAME }}
|
||||
</option>
|
||||
</ng-container>
|
||||
</div>
|
||||
</app-soft-select>
|
||||
</ng-template>
|
||||
|
||||
|
@ -1,3 +1,25 @@
|
||||
::ng-deep {
|
||||
body[cds-theme="dark"] {
|
||||
.clause-logic {
|
||||
background: #192a30;
|
||||
}
|
||||
|
||||
.clause-query {
|
||||
background: #263e48;
|
||||
}
|
||||
}
|
||||
|
||||
body[cds-theme="light"] {
|
||||
.clause-logic {
|
||||
background: #e9e9e9;
|
||||
}
|
||||
|
||||
.clause-query {
|
||||
background: #fbf8f8;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
|
||||
@ -9,13 +31,12 @@
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
background: #e9e9e9;
|
||||
|
||||
padding: 15px;
|
||||
}
|
||||
|
||||
.clause-query {
|
||||
padding: 30px 0px 20px 20px;
|
||||
background: #fbf8f8;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
@ -220,8 +241,11 @@
|
||||
vertical-align: middle;
|
||||
margin: 0;
|
||||
}
|
||||
:not(pre) > code[class*="language-"], pre[class*="language-"] {
|
||||
background-color: #fbf8f8;
|
||||
|
||||
::ng-deep body[cds-theme="dark"] {
|
||||
.line-numbers {
|
||||
border-color: #989797 !important;
|
||||
}
|
||||
}
|
||||
|
||||
pre[class*="language-"] {
|
||||
|
@ -95,6 +95,7 @@ export class QueryComponent
|
||||
variable: null,
|
||||
operator: null,
|
||||
value: null,
|
||||
valueVariable: false,
|
||||
startrow: 0,
|
||||
rows: 0,
|
||||
nobs: 0,
|
||||
@ -193,6 +194,20 @@ export class QueryComponent
|
||||
*/
|
||||
usePickersChange() {
|
||||
this.queryDateTime = []
|
||||
if (this.usePickers) {
|
||||
this.clauses.queryObj.forEach((queryObj: any) => {
|
||||
queryObj.elements.forEach((element: any) => {
|
||||
const isDateOrTime = ['DATETIME', 'TIME', 'DATE'].includes(
|
||||
element.ddtype
|
||||
)
|
||||
|
||||
if (isDateOrTime && element.valueVariable) {
|
||||
element.value = ''
|
||||
element.valueVariable = false
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -253,8 +268,6 @@ export class QueryComponent
|
||||
get(globals, objPath).filter.libds = this.libds
|
||||
}
|
||||
get(globals, objPath).filter.clauses = this.clauses
|
||||
|
||||
console.log('globals', globals)
|
||||
}
|
||||
|
||||
/**
|
||||
@ -750,6 +763,12 @@ export class QueryComponent
|
||||
)
|
||||
}
|
||||
|
||||
public selectedLabelChange(label: string, query: any) {
|
||||
query.valueVariable = label === 'Variable'
|
||||
query.value = ''
|
||||
this.whereClauseFn()
|
||||
}
|
||||
|
||||
public variableInputChange(
|
||||
queryVariable: any,
|
||||
index: number,
|
||||
@ -859,17 +878,25 @@ export class QueryComponent
|
||||
*/
|
||||
public hasInvalidCluase(clauses: any): boolean {
|
||||
for (let clause of clauses) {
|
||||
clause['invalidClause'] = false
|
||||
|
||||
if (
|
||||
clause.variable === null ||
|
||||
clause.operator === null ||
|
||||
clause.value === null ||
|
||||
clause.value === ''
|
||||
clause.value === '' &&
|
||||
!(clause.operator === 'NE' || clause.operator === 'CONTAINS')
|
||||
) {
|
||||
clause['invalidClause'] = true
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
if (
|
||||
clause.variable === null ||
|
||||
clause.operator === null ||
|
||||
clause.value === null
|
||||
) {
|
||||
clause['invalidClause'] = true
|
||||
|
||||
return true
|
||||
} else {
|
||||
clause['invalidClause'] = false
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -139,10 +139,7 @@
|
||||
<div class="card-header p-0">
|
||||
<div class="clr-row">
|
||||
<div class="clr-col-md-4 approvalBack">
|
||||
<span
|
||||
class="btn btn-sm btn-outline m-0"
|
||||
(click)="goToApprovalsList()"
|
||||
>
|
||||
<span class="btn btn-outline m-0" (click)="goToApprovalsList()">
|
||||
<clr-icon shape="caret" dir="left" size="20"></clr-icon>Back to
|
||||
approvals list
|
||||
</span>
|
||||
@ -209,22 +206,22 @@
|
||||
<div class="d-flex justify-content-center mt-0">
|
||||
<div class="clr-row clr-gap-5 clr-gap-sm-0">
|
||||
<button
|
||||
class="btn btn-sm btn-outline text-center mt-5"
|
||||
class="btn btn-sm btn-outline text-center mt-5 mr-5i"
|
||||
(click)="goToBase(jsParams?.TABLE_NM)"
|
||||
>
|
||||
Go to base table screen
|
||||
View base table
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-sm btn-success-outline text-center mt-5"
|
||||
class="btn btn-sm btn-success-outline text-center mt-5 mr-5i"
|
||||
(click)="getTable(tableId)"
|
||||
>
|
||||
Go to edited screen
|
||||
View staged data
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-sm btn-info-outline text-center mt-5"
|
||||
(click)="goBack(jsParams?.TABLE_NM)"
|
||||
>
|
||||
Go back to editor
|
||||
Edit base table
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@ -236,7 +233,7 @@
|
||||
id="acceptBtn"
|
||||
[clrLoading]="acceptLoading"
|
||||
type="submit"
|
||||
class="btn btn-sm btn-success"
|
||||
class="btn btn-sm btn-success mr-5i"
|
||||
(click)="approveTable()"
|
||||
[disabled]="
|
||||
!loadingTable || params?.ISAPPROVER === 'NO' || noChanges
|
||||
@ -246,7 +243,7 @@
|
||||
</button>
|
||||
<button
|
||||
id="rejectBtn"
|
||||
class="btn btn-sm btn btn-danger mr-0"
|
||||
class="btn btn-sm btn btn-danger mr-5i"
|
||||
(click)="rejectOpen = true"
|
||||
[disabled]="
|
||||
!loadingTable || params?.ISAPPROVER === 'NO' || noChanges
|
||||
@ -287,19 +284,15 @@
|
||||
>
|
||||
<span class="label label-warning">
|
||||
Changed Rows
|
||||
<span class="badge badge-warning">{{
|
||||
lens.updated
|
||||
}}</span>
|
||||
<span class="badge">{{ lens.updated }}</span>
|
||||
</span>
|
||||
<span class="label label-success">
|
||||
Added Rows
|
||||
<span class="badge badge-success">{{ lens.new }}</span>
|
||||
<span class="badge">{{ lens.new }}</span>
|
||||
</span>
|
||||
<span class="label label-danger">
|
||||
Deleted Rows
|
||||
<span class="badge badge-danger">{{
|
||||
lens.deleted
|
||||
}}</span>
|
||||
<span class="badge">{{ lens.deleted }}</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -314,8 +307,8 @@
|
||||
class="h-24vh d-flex flex-column justify-content-center align-items-center"
|
||||
>
|
||||
<span class="spinner"> Loading... </span>
|
||||
<div *ngIf="!loadingTable">
|
||||
<h3>Loading table</h3>
|
||||
<div *ngIf="!loadingTable" class="mt-10">
|
||||
<p cds-text="section">Loading table</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -394,9 +387,9 @@
|
||||
<div class="card-header">
|
||||
<div class="clr-row">
|
||||
<div class="clr-col-md-4 approvalBack">
|
||||
<span class="btn btn-sm btn-outline" (click)="goToSubmitList()">
|
||||
<clr-icon shape="caret" dir="left" size="20"></clr-icon>Back to
|
||||
submitted list
|
||||
<span class="btn btn-outline" (click)="goToSubmitList()">
|
||||
<cds-icon shape="angle" direction="left" size="20"></cds-icon
|
||||
>Back to submitted list
|
||||
</span>
|
||||
</div>
|
||||
<div class="clr-col-md-4">
|
||||
@ -443,22 +436,22 @@
|
||||
<div class="d-flex justify-content-center mt-0">
|
||||
<div class="clr-row clr-gap-5 clr-gap-sm-0">
|
||||
<button
|
||||
class="btn btn-sm btn-outline text-center mt-5"
|
||||
class="btn btn-sm btn-outline text-center mt-5 mr-5i"
|
||||
(click)="goToBase(subObj.base)"
|
||||
>
|
||||
Go to base table screen
|
||||
View base table
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-sm btn-success-outline text-center mt-5"
|
||||
class="btn btn-sm btn-success-outline text-center mt-5 mr-5i"
|
||||
(click)="getTable(subObj.tableId)"
|
||||
>
|
||||
Go to edited screen
|
||||
View staged data
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-sm btn-info-outline text-center mt-5"
|
||||
(click)="goBack(subObj.base)"
|
||||
>
|
||||
Go back to editor
|
||||
Edit base table
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@ -480,15 +473,15 @@
|
||||
>
|
||||
<span class="label label-warning">
|
||||
Changed Rows
|
||||
<span class="badge badge-warning">{{ lens.updated }}</span>
|
||||
<span class="badge">{{ lens.updated }}</span>
|
||||
</span>
|
||||
<span class="label label-success">
|
||||
Added Rows
|
||||
<span class="badge badge-success">{{ lens.new }}</span>
|
||||
<span class="badge">{{ lens.new }}</span>
|
||||
</span>
|
||||
<span class="label label-danger">
|
||||
Deleted Rows
|
||||
<span class="badge badge-danger">{{ lens.deleted }}</span>
|
||||
<span class="badge">{{ lens.deleted }}</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -522,8 +515,8 @@
|
||||
class="h-25vh d-flex flex-column justify-content-center align-items-center"
|
||||
>
|
||||
<span class="spinner"> Loading... </span>
|
||||
<div *ngIf="!loadingTable">
|
||||
<h3>Loading table</h3>
|
||||
<div *ngIf="!loadingTable" class="mt-10">
|
||||
<p cds-text="section">Loading table</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tableCont">
|
||||
|
@ -1,3 +1,5 @@
|
||||
@import '../../../colors.scss';
|
||||
|
||||
.loader {
|
||||
display:flex;
|
||||
justify-content: center;
|
||||
@ -10,19 +12,48 @@
|
||||
}
|
||||
|
||||
.addedRow {
|
||||
background: rgb(146, 208, 154);
|
||||
border: 1px solid rgba(9, 77, 117, 0.2);
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.deletedRow {
|
||||
background: rgb(230, 179, 179);
|
||||
border: 1px solid rgba(70, 71, 70, 0.2);
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
::ng-deep body[cds-theme="dark"] {
|
||||
table {
|
||||
.updatedRow {
|
||||
background: #93971e;
|
||||
}
|
||||
|
||||
.addedRow {
|
||||
background: rgb(86 153 95);
|
||||
}
|
||||
|
||||
.deletedRow {
|
||||
background: rgb(138 90 90);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
::ng-deep body[cds-theme="light"] {
|
||||
table {
|
||||
.updatedRow {
|
||||
background: #fafda8;
|
||||
}
|
||||
|
||||
.addedRow {
|
||||
background: rgb(146, 208, 154);
|
||||
}
|
||||
|
||||
.deletedRow {
|
||||
background: rgb(230, 179, 179);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.updatedRow {
|
||||
background: #fafda8;
|
||||
border: 1px solid rgba(9, 117, 9, 0.2);
|
||||
border-radius: 5px;
|
||||
}
|
||||
@ -45,7 +76,7 @@ background: rgba(252, 135, 120, 0.4);
|
||||
font-size: .54167rem;
|
||||
font-weight: 400;
|
||||
letter-spacing: normal;
|
||||
background: #314351;
|
||||
background: $headerBackground;
|
||||
border-radius: .125rem;
|
||||
color: #f0f1ec;;
|
||||
line-height: .75rem;
|
||||
@ -68,8 +99,8 @@ background: rgba(252, 135, 120, 0.4);
|
||||
top: auto;
|
||||
right: auto;
|
||||
content: "";
|
||||
border-left: .25rem solid #314351;
|
||||
border-top: .20833rem solid #314351;
|
||||
border-left: .25rem solid $headerBackground;
|
||||
border-top: .20833rem solid $headerBackground;
|
||||
border-right: .25rem solid transparent;
|
||||
border-bottom: .20833rem solid transparent;
|
||||
}
|
||||
@ -79,8 +110,8 @@ border: 0px solid;
|
||||
}
|
||||
|
||||
.toggle-switch input[type=checkbox]:checked+label:before {
|
||||
border-color: #314351;
|
||||
background-color: #314351!important;
|
||||
border-color: $headerBackground;
|
||||
background-color: $headerBackground !important;
|
||||
transition: .15s ease-in;
|
||||
transition-property: border-color,background-color;
|
||||
}
|
||||
@ -140,7 +171,7 @@ border: 0px solid;
|
||||
.tooll {
|
||||
position: absolute;
|
||||
background: #e6b3b3;
|
||||
color: #314351;
|
||||
color: $headerBackground;
|
||||
top: 0px;
|
||||
height: 36px;
|
||||
width: 100%;
|
||||
|
@ -99,19 +99,11 @@
|
||||
</clr-dg-cell>
|
||||
</clr-dg-row>
|
||||
|
||||
<clr-dg-footer class="d-flex justify-content-start">
|
||||
<span>items per page</span>
|
||||
<select [(ngModel)]="itemsNum">
|
||||
<option [ngValue]="3">3</option>
|
||||
<option [ngValue]="5">5</option>
|
||||
<option [ngValue]="10">10</option>
|
||||
<option [ngValue]="15">15</option>
|
||||
</select>
|
||||
<clr-dg-pagination
|
||||
#pagination
|
||||
[clrDgPageSize]="itemsNum"
|
||||
class="center"
|
||||
>
|
||||
<clr-dg-footer>
|
||||
<clr-dg-pagination #pagination [clrDgPageSize]="10">
|
||||
<clr-dg-page-size [clrPageSizeOptions]="[3, 5, 10, 15]"
|
||||
>Items per page</clr-dg-page-size
|
||||
>
|
||||
{{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of
|
||||
{{ pagination.totalItems }} approvals
|
||||
</clr-dg-pagination>
|
||||
|
@ -1,3 +1,5 @@
|
||||
@import '../../../colors.scss';
|
||||
|
||||
.column-center {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@ -13,11 +15,11 @@
|
||||
}
|
||||
|
||||
.tooltip.tooltip-bottom-left>.tooltip-content, .tooltip .tooltip-content.tooltip-bottom-left {
|
||||
background: #314351!important;
|
||||
background: $headerBackground !important;
|
||||
}
|
||||
.tooltip.tooltip-bottom-left>.tooltip-content:before, .tooltip .tooltip-content.tooltip-bottom-left:before {
|
||||
border-right: .25rem solid #314351;
|
||||
border-bottom: .20833rem solid #314351;
|
||||
border-right: .25rem solid $headerBackground;
|
||||
border-bottom: .20833rem solid $headerBackground;
|
||||
}
|
||||
|
||||
.noBorder {
|
||||
|
@ -72,7 +72,7 @@
|
||||
>
|
||||
To unlock more than
|
||||
{{ licenceState.value.history_rows_allowed }} records, contact
|
||||
support@datacontroller.io
|
||||
support@datacontroller.io
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
@ -86,19 +86,11 @@
|
||||
</clr-dg-cell>
|
||||
</clr-dg-row>
|
||||
|
||||
<clr-dg-footer class="d-flex justify-content-start">
|
||||
<span>items per page</span>
|
||||
<select [(ngModel)]="itemsNum">
|
||||
<option [ngValue]="3">3</option>
|
||||
<option [ngValue]="5">5</option>
|
||||
<option [ngValue]="10">10</option>
|
||||
<option [ngValue]="15">15</option>
|
||||
</select>
|
||||
<clr-dg-pagination
|
||||
#pagination
|
||||
[clrDgPageSize]="itemsNum"
|
||||
class="center"
|
||||
>
|
||||
<clr-dg-footer>
|
||||
<clr-dg-pagination #pagination [clrDgPageSize]="10">
|
||||
<clr-dg-page-size [clrPageSizeOptions]="[3, 5, 10, 15]"
|
||||
>Items per page</clr-dg-page-size
|
||||
>
|
||||
{{ pagination.firstItem + 1 }} -
|
||||
{{ pagination.lastItem + 1 }} of
|
||||
{{ pagination.totalItems }} submissions
|
||||
|
@ -1,13 +1,15 @@
|
||||
@import '../../../colors.scss';
|
||||
|
||||
.noBorder {
|
||||
border-bottom: 1px solid transparent!important;
|
||||
}
|
||||
|
||||
.tooltip.tooltip-bottom-left>.tooltip-content, .tooltip .tooltip-content.tooltip-bottom-left {
|
||||
background: #314351!important;
|
||||
background: $headerBackground !important;
|
||||
}
|
||||
.tooltip.tooltip-bottom-left>.tooltip-content:before, .tooltip .tooltip-content.tooltip-bottom-left:before {
|
||||
border-right: .25rem solid #314351;
|
||||
border-bottom: .20833rem solid #314351;
|
||||
border-right: .25rem solid $headerBackground;
|
||||
border-bottom: .20833rem solid $headerBackground;
|
||||
}
|
||||
|
||||
.no-submitted-tables {
|
||||
|
@ -3,6 +3,7 @@
|
||||
<clr-tree-node *ngIf="roles" class="search-node">
|
||||
<div class="tree-search-wrapper">
|
||||
<input
|
||||
appStealFocus
|
||||
clrInput
|
||||
#searchLibTreeInput
|
||||
placeholder="Filter by Roles"
|
||||
@ -26,7 +27,7 @@
|
||||
<clr-tree-node
|
||||
(click)="roleOnClick(role)"
|
||||
*ngIf="!role['hidden']"
|
||||
[class.table-active]="role.ROLEURI === roleUri"
|
||||
[class.active]="role.ROLEURI === roleUri"
|
||||
>
|
||||
<p class="m-0 cursor-pointer list-padding">
|
||||
<clr-icon shape="blocks-group"></clr-icon>
|
||||
|
@ -1,3 +1,43 @@
|
||||
@import '../../colors.scss';
|
||||
|
||||
::ng-deep body[cds-theme="dark"] {
|
||||
.role {
|
||||
background-color: $headerBackground;
|
||||
border-color: $headerBackground;
|
||||
}
|
||||
|
||||
.role-data {
|
||||
background-color: $headerBackground;
|
||||
border-color: $headerBackground;
|
||||
}
|
||||
|
||||
.member-table tbody{
|
||||
tr:hover{
|
||||
background-color: #29404b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
::ng-deep body[cds-theme="light"] {
|
||||
.role-info{
|
||||
background-color: #f9f9f9;
|
||||
border-color: #a7a7a7;
|
||||
box-shadow: 0px 2px 5px #dad7d7;
|
||||
}
|
||||
|
||||
.role-data {
|
||||
background-color: #f9f9f9;
|
||||
border-color: #a7a7a7;
|
||||
box-shadow: 0px 2px 5px #dad7d7;
|
||||
}
|
||||
|
||||
.member-table tbody{
|
||||
tr:hover{
|
||||
background-color: #e6e6e6;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.sidebar-height{
|
||||
height: 100%;
|
||||
}
|
||||
@ -6,20 +46,16 @@
|
||||
font-size: 20px;
|
||||
}
|
||||
.role-info{
|
||||
background-color: #f9f9f9;
|
||||
border: 1px solid #a7a7a7;
|
||||
border: 1px solid;
|
||||
border-radius: 3px;
|
||||
box-shadow: 0px 2px 5px #dad7d7;
|
||||
}
|
||||
.role-info td{
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.role-data{
|
||||
background-color: #f9f9f9;
|
||||
border: 1px solid #a7a7a7;
|
||||
border: 1px solid;
|
||||
border-radius: 3px;
|
||||
box-shadow: 0px 2px 5px #dad7d7;
|
||||
}
|
||||
.role-data{
|
||||
min-height: unset;
|
||||
@ -28,15 +64,10 @@
|
||||
}
|
||||
}
|
||||
.member-table{
|
||||
background-color: #f9f9f9;
|
||||
width: 100%;
|
||||
}
|
||||
.member-table thead{
|
||||
background-color: #dadada;
|
||||
}
|
||||
.member-table tbody{
|
||||
tr:hover{
|
||||
background-color: #e6e6e6;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
@ -4,6 +4,7 @@ import { HelperService } from '../services/helper.service'
|
||||
import { Location } from '@angular/common'
|
||||
import { Router, ActivatedRoute } from '@angular/router'
|
||||
import { SasService } from '../services/sas.service'
|
||||
import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapperResponse'
|
||||
|
||||
@Component({
|
||||
selector: 'app-role',
|
||||
@ -47,61 +48,69 @@ export class RoleComponent implements OnInit {
|
||||
} else {
|
||||
if (globals.usernav.roleList === undefined) {
|
||||
this.loading = true
|
||||
this.sasService.request('usernav/userroles', null).then((res: any) => {
|
||||
this.loading = false
|
||||
this.roles = res.roles
|
||||
globals.usernav.roleList = res.roles
|
||||
if (this.paramPresent) {
|
||||
if (this.roles !== undefined) {
|
||||
let validRole = this.findRole(this.roles, this.paramURI)
|
||||
if (validRole !== false) {
|
||||
this.loading = true
|
||||
let data = { iwant: [{ roleid: this.paramURI }] }
|
||||
this.sasService
|
||||
.request('usernav/usermembersbyrole', data)
|
||||
.then((res: any) => {
|
||||
this.loading = false
|
||||
this.roleMembers = res.sasmembers
|
||||
this.roleMembersCount = res.sasmembers.length
|
||||
this.roleGroups = res.sasgroups
|
||||
this.roleGroupsCount = res.sasgroups.length
|
||||
this.roleUri = validRole.ROLEURI
|
||||
this.roleName = validRole.ROLENAME
|
||||
this.roleDesc = validRole.ROLEDESC
|
||||
})
|
||||
this.sasService
|
||||
.request('usernav/userroles', null)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.loading = false
|
||||
this.roles = res.adapterResponse.roles
|
||||
globals.usernav.roleList = res.adapterResponse.roles
|
||||
if (this.paramPresent) {
|
||||
if (this.roles !== undefined) {
|
||||
let validRole = this.findRole(this.roles, this.paramURI)
|
||||
if (validRole !== false) {
|
||||
this.loading = true
|
||||
let data = { iwant: [{ roleid: this.paramURI }] }
|
||||
this.sasService
|
||||
.request('usernav/usermembersbyrole', data)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.loading = false
|
||||
this.roleMembers = res.adapterResponse.sasmembers
|
||||
this.roleMembersCount =
|
||||
res.adapterResponse.sasmembers.length
|
||||
this.roleGroups = res.adapterResponse.sasgroups
|
||||
this.roleGroupsCount =
|
||||
res.adapterResponse.sasgroups.length
|
||||
this.roleUri = validRole.ROLEURI
|
||||
this.roleName = validRole.ROLENAME
|
||||
this.roleDesc = validRole.ROLEDESC
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
})
|
||||
} else {
|
||||
this.roles = globals.usernav.roleList
|
||||
this.roleSearch = globals.usernav.roleSearch
|
||||
this.sasService.request('usernav/userroles', null).then((res: any) => {
|
||||
this.roles = res.roles
|
||||
globals.usernav.roleList = res.roles
|
||||
this.sasService
|
||||
.request('usernav/userroles', null)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.roles = res.adapterResponse.roles
|
||||
globals.usernav.roleList = res.adapterResponse.roles
|
||||
|
||||
if (this.paramPresent) {
|
||||
if (this.roles !== undefined) {
|
||||
let validRole = this.findRole(this.roles, this.paramURI)
|
||||
if (validRole !== false) {
|
||||
this.loading = true
|
||||
let data = { iwant: [{ roleid: this.paramURI }] }
|
||||
this.sasService
|
||||
.request('usernav/usermembersbyrole', data)
|
||||
.then((res: any) => {
|
||||
this.loading = false
|
||||
this.roleMembers = res.sasmembers
|
||||
this.roleMembersCount = res.sasmembers.length
|
||||
this.roleGroups = res.sasgroups
|
||||
this.roleGroupsCount = res.sasgroups.length
|
||||
this.roleUri = validRole.ROLEURI
|
||||
this.roleName = validRole.ROLENAME
|
||||
this.roleDesc = validRole.ROLEDESC
|
||||
})
|
||||
if (this.paramPresent) {
|
||||
if (this.roles !== undefined) {
|
||||
let validRole = this.findRole(this.roles, this.paramURI)
|
||||
if (validRole !== false) {
|
||||
this.loading = true
|
||||
let data = { iwant: [{ roleid: this.paramURI }] }
|
||||
this.sasService
|
||||
.request('usernav/usermembersbyrole', data)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.loading = false
|
||||
this.roleMembers = res.adapterResponse.sasmembers
|
||||
this.roleMembersCount =
|
||||
res.adapterResponse.sasmembers.length
|
||||
this.roleGroups = res.adapterResponse.sasgroups
|
||||
this.roleGroupsCount =
|
||||
res.adapterResponse.sasgroups.length
|
||||
this.roleUri = validRole.ROLEURI
|
||||
this.roleName = validRole.ROLENAME
|
||||
this.roleDesc = validRole.ROLEDESC
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -125,12 +134,12 @@ export class RoleComponent implements OnInit {
|
||||
let data = { iwant: [{ roleid: role.ROLEURI }] }
|
||||
this.sasService
|
||||
.request('usernav/usermembersbyrole', data)
|
||||
.then((res: any) => {
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
this.loading = false
|
||||
this.roleMembers = res.sasmembers
|
||||
this.roleMembersCount = res.sasmembers.length
|
||||
this.roleGroups = res.sasgroups
|
||||
this.roleGroupsCount = res.sasgroups.length
|
||||
this.roleMembers = res.adapterResponse.sasmembers
|
||||
this.roleMembersCount = res.adapterResponse.sasmembers.length
|
||||
this.roleGroups = res.adapterResponse.sasgroups
|
||||
this.roleGroupsCount = res.adapterResponse.sasgroups.length
|
||||
this.roleUri = role.ROLEURI
|
||||
this.roleName = role.ROLENAME
|
||||
this.roleDesc = role.ROLEDESC
|
||||
|
@ -0,0 +1 @@
|
||||
<router-outlet></router-outlet>
|
17
client/src/app/routes/home-route/home-route.component.ts
Normal file
17
client/src/app/routes/home-route/home-route.component.ts
Normal file
@ -0,0 +1,17 @@
|
||||
import { Component, OnInit, OnDestroy } from '@angular/core'
|
||||
|
||||
@Component({
|
||||
selector: 'app-home-route',
|
||||
templateUrl: './home-route.component.html',
|
||||
styleUrls: ['./home-route.component.scss'],
|
||||
host: {
|
||||
class: 'content-container'
|
||||
}
|
||||
})
|
||||
export class HomeRouteComponent implements OnInit, OnDestroy {
|
||||
constructor() {}
|
||||
|
||||
ngOnInit() {}
|
||||
|
||||
ngOnDestroy() {}
|
||||
}
|
@ -0,0 +1 @@
|
||||
<router-outlet></router-outlet>
|
@ -0,0 +1,16 @@
|
||||
import { Component, OnInit, OnDestroy } from '@angular/core'
|
||||
|
||||
@Component({
|
||||
selector: 'app-multi-dataset-route',
|
||||
templateUrl: './multi-dataset-route.component.html',
|
||||
host: {
|
||||
class: 'content-container'
|
||||
}
|
||||
})
|
||||
export class MultiDatasetRouteComponent implements OnInit, OnDestroy {
|
||||
constructor() {}
|
||||
|
||||
ngOnInit() {}
|
||||
|
||||
ngOnDestroy() {}
|
||||
}
|
@ -0,0 +1 @@
|
||||
<router-outlet></router-outlet>
|
17
client/src/app/routes/xlmap-route/xlmap-route.component.ts
Normal file
17
client/src/app/routes/xlmap-route/xlmap-route.component.ts
Normal file
@ -0,0 +1,17 @@
|
||||
import { Component, OnInit, OnDestroy } from '@angular/core'
|
||||
|
||||
@Component({
|
||||
selector: 'app-xlmap-route',
|
||||
templateUrl: './xlmap-route.component.html',
|
||||
styleUrls: ['./xlmap-route.component.scss'],
|
||||
host: {
|
||||
class: 'content-container'
|
||||
}
|
||||
})
|
||||
export class XLMapRouteComponent implements OnInit, OnDestroy {
|
||||
constructor() {}
|
||||
|
||||
ngOnInit() {}
|
||||
|
||||
ngOnDestroy() {}
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user