dc/dc
dc/dc
3
1
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases 32 Wiki Activity

Compare commits

base: dc:main
Branches Tags
dc:main
dc:issue99
dc:development
dc:v6.10.1
dc:v6.10.0
dc:v6.9.0
dc:v6.8.5
dc:v6.8.4
dc:v6.8.3
dc:v6.8.2
dc:v6.8.1
dc:v6.8.0
dc:v6.7.0
dc:v6.6.4
dc:v6.6.3
dc:v6.6.2
dc:v6.6.1
dc:v6.6.0
dc:v6.5.2
dc:v6.5.1
dc:v6.5.0
dc:v6.4.0
dc:v6.3.1
dc:v6.3.0
dc:v6.2.8
dc:v6.2.7
dc:v6.2.6
dc:v6.2.5
dc:v6.2.4
dc:v6.2.3
dc:v6.2.2
dc:v6.2.1
dc:v6.2.0
dc:v6.1.0
dc:v6.0.0
..
compare: dc:v6.6.2
Branches Tags
dc:issue99
dc:main
dc:development
dc:v6.10.1
dc:v6.10.0
dc:v6.9.0
dc:v6.8.5
dc:v6.8.4
dc:v6.8.3
dc:v6.8.2
dc:v6.8.1
dc:v6.8.0
dc:v6.7.0
dc:v6.6.4
dc:v6.6.3
dc:v6.6.2
dc:v6.6.1
dc:v6.6.0
dc:v6.5.2
dc:v6.5.1
dc:v6.5.0
dc:v6.4.0
dc:v6.3.1
dc:v6.3.0
dc:v6.2.8
dc:v6.2.7
dc:v6.2.6
dc:v6.2.5
dc:v6.2.4
dc:v6.2.3
dc:v6.2.2
dc:v6.2.1
dc:v6.2.0
dc:v6.1.0
dc:v6.0.0

No commits in common. "main" and "v6.6.2" have entirely different histories.
main ... v6.6.2

136 changed files with 30345 additions and 10613 deletions
Show Stats Expand all files Collapse all files

31
.gitea/workflows/build.yaml
View File

@ -8,16 +8,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
- uses: actions/setup-node@v3
with:
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
node-version: 18
- name: Write .npmrc file
run: echo "$NPMRC" > client/.npmrc
@ -28,24 +21,8 @@ jobs:
- 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
npm ci
npm run license-checker

39
.gitea/workflows/release.yaml
View File

@ -11,9 +11,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
- uses: actions/setup-node@v3
with:
node-version: 20.14.0
node-version: 18
- name: Write .npmrc file
run: |
@ -34,11 +34,7 @@ jobs:
CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
- 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
run: npm ci
- name: Check audit
# Audit should fail and stop the CI if critical vulnerability found
@ -52,7 +48,7 @@ jobs:
- name: Angular Tests
run: |
cd client
npm run test:headless
npm test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
- name: Angular Production Build
run: |
@ -66,9 +62,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
- uses: actions/setup-node@v3
with:
node-version: 20.14.0
node-version: 18
- name: Write .npmrc file
run: |
@ -90,11 +86,7 @@ jobs:
CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
- 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
run: npm ci
# Install pm2 and prepare SASJS server
- run: npm i -g pm2
@ -156,9 +148,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
- uses: actions/setup-node@v3
with:
node-version: 20.14.0
node-version: 20
- name: Write .npmrc file
run: |
@ -180,16 +172,6 @@ jobs:
apt-get update
apt-get install doxygen -y
- name: Frontend Preliminary Build
description: We want to prevent creating empty release if frontend fails
run: |
cd client
# 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: |
npm i
@ -202,6 +184,7 @@ 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
@ -245,7 +228,6 @@ 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: |
@ -281,4 +263,3 @@ 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
View File

@ -11,9 +11,6 @@ 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

123
CHANGELOG.md
View File

@ -1,126 +1,3 @@
## [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)

4
README.md
View File

@ -27,6 +27,4 @@ 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)!
* Code: https://code.datacontroller.io

23
client/angular.json
View File

@ -45,7 +45,6 @@
"numbro",
"@clr/icons",
"@sasjs/adapter",
"@sasjs/utils/types/serverType",
"@sasjs/utils/input/validators",
"@sasjs/utils/utils/bytesToSize",
"base64-arraybuffer",
@ -68,6 +67,7 @@
"src/styles.scss"
],
"scripts": [
"node_modules/@clr/icons/clr-icons.min.js",
"node_modules/marked/marked.min.js"
]
},
@ -116,10 +116,10 @@
"builder": "@angular-devkit/build-angular:dev-server",
"configurations": {
"production": {
"buildTarget": "datacontroller:build:production"
"browserTarget": "datacontroller:build:production"
},
"development": {
"buildTarget": "datacontroller:build:development"
"browserTarget": "datacontroller:build:development"
}
},
"defaultConfiguration": "development"
@ -127,27 +127,30 @@
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"buildTarget": "datacontroller:build"
"browserTarget": "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"
],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": "scss",
"styles": [
"src/styles.scss"
],
"scripts": [
],
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": [],
"karmaConfig": "karma.conf.js"
}
},

2
client/cypress.config.ts
View File

@ -9,8 +9,6 @@ export default defineConfig({
html: true,
json: false,
},
viewportHeight: 900,
viewportWidth: 1600,
chromeWebSecurity: false,
defaultCommandTimeout: 30000,

4
client/cypress/e2e/editor.cy.ts
View File

@ -221,13 +221,13 @@ const submitExcel = (callback?: any) => {
const rejectExcel = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (
approvalButton.innerText
.toLowerCase()
.includes('approve')
.includes('go to approvals screen')
) {
approvalButton.click()
break

8
client/cypress/e2e/excel.cy.ts
View File

@ -405,13 +405,13 @@ const submitExcel = (callback?: any) => {
const rejectExcel = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (
approvalButton.innerText
.toLowerCase()
.includes('approve')
.includes('go to approvals screen')
) {
approvalButton.click()
break
@ -438,13 +438,13 @@ const rejectExcel = (callback?: any) => {
const acceptExcel = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (
approvalButton.innerText
.toLowerCase()
.includes('approve')
.includes('go to approvals screen')
) {
approvalButton.click()
break

27
client/cypress/e2e/filtering.cy.ts
View File

@ -159,21 +159,20 @@ context('filtering tests: ', function () {
})
})
// TODO: fix
// it('7 | filter bestnum field BETWEEN', (done) => {
// openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
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()
// }
// )
// })
// })
// })
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`)

4
client/cypress/e2e/licensing.cy.ts
View File

@ -699,13 +699,13 @@ const submitTable = (callback?: any) => {
const approveTable = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (
approvalButton.innerText
.toLowerCase()
.includes('approve')
.includes('go to approvals screen')
) {
approvalButton.click()
break

4
client/cypress/e2e/liveness.cy.ts
View File

@ -125,13 +125,13 @@ const submitExcel = (callback?: any) => {
const rejectExcel = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (
approvalButton.innerText
.toLowerCase()
.includes('approve')
.includes('go to approvals screen')
) {
approvalButton.click()
break

8
client/cypress/integration/editor.tests.ts
View File

@ -221,10 +221,14 @@ const submitExcel = (callback?: any) => {
const rejectExcel = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (approvalButton.innerText.toLowerCase().includes('approve')) {
if (
approvalButton.innerText
.toLowerCase()
.includes('go to approvals screen')
) {
approvalButton.click()
break
}

16
client/cypress/integration/excel.tests.ts
View File

@ -407,10 +407,14 @@ const submitExcel = (callback?: any) => {
const rejectExcel = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (approvalButton.innerText.toLowerCase().includes('approve')) {
if (
approvalButton.innerText
.toLowerCase()
.includes('go to approvals screen')
) {
approvalButton.click()
break
}
@ -436,10 +440,14 @@ const rejectExcel = (callback?: any) => {
const acceptExcel = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (approvalButton.innerText.toLowerCase().includes('approve')) {
if (
approvalButton.innerText
.toLowerCase()
.includes('go to approvals screen')
) {
approvalButton.click()
break
}

8
client/cypress/integration/licensing.tests.ts
View File

@ -699,10 +699,14 @@ const submitTable = (callback?: any) => {
const approveTable = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (approvalButton.innerText.toLowerCase().includes('approve')) {
if (
approvalButton.innerText
.toLowerCase()
.includes('go to approvals screen')
) {
approvalButton.click()
break
}

8
client/cypress/integration/liveness.tests.ts
View File

@ -125,10 +125,14 @@ const submitExcel = (callback?: any) => {
const rejectExcel = (callback?: any) => {
cy.get('button', { timeout: longerCommandTimeout })
.should('contain', 'Approve')
.should('contain', 'Go to approvals screen')
.then((allButtons: any) => {
for (let approvalButton of allButtons) {
if (approvalButton.innerText.toLowerCase().includes('approve')) {
if (
approvalButton.innerText
.toLowerCase()
.includes('go to approvals screen')
) {
approvalButton.click()
break
}

2
client/karma.conf.js
View File

@ -42,4 +42,4 @@ module.exports = function (config) {
}
},
});
};
};

BIN
client/libraries/sheet-crypto.tgz.gpg
View File

Binary file not shown.

2
client/licenseChecker.js
View File

@ -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@14.3.0;handsontable@14.3.0;hyperformula@2.7.0;jackspeak@2.2.0;path-scurry@1.7.0'
'@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'
},
(error, json) => {
if (error) {

26053
client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

73
client/package.json
View File

@ -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": "npx ng test",
"test:headless": "npx ng test --no-watch --no-progress --browsers ChromeHeadlessCI",
"test": "ng test",
"test:headless": "ng test --browsers ChromeHeadless",
"watch": "ng test watch=true",
"pree2e": "webdriver-manager update",
"e2e": "protractor protractor.config.js",
@ -35,25 +35,24 @@
},
"private": true,
"dependencies": {
"@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",
"@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",
"@clr/icons": "^13.0.2",
"@clr/ui": "^17.0.1",
"@handsontable/angular": "^14.3.0",
"@clr/ui": "^13.17.0",
"@handsontable/angular": "^13.1.0",
"@sasjs/adapter": "4.10.2",
"@sasjs/utils": "^3.4.0",
"@sheet/crypto": "file:libraries/sheet-crypto.tgz",
"@sheet/crypto": "1.20211122.1",
"@types/d3-graphviz": "^2.6.7",
"@sheet/crypto": "file:libraries/sheet-crypto.tgz",
"@types/text-encoding": "0.0.35",
"base64-arraybuffer": "^0.2.0",
"buffer": "^5.4.3",
@ -61,7 +60,7 @@
"crypto-js": "^4.2.0",
"d3-graphviz": "^5.0.2",
"fs-extra": "^7.0.1",
"handsontable": "^14.3.0",
"handsontable": "^13.1.0",
"https-browserify": "1.0.0",
"hyperformula": "^2.5.0",
"iconv-lite": "^0.5.0",
@ -79,26 +78,24 @@
"stream-http": "3.2.0",
"text-encoding": "^0.7.0",
"tslib": "^2.3.0",
"vm": "^0.1.0",
"webpack": "^5.91.0",
"zone.js": "~0.14.4"
"zone.js": "~0.13.0"
},
"devDependencies": {
"@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",
"@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",
"@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.2.1",
"@types/es6-shim": "^0.31.39",
"@types/jasmine": "~5.1.4",
"@types/jasmine": "~3.6.0",
"@types/lodash-es": "^4.17.3",
"@types/marked": "^4.3.0",
"@types/node": "12.20.50",
@ -112,12 +109,12 @@
"es6-shim": "^0.35.5",
"eslint": "^8.33.0",
"git-describe": "^4.0.4",
"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",
"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",
"license-checker": "25.0.1",
"lodash-es": "^4.17.21",
"mochawesome": "^7.1.3",
@ -126,7 +123,9 @@
"rimraf": "3.0.2",
"ts-loader": "^9.2.8",
"ts-node": "^3.3.0",
"typescript": "~5.4.4",
"typedoc": "^0.24.8",
"typedoc-plugin-external-module-name": "^4.0.6",
"typescript": "~4.9.4",
"wait-on": "^6.0.1",
"watch": "^1.0.2"
}

17
client/src/app/app.component.html
View File

@ -12,7 +12,7 @@
<div class="alert-items">
<div class="alert-item static">
<div class="alert-icon-wrapper">
<cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
<clr-icon class="mt-2" shape="warning-standard"></clr-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">
<cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
<clr-icon class="mt-2" shape="warning-standard"></clr-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">
<cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
<clr-icon class="mt-2" shape="warning-standard"></clr-icon>
</div>
<div class="alert-text">
@ -85,7 +85,7 @@
<div class="alert-items">
<div class="alert-item static">
<div class="alert-icon-wrapper">
<cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
<clr-icon class="mt-2" shape="warning-standard"></clr-icon>
</div>
<div class="alert-text">
@ -204,7 +204,14 @@
</div>
</ng-container>
<app-header-actions></app-header-actions>
<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>
</header>
<nav
*ngIf="

288
client/src/app/app.component.scss
View File

@ -1,5 +1,3 @@
@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.
@ -8,7 +6,7 @@ app-requests-modal {
}
header.app-header {
background: $headerBackground !important;
background: #314351 !important;
color: #fff;
}
@ -44,7 +42,7 @@ header.app-header {
align-items: center;
padding: 30px;
z-index: 110;
background: $headerBackground;
background: #314351;
.expired-notice {
color: #e0e0e0;
@ -93,12 +91,33 @@ header {
}
}
.nav-link:hover {
color: #fafafa;
.nav
.nav-link {
color: #fafafa;
opacity: .9;
line-height: 1.45rem;
}
.nav-link.active {
background: #61717D;
.nav .nav-link:hover {
box-shadow: inset 0 -3px 0 transparent;
transition: box-shadow .2s ease-in;
}
.nav
.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;
}
}
@ -108,6 +127,15 @@ 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;
@ -135,44 +163,59 @@ header {
color: #fff;
}
::ng-deep {
.htInvalid {
background: black!important;
@media screen and (max-width: 768px) {
.navBarResp {
display: flex;
justify-content: flex-start;
background: #495A67;
color: #fff;
}
@media screen and (max-width:480px) {
h2 {
font-size: .7rem!important;
}
h3 {
font-size: .7rem;
}
.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;
}
@media screen and (max-width:480px) {
h2 {
font-size: .7rem!important;
}
h3 {
font-size: .7rem;
}
}
.nav-link {
padding: 0rem 1rem 0rem 1rem;
}
body[cds-theme="light"] {
.btn-primary .btn, .btn.btn-primary {
border-color: $headerBackground;
background-color: $headerBackground;
color: #fff;
}
.btn-primary .btn, .btn.btn-primary {
border-color: #314351;
background-color: #314351;
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 {
cursor: pointer;
display: inline-block;
@ -193,32 +236,36 @@ 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: $headerBackground;
border-color: #314351;
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;
@ -251,68 +298,65 @@ header {
width: 350px;
}
/* Left and right */
/* Column headers */
body[cds-theme="light"] {
.wtBorder {
background-color: #495A67!important;
}
.ht_master tr:nth-of-type(odd) > td {
filter: brightness(0.95);
}
.handsontable {
background-color: #ffffff;
// border: 1px solid #ccc;
border-radius: 3px;
}
.handsontable th {
background-color: #fafafa;
}
$darkBorderColor: #697c85;
/* Left and right */
.ht_clone_left th {
border-right: 1px solid #ccc;
border-left: 1px solid #ccc;
}
body[cds-theme="dark"] {
.ht_master tr:nth-of-type(odd) > td {
filter: brightness(1.2);
}
/* Column headers */
.ht_clone_top th {
border-top: 1px solid #ccc;
border-right: 1px solid #ccc;
border-bottom: 1px solid #ccc;
}
.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;
}
.ht_clone_top_left_corner th {
border-right: 1px solid #ccc;
}
.handsontable td {
// border-right: 1px solid #697c85;
// border-bottom: 1px solid #697c85;
border-color: $darkBorderColor;
}
.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;
}
.handsontable tr:first-child th, .handsontable tr:first-child td {
border-color: $darkBorderColor;
}
.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;
}
.handsontable .handsontable.ht_clone_top .wtHider {
border-color: $darkBorderColor;
}
.handsontable .changeType {
background-color: #3c5662;
border-color: $darkBorderColor;
}
.handsontableInput {
background-color: #708b98;
}
.wtBorder {
background-color: #495A67!important;
}
.handsontable .handsontable.ht_clone_top .wtHider {
padding: 0 0 0px 0!important;
margin: 0px;
border-bottom: 3px solid #d6d3d3;
}
.content-container {
background: #F5F6FF;
}
body[cds-theme="light"] {
.content-container {
// background: red;
background: #F5F6FF;
}
.card {
box-shadow: 0 0.125rem 0 0 #d7d7d7;
border-radius: .0rem;
border: 1px solid transparent;
// min-height: calc(100vh - 150px);
}
.datagrid-compact, .datagrid-history{
@ -320,6 +364,8 @@ header {
border-collapse: separate;
border: 1px solid transparent;
border-radius: .125rem;
background-color: #fff;
color: #565656;
margin: 0;
margin-top: 1rem;
max-width: 100%;
@ -341,8 +387,8 @@ header {
}
.datagrid-footer {
position: absolute;
right: 30px;
top: 1px;
right: 15px;
top: 2px;
}
.datagrid .datagrid-head {
background-color: #fff;
@ -362,6 +408,7 @@ 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);
@ -376,6 +423,8 @@ header {
border-collapse: separate;
border: 1px solid transparent;
border-radius: 0px;
background-color: #fff;
color: #565656;
margin: 0;
margin-top: 1rem;
max-width: 100%;
@ -386,6 +435,7 @@ header {
font-size: .45833rem;
font-weight: 600;
letter-spacing: .03em;
background-color: #fff;
vertical-align: bottom;
border-bottom: 1px solid #ccc;
text-transform: uppercase;
@ -408,34 +458,4 @@ header {
max-width: 400px;
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;
}
}

9
client/src/app/app.component.ts
View File

@ -13,15 +13,6 @@ 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,
sunIcon
} from '@cds/core/icon'
ClarityIcons.addIcons(moonIcon, sunIcon, exclamationTriangleIcon)
@Component({
selector: 'my-app',

5
client/src/app/app.module.ts
View File

@ -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,11 +46,12 @@ import { AppSettingsService } from './services/app-settings.service'
SharedModule,
ClarityModule,
AppSharedModule,
HomeModule,
PipesModule,
DirectivesModule,
NgxJsonViewerModule
],
providers: [AppService, SasStoreService, LicensingGuard, AppSettingsService],
providers: [AppService, SasStoreService, LicensingGuard],
bootstrap: [AppComponent]
})
export class AppModule {}

5
client/src/app/app.routing.ts
View File

@ -45,10 +45,7 @@ export const ROUTES: Routes = [
path: 'licensing',
loadChildren: () => LicensingModule
},
{
path: 'home',
loadChildren: () => HomeModule
},
{ path: 'home', loadChildren: () => HomeModule },
{
/**
* Load editor module with subroutes

7
client/src/app/directives/directives.module.ts
View File

@ -4,23 +4,20 @@ 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,
StealFocusDirective
FileSelectDirective
],
imports: [CommonModule],
exports: [
NgVarDirective,
DragNdropDirective,
FileDropDirective,
FileSelectDirective,
StealFocusDirective
FileSelectDirective
]
})
export class DirectivesModule {}

17
client/src/app/directives/steal-focus.directive.ts
View File

@ -1,17 +0,0 @@
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()
}
}

6
client/src/app/editor/components/edit-record/edit-record.component.html
View File

@ -112,7 +112,7 @@
<div
*ngIf="
['autocomplete', 'autocomplete.custom'].includes(
['autocomplete'].includes(
$any(currentRecordValidator?.getRule(col.key)?.editor)
)
"
@ -163,7 +163,7 @@
<div
*ngIf="
['autocomplete', 'autocomplete.custom'].includes(
['autocomplete'].includes(
$any(currentRecordValidator?.getRule(col.key)?.editor)
)
"
@ -277,7 +277,7 @@
<div>
<button
type="button"
class="btn btn-outline focusable mr-5i"
class="btn btn-outline focusable"
(click)="currentRecord!.noLinkOption = false; closeRecordEdit()"
>
Cancel

3
client/src/app/editor/components/edit-record/edit-record.component.scss
View File

@ -38,6 +38,7 @@
app-soft-select {
display: block;
width: 224px;
background: #fff;
border: 1px solid #999;
color: #000;
padding: calc(.25rem + 2px) .5rem;
@ -48,6 +49,7 @@
input {
width: 100%;
border: 0;
background-color: #fff;
&:focus {
background: none;
@ -130,6 +132,7 @@
clr-input-container {
width: 224px;
background: #fff;
border: 1px solid #999;
color: #000;
padding: calc(.25rem + 2px) .5rem;

89
client/src/app/editor/editor.component.html
View File

@ -164,28 +164,19 @@
<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-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>
<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
</span>
<span
(click)="viewboxManager()"
class="btn icon-collapse btn-sm btn-icon btn-dimmed viewbox-open"
>
<span (click)="viewboxManager()" class="btn btn-sm viewbox-open">
<clr-icon shape="view-cards" size="20"></clr-icon>
<span class="text">Viewboxes</span>
Viewboxes
</span>
</div>
<div
class="clr-col-12 clr-col-md-5 clr-col-lg-4 d-flex flex-column align-items-center"
class="clr-col-12 clr-col-lg-4 d-flex flex-column align-items-center"
[class.clr-col-lg-12]="!tableTrue"
>
<h4
@ -212,21 +203,18 @@
<span clrTooltipTrigger>
{{ libdsParsed.libName }}.<a
class="mr-10 view-table"
class="mr-10"
[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-content
clrPosition="bottom-left"
clrSize="lg"
*clrIfOpen
>
{{ this.dsNote }}
</clr-tooltip-content>
</clr-tooltip>
<ng-container *ngIf="dataSource">
@ -240,37 +228,34 @@
</ng-container>
</h4>
</div>
<div
*ngIf="tableTrue"
class="clr-col-12 clr-col-md-4 clr-col-lg-4 btnCtrl"
>
<div *ngIf="tableTrue" class="clr-col-12 clr-col-lg-4 btnCtrl">
<ng-container *ngIf="hotTable.readOnly && !uploadPreview">
<button
type="button"
class="btnView btn icon-collapse btn-sm btn-icon btn-block btn-dimmed"
class="btnView btn btn-sm btn-icon btn-block"
(click)="openQb()"
>
<clr-icon shape="filter"></clr-icon>
<span class="text">Filter</span>
<span>Filter</span>
</button>
<button
type="button"
class="btn icon-collapse btn-sm btn-primary btn-block"
class="btn btn-sm btn-primary btn-block"
(click)="editTable()"
>
<clr-icon shape="note"></clr-icon>
<span class="text">Edit</span>
<span>Edit</span>
</button>
<button
*ngIf="!columnLevelSecurityFlag"
(click)="onShowUploadModal()"
type="button"
class="btn icon-collapse btn-sm btn-success btn-block mr-0"
class="btn btn-sm btn-success btn-block mr-0"
>
<clr-icon shape="upload"></clr-icon>
<span class="text">Upload</span>
<span>Upload</span>
</button>
</ng-container>
@ -374,8 +359,8 @@
<ng-container *ngIf="!getdataError">
<span class="spinner"> Loading... </span>
<div class="mt-10">
<p cds-text="section">Loading table</p>
<div>
<h3>Loading table</h3>
</div>
</ng-container>
@ -384,8 +369,8 @@
<clr-icon shape="error-standard" class="error-icon"></clr-icon>
</span>
<div class="mt-10">
<p cds-text="section">Loading table error</p>
<div>
<h3>Loading table error</h3>
</div>
</ng-container>
</div>
@ -410,7 +395,6 @@
hotId="hotInstance"
id="hotTable"
class="edit-hot"
className="htDark"
[class.hidden]="hotTable.hidden"
[licenseKey]="hotTable.licenseKey"
>
@ -499,15 +483,11 @@
support&#64;datacontroller.io</span
>
<div *ngIf="tableTrue" class="clr-offset-md-2 clr-col-md-8">
<div class="text-area-full-width">
<label for="formFields_8" class="mb-5 d-block"
>Message</label
>
<div class="form-group">
<label for="formFields_8">Message</label>
<textarea
clrTextarea
[(ngModel)]="message"
[disabled]="!validationDone"
tabindex="0"
[value]="
!validationDone
? 'Please wait while we validate ' +
@ -515,9 +495,10 @@
' cells.'
: ''
"
class="submit-reason"
class="w-100"
type="text"
id="formFields_8"
rows="5"
></textarea>
</div>
<!-- TODO:approvers list -->
@ -536,7 +517,6 @@
[disabled]="!validationDone"
type="submit"
class="btn btn-sm btn-success-outline m-0"
tabindex="0"
(click)="saveTable(hotTable.data)"
>
Submit
@ -545,7 +525,6 @@
id="cancelSubmitBtn"
type="button"
class="btn btn-sm btn-outline"
tabindex="0"
(click)="cancelSubmit(); submit = false; validationDone = 0"
>
Cancel
@ -864,12 +843,6 @@
</div>
</clr-modal>
<app-dataset-info
[(open)]="datasetInfo"
[dsmeta]="dsmeta"
[versions]="versions"
(rowClicked)="datasetInfoModalRowClicked($event)"
>
</app-dataset-info>
<app-dataset-info [(open)]="datasetInfo" [dsmeta]="dsmeta"></app-dataset-info>
<app-viewboxes [(viewboxModal)]="viewboxes"></app-viewboxes>

27
client/src/app/editor/editor.component.scss
View File

@ -21,12 +21,12 @@ hot-table {
.handsontable tbody th.ht__highlight, .handsontable thead th.ht__highlight {
&.primaryKeyHeaderStyle {
background-color: #306b00b0 !important;
background: #306b00b0;
}
}
.primaryKeyHeaderStyle {
background-color: #306b006e !important;
background: #306b006e;
}
th.readonlyCell {
@ -41,12 +41,6 @@ hot-table {
}
}
.submit-reason {
min-height: 120px;
max-height: 120px;
height: 120px;
}
.infoBar {
margin-top:14px;
background: #495967;
@ -86,7 +80,8 @@ hot-table {
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
background: var(--clr-vertical-nav-bg-color);
background: #ffffff;
background: #f5f6fe;
}
.error-icon {
@ -219,20 +214,6 @@ 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

103
client/src/app/editor/editor.component.ts
View File

@ -38,8 +38,7 @@ import { HotTableInterface } from '../models/HotTable.interface'
import {
$DataFormats,
DSMeta,
EditorsGetDataServiceResponse,
Version
EditorsGetDataServiceResponse
} from '../models/sas/editors-getdata.model'
import { DataFormat } from '../models/sas/common/DateFormat'
import SheetInfo from '../models/SheetInfo'
@ -122,7 +121,6 @@ export class EditorComponent implements OnInit, AfterViewInit {
datasetInfo: boolean = false
dsmeta: DSMeta[] = []
versions: Version[] = []
dsNote = ''
viewboxes: boolean = false
@ -982,18 +980,15 @@ export class EditorComponent implements OnInit, AfterViewInit {
// Apply licence rows limitation if exists, it is only affecting data
// which will be send to SAS
const strippedCsvArrayData = csvArrayData.slice(
0,
this.licenceState.value.submit_rows_limit
)
const strippedCsvArrayData = csvArrayData.slice(0, this.licenceState.value.submit_rows_limit)
// To submit to sas service, we need clean version of CSV of file
// attached. XLSX will do the parsing and heavy lifting
// First we create worksheet of json (data we extracted)
let ws = XLSX.utils.json_to_sheet(strippedCsvArrayData, {
skipHeader: true
})
});
// create CSV to be uploaded from worksheet
let csvContentClean = XLSX.utils.sheet_to_csv(ws)
let csvContentClean = XLSX.utils.sheet_to_csv(ws);
// Prepend headers
csvContentClean = csvArrayHeaders.join(',') + '\n' + csvContentClean
@ -1958,13 +1953,13 @@ export class EditorComponent implements OnInit, AfterViewInit {
if (entry.values.length > 0) {
hot.setCellMeta(entry.row, entry.col, 'renderer', 'autocomplete')
hot.setCellMeta(entry.row, entry.col, 'editor', 'autocomplete.custom')
hot.setCellMeta(entry.row, entry.col, 'editor', 'autocomplete')
hot.setCellMeta(entry.row, entry.col, 'strict', entry.strict)
hot.setCellMeta(entry.row, entry.col, 'filter', false)
this.currentEditRecordValidator?.updateRule(entry.col, {
renderer: 'autocomplete',
editor: 'autocomplete.custom',
editor: 'autocomplete',
strict: entry.strict,
filter: false
})
@ -2044,7 +2039,7 @@ export class EditorComponent implements OnInit, AfterViewInit {
(el: DynamicExtendedCellValidation) =>
el.DISPLAY_TYPE === 'C' ? el.RAW_VALUE_CHAR : el.RAW_VALUE_NUM
)
const cellCol = hot.propToCol(cell) as number
const cellCol = hot.propToCol(cell)
const dynamicValidationEl =
this.disabledBasicDynamicCellValidationMap.find(
(x) => x.row === row && x.col === cellCol
@ -2059,13 +2054,13 @@ export class EditorComponent implements OnInit, AfterViewInit {
}
hot.setCellMeta(row, cellCol, 'renderer', 'autocomplete')
hot.setCellMeta(row, cellCol, 'editor', 'autocomplete.custom')
hot.setCellMeta(row, cellCol, 'editor', 'autocomplete')
hot.setCellMeta(row, cellCol, 'strict', cellValidationEntry.strict)
hot.setCellMeta(row, cellCol, 'filter', false)
this.currentEditRecordValidator?.updateRule(cellCol, {
renderer: 'autocomplete',
editor: 'autocomplete.custom',
editor: 'autocomplete',
strict: cellValidationEntry.strict,
filter: false
})
@ -2263,8 +2258,8 @@ export class EditorComponent implements OnInit, AfterViewInit {
setTimeout(() => {
let txt: any = document.getElementById('formFields_8')
if (txt) txt.focus()
}, 200)
txt.focus()
})
})
// let cnt = 0;
@ -2708,13 +2703,13 @@ export class EditorComponent implements OnInit, AfterViewInit {
const strict = this.cellValidationSource[validationSourceIndex].strict
hot.setCellMeta(row, column, 'renderer', 'autocomplete')
hot.setCellMeta(row, column, 'editor', 'autocomplete.custom')
hot.setCellMeta(row, column, 'editor', 'autocomplete')
hot.setCellMeta(row, column, 'strict', strict)
hot.setCellMeta(row, column, 'filter', false)
this.currentEditRecordValidator?.updateRule(column, {
renderer: 'autocomplete',
editor: 'autocomplete.custom',
editor: 'autocomplete',
strict: strict,
filter: false
})
@ -2766,7 +2761,6 @@ export class EditorComponent implements OnInit, AfterViewInit {
})
hot.setCellMeta(row, column, 'renderer', spinnerRenderer)
this.currentEditRecordLoadings.push(column)
hot.render()
@ -2937,16 +2931,6 @@ export class EditorComponent implements OnInit, AfterViewInit {
}
}
datasetInfoModalRowClicked(value: Version | DSMeta) {
if ((<Version>value).LOAD_REF !== undefined) {
// Type is Version
const row = value as Version
const url = `/stage/${row.LOAD_REF}`
this.router.navigate([url])
}
}
viewboxManager() {
this.viewboxes = true
}
@ -2959,37 +2943,6 @@ export class EditorComponent implements OnInit, AfterViewInit {
)
}
/**
* Function checks if selected hot cell is solo cell selected
* and if it is, set the `filter` property based on filter param.
*
* @param filter
*/
private setCellFilter(filter: boolean) {
const hotSelected = this.hotInstance.getSelected()
const selection = hotSelected ? hotSelected[0] : hotSelected
// When we open a dropdown we want filter disabled so value in cell
// don't filter out items, since we want to see them all.
// But when we start typing we want to be able to start filtering values
// again
if (selection) {
const startRow = selection[0]
const endRow = selection[2]
const startCell = selection[1]
const endCell = selection[3]
if (startRow === endRow && startCell === endCell) {
const cellMeta = this.hotInstance.getCellMeta(startRow, startCell)
// If filter is not already set at the value in the param, set it
if (cellMeta && cellMeta.filter === !filter) {
this.hotInstance.setCellMeta(startRow, startCell, 'filter', filter)
}
}
}
}
async ngOnInit() {
this.licenceService.hot_license_key.subscribe(
(hot_license_key: string | undefined) => {
@ -3057,7 +3010,6 @@ export class EditorComponent implements OnInit, AfterViewInit {
this.cols = response.data.cols
this.dsmeta = response.data.dsmeta
this.versions = response.data.versions || []
const notes = this.dsmeta.find((item) => item.NAME === 'NOTES')
const longDesc = this.dsmeta.find((item) => item.NAME === 'DD_LONGDESC')
@ -3258,9 +3210,6 @@ export class EditorComponent implements OnInit, AfterViewInit {
if (col === 0) {
th.classList.add('firstColumnHeaderStyle')
}
// Dark mode
th.classList.add('darkTH')
},
afterGetCellMeta: (
row: number,
@ -3349,16 +3298,28 @@ export class EditorComponent implements OnInit, AfterViewInit {
}
)
hot.addHook('afterBeginEditing', () => {
hot.addHook('beforeKeyDown', (e: any) => {
const hotSelected = this.hotInstance.getSelected()
const selection = hotSelected ? hotSelected[0] : hotSelected
// When we open a dropdown we want filter disabled so value in cell
// don't filter out items, since we want to see them all.
this.setCellFilter(false)
})
hot.addHook('beforeKeyDown', () => {
// When we start typing, we are enabling the filter since we want to find
// values faster.
this.setCellFilter(true)
if (selection) {
const startRow = selection[0]
const endRow = selection[2]
const startCell = selection[1]
const endCell = selection[3]
if (startRow === endRow && startCell === endCell) {
const cellMeta = this.hotInstance.getCellMeta(startRow, startCell)
if (cellMeta && cellMeta.filter === false) {
this.hotInstance.setCellMeta(startRow, startCell, 'filter', true)
}
}
}
})
hot.addHook('afterChange', (source: any, change: any) => {
@ -3367,7 +3328,7 @@ export class EditorComponent implements OnInit, AfterViewInit {
const row = source[0][0]
const colProp = source[0][1]
const col = hot.propToCol(colProp) as number
const col = hot.propToCol(colProp)
// On edit we enabled filter for this cell, now when editing is finished
// We want filter to be disabled again, to be ready for next dropdown opening.

2
client/src/app/editor/editor.module.ts
View File

@ -12,6 +12,7 @@ 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'
@ -32,6 +33,7 @@ registerAllModules()
AppSharedModule,
DirectivesModule,
SharedModule,
HomeModule,
PipesModule,
DcTreeModule,
DragDropModule,

17
client/src/app/editor/utils/renderers.utils.ts
View File

@ -11,11 +11,9 @@ export const errorRenderer = (
value: any,
cellProperties: any
) => {
addDarkClass(td)
td.innerHTML = `${
value ? value.toString() : ''
} <cds-icon shape="exclamation-triangle" status="warning"></cds-icon>`
} <clr-icon shape="exclamation-circle" status="warning"></clr-icon>`
return td
}
@ -33,8 +31,6 @@ export const noSpinnerRenderer = (
value: any,
cellProperties: any
) => {
addDarkClass(td)
td.innerHTML = value ? value : ''
return td
@ -54,20 +50,9 @@ 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
client/src/app/group/group.component.html
View File

@ -3,7 +3,6 @@
<clr-tree-node *ngIf="groups" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchLibTreeInput
placeholder="Filter by Groups"
@ -28,7 +27,7 @@
<clr-tree-node
(click)="groupOnClick(group)"
*ngIf="!group['hidden']"
[class.active]="group.GROUPURI === groupUri"
[class.table-active]="group.GROUPURI === groupUri"
>
<p class="m-0 cursor-pointer list-padding">
<clr-icon shape="users"></clr-icon>

57
client/src/app/group/group.component.scss
View File

@ -1,63 +1,26 @@
@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%;
}
.group-info-text{
display: inline;
display: inline;
font-size: 20px;
}
.group-info{
border: 1px solid;
background-color: #f9f9f9;
border: 1px solid #a7a7a7;
border-radius: 3px;
box-shadow: 0px 2px 5px #dad7d7;
}
.group-info td{
text-align: center;
}
.group-data{
border: 1px solid;
background-color: #f9f9f9;
border: 1px solid #a7a7a7;
border-radius: 3px;
box-shadow: 0px 2px 5px #dad7d7;
}
.group-data{
min-height: auto;
h3, h5{
@ -65,11 +28,15 @@
}
.member-table{
background-color: #f9f9f9;
width: 100%;
}
.member-table thead{
background-color: #dadada;
}
.member-table tbody{
tr:hover{
background-color: #e6e6e6;
cursor: pointer;
}
}

40
client/src/app/home/home.component.html
View File

@ -4,7 +4,6 @@
<div class="tree-search-wrapper">
<input
clrInput
appStealFocus
#searchLibTreeInput
placeholder="Libraries"
name="input"
@ -47,7 +46,6 @@
<clr-tree-node *ngIf="library['tables']" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchTreeInput
placeholder="Tables"
@ -87,7 +85,7 @@
(click)="!tableLocked ? onTableClick(libTable, library) : ''"
class="clr-treenode-link"
[class.dc-locked-control]="tableLocked"
[class.active]="libTabActive(library.LIBRARYREF, libTable)"
[class.table-active]="libTabActive(library.LIBRARYREF, libTable)"
>
<ng-container [ngSwitch]="libTable.includes('-FC')">
<clr-icon *ngSwitchCase="true" shape="bolt"></clr-icon>
@ -96,17 +94,15 @@
{{ libTable.replace('-FC', '') }}
</button>
<ng-container *ngIf="tableLocked">
<clr-tooltip-content
clrPosition="bottom-right"
clrSize="lg"
*clrIfOpen
>
<span>
To unlock all tables, contact support&#64;datacontroller.io
</span>
</clr-tooltip-content>
</ng-container>
<clr-tooltip-content
clrPosition="bottom-right"
clrSize="lg"
*clrIfOpen
>
<span *ngIf="tableLocked">
To unlock all tables, contact support&#64;datacontroller.io
</span>
</clr-tooltip-content>
</clr-tooltip>
</clr-tree-node>
</clr-tree-node>
@ -128,20 +124,12 @@
size="60"
class="is-info icon-dc-fill"
></clr-icon>
<p
*ngIf="treeNodeLibraries?.length! > 0"
class="text-center color-gray mt-10"
cds-text="section"
>
<h3 *ngIf="treeNodeLibraries?.length! > 0" class="text-center color-gray">
Please select a table
</p>
<p
*ngIf="treeNodeLibraries?.length! < 1"
class="text-center color-gray mt-10"
cds-text="section"
>
</h3>
<h3 *ngIf="treeNodeLibraries?.length! < 1" class="text-center color-gray">
No Editable Tables Configured
</p>
</h3>
</div>
</div>
</div>

273
client/src/app/licensing/licensing.component.html
View File

@ -2,152 +2,147 @@
<div class="card-header">Licencing</div>
<div [ngSwitch]="action" class="card-block">
<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>
<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 *ngIf="licenseKeyData && userCountLimitation" class="m-0">
<strong>Allowed users:</strong>
{{ licenseKeyData.users_allowed }}
</p>
<p
class="key-error"
*ngIf="keyError"
[innerHTML]="licenseErrors[keyError]"
></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>
<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 *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>
</div>
</clr-tab-content>
</clr-tab>
</form>
<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>
<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>
<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
(click)="applyKeys()"
class="btn btn-primary apply-keys"
[clrLoading]="applyingKeys"
[disabled]="disableApplyButton"
>
Apply licence keys
</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>
<button
*ngIf="isAppFreeTier.value"
routerLink="/"
class="btn btn-sm btn-link"
>
Continue with free tier
</button>
</div>
</div>

1
client/src/app/licensing/licensing.component.scss
View File

@ -33,6 +33,7 @@
.apply-keys {
height: 40px;
width: 200px;
}
.drop-area {

11
client/src/app/lineage/lineage.component.html
View File

@ -3,7 +3,6 @@
<clr-tree-node *ngIf="libraryList" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchLibTreeInput
placeholder="Libraries"
@ -43,7 +42,6 @@
<clr-tree-node *ngIf="library['tables']" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchTreeInput
placeholder="Tables"
@ -87,7 +85,6 @@
<clr-tree-node *ngIf="libTable['columns']" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchTreeInput
placeholder="Columns"
@ -141,9 +138,7 @@
size="60"
class="is-info icon-dc-fill"
></clr-icon>
<p class="text-center color-gray mt-10" cds-text="section">
Please select a column or table
</p>
<h3 class="text-center color-gray">Please select a column or table</h3>
</div>
<ng-container *ngIf="column || table">
@ -185,13 +180,13 @@
<button
(click)="limitDotDepth = true"
type="button"
class="btn btn-outline mr-5"
class="btn btn-outline"
>
Limit depth
</button>
<!-- <button class="btn btn-outline" (click)='showSvg()'> Open in New Tab </button> -->
<div class="btn-group direction d-block">
<div class="btn-group d-block">
<div
class="radio btn"
(click)="

10
client/src/app/lineage/lineage.component.scss
View File

@ -1,8 +1,6 @@
@import '../../colors.scss';
.toggle-switch input[type=checkbox]:checked+label:before {
border-color: $headerBackground;
background-color: $headerBackground !important;
border-color: #314351;
background-color: #314351!important;
transition: .15s ease-in;
transition-property: border-color,background-color;
}
@ -43,10 +41,6 @@ clr-tree-node button {
white-space: nowrap;
}
.btn-group.direction {
margin-left: var(--cds-global-space-6);
}
.graph-render-spinner {
position: absolute;
top: 0;

35
client/src/app/metadata/metadata.component.html
View File

@ -22,7 +22,6 @@
<clr-tree-node *ngIf="metaDataList" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchLibTreeInput
placeholder="search SAS Types"
@ -73,9 +72,7 @@
size="60"
class="is-info icon-dc-fill"
></clr-icon>
<p class="text-center color-gray mt-10" cds-text="section">
Please select a type
</p>
<h3 class="text-center color-gray">Please select a type</h3>
</div>
<div class="loadingSpinner" *ngIf="loading">
@ -126,18 +123,12 @@
[class.object-header]="!entry.count"
class="full-width"
>
<div>
<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 }}
<p class="float-right object-uri" *ngIf="!entry.count">
{{ entry.URI }}
</p>
@ -172,15 +163,9 @@
[clrExpandable]="true"
>
<div [class.object-header]="!entry.count" class="full-width">
<div>
<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 }}
<p class="float-right object-uri" *ngIf="!entry.count">
{{ entry.URI }}
</p>

21
client/src/app/metadata/metadata.component.scss
View File

@ -1,27 +1,14 @@
::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;
@ -53,13 +40,11 @@
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
client/src/app/models/AppSettings.ts
View File

@ -1,9 +0,0 @@
export interface AppSettings {
persistSelectedTheme: boolean
selectedTheme: AppThemes
}
export enum AppThemes {
light = 'light',
dark = 'dark'
}

13
client/src/app/models/sas/editors-getdata.model.ts
View File

@ -17,7 +17,6 @@ export interface EditorsGetDataSASResponse extends BaseSASResponse {
dqrules: DQRule[]
dsmeta: DSMeta[]
dqdata: DQData[]
versions: Version[]
cols: Col[]
maxvarlengths: Maxvarlength[]
xl_rules: any[]
@ -28,18 +27,6 @@ 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
View File

@ -1,9 +0,0 @@
import { BaseSASResponse } from './common/BaseSASResponse'
export interface EditorsRestoreServiceResponse extends BaseSASResponse {
restore_out: RestoreOut[]
}
export interface RestoreOut {
LOADREF: string
}

1
client/src/app/query/query.component.html
View File

@ -143,6 +143,7 @@
(ngModelChange)="
setVariableOperator(queryIndex, query.operator, clauseIndex)
"
class="mt-2"
clrSelect
>
<option *ngFor="let opr of query.operators">{{ opr }}</option>

32
client/src/app/query/query.component.scss
View File

@ -1,25 +1,3 @@
::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;
@ -31,12 +9,13 @@
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;
@ -241,11 +220,8 @@
vertical-align: middle;
margin: 0;
}
::ng-deep body[cds-theme="dark"] {
.line-numbers {
border-color: #989797 !important;
}
:not(pre) > code[class*="language-"], pre[class*="language-"] {
background-color: #fbf8f8;
}
pre[class*="language-"] {

16
client/src/app/query/query.component.ts
View File

@ -878,25 +878,17 @@ export class QueryComponent
*/
public hasInvalidCluase(clauses: any): boolean {
for (let clause of clauses) {
clause['invalidClause'] = false
if (
clause.value === '' &&
!(clause.operator === 'NE' || clause.operator === 'CONTAINS')
) {
clause['invalidClause'] = true
return true
}
if (
clause.variable === null ||
clause.operator === null ||
clause.value === null
clause.value === null ||
clause.value === ''
) {
clause['invalidClause'] = true
return true
} else {
clause['invalidClause'] = false
}
}

59
client/src/app/review/approve-details/approve-details.component.html
View File

@ -139,7 +139,10 @@
<div class="card-header p-0">
<div class="clr-row">
<div class="clr-col-md-4 approvalBack">
<span class="btn btn-outline m-0" (click)="goToApprovalsList()">
<span
class="btn btn-sm btn-outline m-0"
(click)="goToApprovalsList()"
>
<clr-icon shape="caret" dir="left" size="20"></clr-icon>Back to
approvals list
</span>
@ -206,22 +209,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 mr-5i"
class="btn btn-sm btn-outline text-center mt-5"
(click)="goToBase(jsParams?.TABLE_NM)"
>
View base table
Go to base table screen
</button>
<button
class="btn btn-sm btn-success-outline text-center mt-5 mr-5i"
class="btn btn-sm btn-success-outline text-center mt-5"
(click)="getTable(tableId)"
>
View staged data
Go to edited screen
</button>
<button
class="btn btn-sm btn-info-outline text-center mt-5"
(click)="goBack(jsParams?.TABLE_NM)"
>
Edit base table
Go back to editor
</button>
</div>
</div>
@ -233,7 +236,7 @@
id="acceptBtn"
[clrLoading]="acceptLoading"
type="submit"
class="btn btn-sm btn-success mr-5i"
class="btn btn-sm btn-success"
(click)="approveTable()"
[disabled]="
!loadingTable || params?.ISAPPROVER === 'NO' || noChanges
@ -243,7 +246,7 @@
</button>
<button
id="rejectBtn"
class="btn btn-sm btn btn-danger mr-5i"
class="btn btn-sm btn btn-danger mr-0"
(click)="rejectOpen = true"
[disabled]="
!loadingTable || params?.ISAPPROVER === 'NO' || noChanges
@ -284,15 +287,19 @@
>
<span class="label label-warning">
Changed Rows
<span class="badge">{{ lens.updated }}</span>
<span class="badge badge-warning">{{
lens.updated
}}</span>
</span>
<span class="label label-success">
Added Rows
<span class="badge">{{ lens.new }}</span>
<span class="badge badge-success">{{ lens.new }}</span>
</span>
<span class="label label-danger">
Deleted Rows
<span class="badge">{{ lens.deleted }}</span>
<span class="badge badge-danger">{{
lens.deleted
}}</span>
</span>
</div>
</div>
@ -307,8 +314,8 @@
class="h-24vh d-flex flex-column justify-content-center align-items-center"
>
<span class="spinner"> Loading... </span>
<div *ngIf="!loadingTable" class="mt-10">
<p cds-text="section">Loading table</p>
<div *ngIf="!loadingTable">
<h3>Loading table</h3>
</div>
</div>
@ -387,9 +394,9 @@
<div class="card-header">
<div class="clr-row">
<div class="clr-col-md-4 approvalBack">
<span class="btn btn-outline" (click)="goToSubmitList()">
<cds-icon shape="angle" direction="left" size="20"></cds-icon
>Back to submitted list
<span class="btn btn-sm btn-outline" (click)="goToSubmitList()">
<clr-icon shape="caret" dir="left" size="20"></clr-icon>Back to
submitted list
</span>
</div>
<div class="clr-col-md-4">
@ -436,22 +443,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 mr-5i"
class="btn btn-sm btn-outline text-center mt-5"
(click)="goToBase(subObj.base)"
>
View base table
Go to base table screen
</button>
<button
class="btn btn-sm btn-success-outline text-center mt-5 mr-5i"
class="btn btn-sm btn-success-outline text-center mt-5"
(click)="getTable(subObj.tableId)"
>
View staged data
Go to edited screen
</button>
<button
class="btn btn-sm btn-info-outline text-center mt-5"
(click)="goBack(subObj.base)"
>
Edit base table
Go back to editor
</button>
</div>
</div>
@ -473,15 +480,15 @@
>
<span class="label label-warning">
Changed Rows
<span class="badge">{{ lens.updated }}</span>
<span class="badge badge-warning">{{ lens.updated }}</span>
</span>
<span class="label label-success">
Added Rows
<span class="badge">{{ lens.new }}</span>
<span class="badge badge-success">{{ lens.new }}</span>
</span>
<span class="label label-danger">
Deleted Rows
<span class="badge">{{ lens.deleted }}</span>
<span class="badge badge-danger">{{ lens.deleted }}</span>
</span>
</div>
</div>
@ -515,8 +522,8 @@
class="h-25vh d-flex flex-column justify-content-center align-items-center"
>
<span class="spinner"> Loading... </span>
<div *ngIf="!loadingTable" class="mt-10">
<p cds-text="section">Loading table</p>
<div *ngIf="!loadingTable">
<h3>Loading table</h3>
</div>
</div>
<div class="tableCont">

49
client/src/app/review/approve-details/approve-details.component.scss
View File

@ -1,5 +1,3 @@
@import '../../../colors.scss';
.loader {
display:flex;
justify-content: center;
@ -12,48 +10,19 @@
}
.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;
}
@ -76,7 +45,7 @@ background: rgba(252, 135, 120, 0.4);
font-size: .54167rem;
font-weight: 400;
letter-spacing: normal;
background: $headerBackground;
background: #314351;
border-radius: .125rem;
color: #f0f1ec;;
line-height: .75rem;
@ -99,8 +68,8 @@ background: rgba(252, 135, 120, 0.4);
top: auto;
right: auto;
content: "";
border-left: .25rem solid $headerBackground;
border-top: .20833rem solid $headerBackground;
border-left: .25rem solid #314351;
border-top: .20833rem solid #314351;
border-right: .25rem solid transparent;
border-bottom: .20833rem solid transparent;
}
@ -110,8 +79,8 @@ border: 0px solid;
}
.toggle-switch input[type=checkbox]:checked+label:before {
border-color: $headerBackground;
background-color: $headerBackground !important;
border-color: #314351;
background-color: #314351!important;
transition: .15s ease-in;
transition-property: border-color,background-color;
}
@ -171,7 +140,7 @@ border: 0px solid;
.tooll {
position: absolute;
background: #e6b3b3;
color: $headerBackground;
color: #314351;
top: 0px;
height: 36px;
width: 100%;

18
client/src/app/review/approve/approve.component.html
View File

@ -99,11 +99,19 @@
</clr-dg-cell>
</clr-dg-row>
<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
>
<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"
>
{{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of
{{ pagination.totalItems }} approvals
</clr-dg-pagination>

8
client/src/app/review/approve/approve.component.scss
View File

@ -1,5 +1,3 @@
@import '../../../colors.scss';
.column-center {
display: flex;
flex-direction: column;
@ -15,11 +13,11 @@
}
.tooltip.tooltip-bottom-left>.tooltip-content, .tooltip .tooltip-content.tooltip-bottom-left {
background: $headerBackground !important;
background: #314351!important;
}
.tooltip.tooltip-bottom-left>.tooltip-content:before, .tooltip .tooltip-content.tooltip-bottom-left:before {
border-right: .25rem solid $headerBackground;
border-bottom: .20833rem solid $headerBackground;
border-right: .25rem solid #314351;
border-bottom: .20833rem solid #314351;
}
.noBorder {

18
client/src/app/review/submitter/submitter.component.html
View File

@ -86,11 +86,19 @@
</clr-dg-cell>
</clr-dg-row>
<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
>
<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"
>
{{ pagination.firstItem + 1 }} -
{{ pagination.lastItem + 1 }} of
{{ pagination.totalItems }} submissions

8
client/src/app/review/submitter/submitter.component.scss
View File

@ -1,15 +1,13 @@
@import '../../../colors.scss';
.noBorder {
border-bottom: 1px solid transparent!important;
}
.tooltip.tooltip-bottom-left>.tooltip-content, .tooltip .tooltip-content.tooltip-bottom-left {
background: $headerBackground !important;
background: #314351!important;
}
.tooltip.tooltip-bottom-left>.tooltip-content:before, .tooltip .tooltip-content.tooltip-bottom-left:before {
border-right: .25rem solid $headerBackground;
border-bottom: .20833rem solid $headerBackground;
border-right: .25rem solid #314351;
border-bottom: .20833rem solid #314351;
}
.no-submitted-tables {

3
client/src/app/role/role.component.html
View File

@ -3,7 +3,6 @@
<clr-tree-node *ngIf="roles" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchLibTreeInput
placeholder="Filter by Roles"
@ -27,7 +26,7 @@
<clr-tree-node
(click)="roleOnClick(role)"
*ngIf="!role['hidden']"
[class.active]="role.ROLEURI === roleUri"
[class.table-active]="role.ROLEURI === roleUri"
>
<p class="m-0 cursor-pointer list-padding">
<clr-icon shape="blocks-group"></clr-icon>

55
client/src/app/role/role.component.scss
View File

@ -1,61 +1,25 @@
@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%;
}
.role-info-text{
display: inline;
display: inline;
font-size: 20px;
}
.role-info{
border: 1px solid;
background-color: #f9f9f9;
border: 1px solid #a7a7a7;
border-radius: 3px;
box-shadow: 0px 2px 5px #dad7d7;
}
.role-info td{
text-align: center;
}
.role-data{
border: 1px solid;
background-color: #f9f9f9;
border: 1px solid #a7a7a7;
border-radius: 3px;
box-shadow: 0px 2px 5px #dad7d7;
}
.role-data{
min-height: unset;
@ -64,10 +28,15 @@
}
}
.member-table{
background-color: #f9f9f9;
width: 100%;
}
.member-table thead{
background-color: #dadada;
}
.member-table tbody{
tr:hover{
background-color: #e6e6e6;
cursor: pointer;
}
}

56
client/src/app/services/app-settings.service.ts
View File

@ -1,56 +0,0 @@
import { BehaviorSubject } from 'rxjs'
import { AppSettings, AppThemes } from '../models/AppSettings'
export class AppSettingsService {
public defaultSettings: AppSettings = {
persistSelectedTheme: true,
selectedTheme: AppThemes.light
}
public settings = new BehaviorSubject<AppSettings>(this.defaultSettings)
constructor() {
this.restoreAppSettings()
}
/**
* Restore app settings from the local storage
*/
restoreAppSettings() {
try {
const serializedSettings = localStorage.getItem('app-settings')
if (serializedSettings) {
const settings = JSON.parse(serializedSettings)
this.setAppSettings(settings)
} else {
console.info(
'No app settings stored in the localStorage, we will set to default values.'
)
}
} catch (err) {
console.warn('Error restoring settings from local storgae.', err)
}
}
/**
* Save app settings to the local storage
*/
storeAppSettings() {
localStorage.setItem('app-settings', JSON.stringify(this.settings.value))
}
/**
* Function used in the app to update global settings object
*
* @param appSettings contains properties that should be updated in settings
*/
setAppSettings(appSettings: Partial<AppSettings>) {
this.settings.next({
...this.settings.value,
...appSettings
})
this.storeAppSettings()
}
}

17
client/src/app/services/app.service.ts
View File

@ -7,8 +7,6 @@ import { BehaviorSubject } from 'rxjs'
import { LoggerService } from './logger.service'
import { EnvironmentInfo } from '../system/models/environment-info.model'
import { LicenceService } from './licence.service'
import { AppSettingsService } from './app-settings.service'
import { AppThemes } from '../models/AppSettings'
@Injectable()
export class AppService {
@ -20,7 +18,6 @@ export class AppService {
private eventService: EventService,
private sasService: SasService,
private loggerService: LoggerService,
private appSettingsService: AppSettingsService,
private router: Router
) {
this.subscribe()
@ -32,19 +29,6 @@ export class AppService {
}
}
})
const appSettings = this.appSettingsService.settings.value
if (!!appSettings.persistSelectedTheme) {
if (appSettings.selectedTheme === AppThemes.light) {
this.eventService.toggleDarkMode(false)
} else if (appSettings.selectedTheme === AppThemes.dark) {
this.eventService.toggleDarkMode(true)
} else {
// Fallback to light mode
this.eventService.toggleDarkMode(false)
}
}
}
sasServiceInit() {
@ -111,7 +95,6 @@ export class AppService {
MEMSIZE: res.MEMSIZE,
SYSPROCESSMODE: res.SYSPROCESSMODE,
SYSHOSTNAME: res.SYSHOSTNAME,
SYSUSERID: res.SYSUSERID,
SYSHOSTINFOLONG: res.SYSHOSTINFOLONG,
SYSENCODING: res.SYSENCODING,
AUTOEXEC: res.AUTOEXEC,

21
client/src/app/services/event.service.ts
View File

@ -1,9 +1,6 @@
import { Injectable, Output, EventEmitter } from '@angular/core'
import { InfoModal, AbortDetails } from '../models/InfoModal'
import { AlertsService } from '../shared/alerts/alerts.service'
import { BehaviorSubject } from 'rxjs'
import { AppSettingsService } from './app-settings.service'
import { AppThemes } from '../models/AppSettings'
@Injectable({
providedIn: 'root'
@ -20,23 +17,7 @@ export class EventService {
public viewLastUrl: string | null = null
public sidebarCloseLimit = 1280
public darkMode: BehaviorSubject<boolean> = new BehaviorSubject(false)
constructor(private appSettingsService: AppSettingsService) {}
toggleDarkMode(value: boolean) {
this.darkMode.next(value)
if (value) {
document.body.setAttribute('cds-theme', 'dark')
} else {
document.body.setAttribute('cds-theme', 'light')
}
this.appSettingsService.setAppSettings({
selectedTheme: value ? AppThemes.dark : AppThemes.light
})
}
constructor(private alertsService: AlertsService) {}
public showDemoLimitModal(featureName: string) {
this.onDemoLimitModalShow.emit(featureName)

26
client/src/app/shared/autocomplete/autocomplete.component.scss
View File

@ -1,6 +1,6 @@
.input-val {
border: 0px;
background: transparent;
background: #fbf8f8;
border-bottom: 1px solid #999999;
}
@ -13,29 +13,6 @@ input {
}
}
::ng-deep {
body[cds-theme="dark"] {
.datalist {
background: #21333b;
border: 1px solid #575757;
}
input {
color: #fff;
}
.datalist option {
color: #fff
}
}
body[cds-theme="light"] {
.datalist {
background: #fff;
}
}
}
.autocomplete-wrapper {
.overlay {
position: fixed;
@ -48,6 +25,7 @@ input {
.datalist {
position: fixed;
background: white;
box-shadow: 0px 3px 10px -1px #0000002b;
overflow: auto;
z-index: 2000;

22
client/src/app/shared/dataset-info/dataset-info.component.html
View File

@ -6,31 +6,25 @@
>
<h3 class="modal-title center text-center color-darker-gray">Dataset Meta</h3>
<div class="modal-body">
<p *ngIf="dsmetaTabs.length < 1" class="text-center">
<p *ngIf="dsmetaGroupped.length < 1" class="text-center">
No dataset meta to show.
</p>
<clr-tabs clrLayout="vertical">
<clr-tab *ngFor="let tab of tabs; let index = index">
<button clrTabLink id="link1">{{ tab.name }}</button>
<clr-tab *ngFor="let dsmeta of dsmetaGroupped; let index = index">
<button clrTabLink id="link1">{{ dsmeta.group }}</button>
<clr-tab-content
id="content1"
*clrIfActive="index === 0"
class="d-flex clr-justify-content-center w-100"
>
<clr-datagrid>
<ng-container *ngFor="let col of tab.colsToDisplay">
<clr-dg-column>{{ col.colName || col.colKey }}</clr-dg-column>
</ng-container>
<clr-dg-column>Name</clr-dg-column>
<clr-dg-column>Value</clr-dg-column>
<clr-dg-row
(click)="tab.onRowClick ? tab.onRowClick(info) : ''"
class="clickable-row"
*ngFor="let info of tab.meta"
>
<ng-container *ngFor="let col of tab.colsToDisplay">
<clr-dg-cell>{{ info[col.colKey] }}</clr-dg-cell>
</ng-container>
<clr-dg-row *ngFor="let info of dsmeta.dsmeta">
<clr-dg-cell>{{ info.NAME }}</clr-dg-cell>
<clr-dg-cell>{{ info.VALUE }}</clr-dg-cell>
</clr-dg-row>
</clr-datagrid>
</clr-tab-content>

19
client/src/app/shared/dataset-info/dataset-info.component.scss
View File

@ -13,23 +13,4 @@
}
}
}
}
clr-modal {
::ng-deep {
.modal-dialog {
height: 100%;
}
}
}
.clickable-row {
cursor: pointer;
}
::ng-deep {
.datagrid-table .datagrid-cell:focus {
outline: none;
outline-offset: 0;
}
}

55
client/src/app/shared/dataset-info/dataset-info.component.ts
View File

@ -7,8 +7,8 @@ import {
Output,
SimpleChanges
} from '@angular/core'
import { DSMeta, Version } from 'src/app/models/sas/editors-getdata.model'
import { Tab } from './models/dsmeta-groupped.model'
import { DSMeta } from 'src/app/models/sas/editors-getdata.model'
import { DSMetaGroupped } from './models/dsmeta-groupped.model'
@Component({
selector: 'app-dataset-info',
@ -18,15 +18,10 @@ import { Tab } from './models/dsmeta-groupped.model'
export class DatasetInfoComponent implements OnInit, OnChanges {
@Input() open: boolean = false
@Input() dsmeta: DSMeta[] = []
@Input() versions: Version[] = []
@Output() openChange = new EventEmitter<boolean>()
@Output() rowClicked = new EventEmitter<Version | DSMeta>()
dsmetaTabs: Tab<DSMeta>[] = []
versionsTabs: Tab<Version>[] = []
tabs: Tab<DSMeta | Version>[] = []
dsmetaGroupped: DSMetaGroupped[] = []
constructor() {}
@ -35,58 +30,28 @@ export class DatasetInfoComponent implements OnInit, OnChanges {
ngOnChanges(changes: SimpleChanges): void {
if (changes.dsmeta?.currentValue?.length > 0) {
this.parseDSMeta()
this.parseVersions()
this.tabs = [...[...this.dsmetaTabs], ...[...this.versionsTabs]]
}
}
parseDSMeta() {
this.dsmetaTabs = []
this.dsmetaGroupped = []
for (let info of this.dsmeta) {
let groupIndex = this.dsmetaTabs.findIndex(
(x) => x.name === info.ODS_TABLE
let groupIndex = this.dsmetaGroupped.findIndex(
(x) => x.group === info.ODS_TABLE
)
if (groupIndex < 0)
groupIndex =
this.dsmetaTabs.push({
name: info.ODS_TABLE,
title: 'Dataset Meta',
colsToDisplay: [{ colKey: 'NAME' }, { colKey: 'VALUE' }],
meta: [],
onRowClick: (value: DSMeta) => {
this.rowClicked.emit(value)
}
this.dsmetaGroupped.push({
group: info.ODS_TABLE,
dsmeta: []
}) - 1
this.dsmetaTabs[groupIndex].meta.push(info)
this.dsmetaGroupped[groupIndex].dsmeta.push(info)
}
}
parseVersions() {
this.versionsTabs = [
{
name: 'VERSIONS',
title: 'Dataset Meta',
colsToDisplay: [
{ colKey: 'LOAD_REF' },
{ colKey: 'USER_NM' },
{ colKey: 'VERSION_DTTM' },
{ colKey: 'NEW_RECORDS', colName: 'ADD' },
{ colKey: 'CHANGED_RECORDS', colName: 'MOD' },
{ colKey: 'DELETED_RECORDS', colName: 'DEL' },
{ colKey: 'VERSION_DESC' }
],
meta: this.versions,
onRowClick: (value: Version) => {
this.rowClicked.emit(value)
}
}
]
}
onOpenChange(open: boolean) {
this.open = open
this.openChange.emit(open)

18
client/src/app/shared/dataset-info/models/dsmeta-groupped.model.ts
View File

@ -1,14 +1,6 @@
export interface Tab<T> {
name: string
title: string
/**
* Columns to be displayed in the the grid
* If empty, all columns will be displayed
*/
colsToDisplay: {
colKey: string
colName?: string
}[]
meta: T[]
onRowClick?: (value: any) => void
import { DSMeta } from 'src/app/models/sas/editors-getdata.model'
export interface DSMetaGroupped {
group: string
dsmeta: DSMeta[]
}

5
client/src/app/shared/dc-tree/dc-tree.component.html
View File

@ -2,7 +2,6 @@
<clr-tree-node *ngIf="libraryList" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchLibTreeInput
placeholder="Libraries"
@ -46,7 +45,6 @@
<clr-tree-node *ngIf="library['tables']" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchTreeInput
placeholder="Tables"
@ -93,7 +91,7 @@
"
class="clr-treenode-link"
[class.dc-locked-control]="tableLocked"
[class.active]="libTabActive(library.LIBRARYREF, libTable)"
[class.table-active]="libTabActive(library.LIBRARYREF, libTable)"
>
<ng-container [ngSwitch]="libTable.includes('-FC')">
<clr-icon *ngSwitchCase="true" shape="bolt"></clr-icon>
@ -116,7 +114,6 @@
<clr-tree-node *ngIf="libTable['columns']" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchTreeInput
placeholder="Columns"

16
client/src/app/shared/dc-validator/dc-validator.ts
View File

@ -20,7 +20,6 @@ import { parseColType } from './utils/parseColType'
import { dqValidate } from './validations/dq-validation'
import { specialMissingNumericValidator } from './validations/hot-custom-validators'
import { applyNumericFormats } from './utils/applyNumericFormats'
import { CustomAutocompleteEditor } from './editors/numericAutocomplete'
export class DcValidator {
private rules: DcValidation[] = []
@ -39,8 +38,6 @@ export class DcValidator {
dqData: DQData[],
hotInstance?: Handsontable
) {
this.registerCustomEditors()
this.sasparams = sasparams
this.hotInstance = hotInstance
this.rules = parseColType(sasparams.COLTYPE)
@ -54,13 +51,6 @@ export class DcValidator {
this.setupValidations()
}
registerCustomEditors() {
Handsontable.editors.registerEditor(
'autocomplete.custom',
CustomAutocompleteEditor
)
}
getRules(): DcValidation[] {
return this.rules
}
@ -272,7 +262,6 @@ export class DcValidator {
if (source.length > 0) {
this.rules[i].source = source
this.rules[i].type = 'autocomplete'
this.rules[i].editor = 'autocomplete.custom'
this.rules[i].filter = false
}
@ -326,10 +315,7 @@ export class DcValidator {
// Because of dynamic cell validation, that will change the type of cell to dropdown
// `rules[i].colType` could be different type (eg. numeric). So we check if current cell is dropdown, to call HOT native dropdown validator
if (
this.editor === 'autocomplete' ||
this.editor === 'autocomplete.custom'
) {
if (this.editor === 'autocomplete') {
self
.getHandsontableValidator('autocomplete')
.call(this, value, (valid: boolean) => {

28
client/src/app/shared/dc-validator/editors/numericAutocomplete.ts
View File

@ -1,28 +0,0 @@
import Handsontable from 'handsontable'
import Core from 'handsontable/core'
export class CustomAutocompleteEditor extends Handsontable.editors
.AutocompleteEditor {
constructor(instance: Core) {
super(instance)
}
createElements() {
super.createElements()
}
// Listbox open
open(event?: Event | undefined): void {
super.open(event)
if (this.isCellNumeric()) {
this.htContainer.classList.add('numericListbox')
} else {
this.htContainer.classList.remove('numericListbox')
}
}
isCellNumeric() {
return this.cellProperties?.className?.includes('htNumeric')
}
}

2
client/src/app/shared/loading-indicator/loading-indicator.component.scss
View File

@ -11,8 +11,6 @@ $clr-green: #60b515;
height: $clr-header-height;
display: flex;
align-items: center;
height: 100%;
margin-right: 10px;
.spinner {
vertical-align: middle;

4
client/src/app/shared/login/login.component.scss
View File

@ -1,7 +1,5 @@
@import '../../../colors.scss';
.sideBarProps {
background: $headerBackground !important;
background: #314351!important;
color: #e0e0e0;
}

2
client/src/app/shared/requests-modal/requests-modal.component.html
View File

@ -16,6 +16,8 @@
*ngFor="let programLog of sasjsRequests; let i = index"
[id]="'request_' + i"
[clrStackViewLevel]="1"
[clrStackViewSetsize]="3"
[clrStackViewPosinset]="3"
>
<clr-stack-label>
{{ programLog.serviceLink }}

1
client/src/app/shared/requests-modal/requests-modal.component.scss
View File

@ -70,6 +70,7 @@
border-radius: 3px;
border: 1px solid #e2e2e2;
background-color: #fbfbfb;
height: 48vh;
overflow: auto;

6
client/src/app/shared/shared.module.ts
View File

@ -8,7 +8,7 @@ import { LoadingIndicatorComponent } from './loading-indicator/loading-indicator
import { LoginComponent } from './login/login.component'
import { UserService } from './user.service'
import { AlertsService } from './alerts/alerts.service'
import { HeaderActions } from './user-nav-dropdown/header-actions.component'
import { UserNavDropdownComponent } from './user-nav-dropdown/user-nav-dropdown.component'
import { AlertsComponent } from './alerts/alerts.component'
import { TermsComponent } from './terms/terms.component'
import { DirectivesModule } from '../directives/directives.module'
@ -26,7 +26,7 @@ import { ContactLinkComponent } from './contact-link/contact-link.component'
declarations: [
LoadingIndicatorComponent,
LoginComponent,
HeaderActions,
UserNavDropdownComponent,
AlertsComponent,
TermsComponent,
DatasetInfoComponent,
@ -35,7 +35,7 @@ import { ContactLinkComponent } from './contact-link/contact-link.component'
exports: [
LoadingIndicatorComponent,
LoginComponent,
HeaderActions,
UserNavDropdownComponent,
AlertsComponent,
TermsComponent,
DatasetInfoComponent,

6
client/src/app/shared/sidebar/sidebar.component.scss
View File

@ -1,10 +1,5 @@
$sidebarWidth: 272px;
.clr-vertical-nav .nav-link.active {
background-color: transparent;
padding-left: 5px;
}
clr-vertical-nav {
width: $sidebarWidth;
min-width: $sidebarWidth;
@ -12,6 +7,7 @@ clr-vertical-nav {
max-width: 375px;
position: relative;
box-shadow: 0 0 5px rgba(0, 0, 0, 0.12);
background-color: white !important;
.sun-dropdown {
min-height: 36px

2
client/src/app/shared/soft-select/soft-select.component.scss
View File

@ -1,6 +1,6 @@
.input-val {
border: 0px;
background: transparent;
background: #fbf8f8;
border-bottom: 1px solid #999999;
}

2
client/src/app/shared/terms/terms.component.scss
View File

@ -19,6 +19,8 @@
.card-block {
flex: 1;
overflow: auto;
background-color: #f4f4f4;
}
}

90
client/src/app/shared/user-nav-dropdown/header-actions.component.html
View File

@ -1,90 +0,0 @@
<div class="header-actions">
<div class="d-flex clr-align-items-center">
<cds-icon
*ngIf="!darkMode.value"
(click)="toggleDarkMode(true)"
size="md"
class="theme-toggle-icon cursor-pointer"
shape="moon"
inverse="false"
solid="false"
></cds-icon>
<cds-icon
*ngIf="!!darkMode.value"
(click)="toggleDarkMode(false)"
size="md"
class="theme-toggle-icon cursor-pointer"
shape="sun"
inverse="false"
solid="false"
></cds-icon>
</div>
<app-loading-indicator></app-loading-indicator>
<clr-dropdown class="app-nav-dropdown">
<button class="nav-text color-white" clrDropdownToggle>
<span>{{ userName }}</span>
<span *ngIf="userName !== 'Not logged in' && isViya"
><img class="avatar-img" src="{{ getPictureUrl() }}" alt=""
/></span>
<span
class="badge badge-danger"
*ngIf="!sasjsConfig.debug"
[class.hidden]="failedReqs.length === 0"
>{{ failedReqs.length }}</span
>
<span
class="badge badge-info"
*ngIf="sasjsConfig.debug"
[class.hidden]="debugLogs.length === 0"
>{{ debugLogs.length }}</span
>
<clr-icon *ngIf="!isViya" shape="caret down"></clr-icon>
</button>
<clr-dropdown-menu clrPosition="bottom-right" *clrIfOpen>
<div #dropdownItemDebug class="debug-switch-item" clrDropdownItem>
<clr-toggle-container
class="toggle-switch"
(click)="onDebugRowClick($event, dropdownItemDebug)"
>
<clr-toggle-wrapper>
<input
id="debug-toggle1"
type="checkbox"
[(ngModel)]="sasjsConfig.debug"
(ngModelChange)="onDebugModeChange()"
clrToggle
/>
<label>Debug Mode</label>
</clr-toggle-wrapper>
</clr-toggle-container>
</div>
<a (click)="openRequestsModal()" clrDropdownItem>
<span>SAS Requests</span>
</a>
<ng-container *ngIf="!isDeployPage">
<a
target="_blank"
href="https://docs.datacontroller.io"
clrDropdownItem
>
<span class="dropdown-text">Documentation</span>
</a>
</ng-container>
<div class="separator"></div>
<a href="..." routerLink="/system" clrDropdownItem>
<span>System</span>
</a>
<a href="..." (click)="logout($event)" clrDropdownItem>
<span>Log Out</span>
<clr-icon class="clr-logout" shape="logout"></clr-icon>
</a>
<div class="copyRight">
<span>v{{ commitVer }}</span>
</div>
</clr-dropdown-menu>
</clr-dropdown>
</div>

121
client/src/app/shared/user-nav-dropdown/user-nav-dropdown.component.html Normal file
View File

@ -0,0 +1,121 @@
<clr-dropdown class="app-nav-dropdown d-md-block">
<button class="nav-text color-white" clrDropdownToggle>
<span>{{ userName }}</span>
<span *ngIf="userName !== 'Not logged in' && isViya"
><img class="avatar-img" src="{{ getPictureUrl() }}" alt=""
/></span>
<span
class="badge badge-danger"
*ngIf="!sasjsConfig.debug"
[class.hidden]="failedReqs.length === 0"
>{{ failedReqs.length }}</span
>
<span
class="badge badge-info"
*ngIf="sasjsConfig.debug"
[class.hidden]="debugLogs.length === 0"
>{{ debugLogs.length }}</span
>
<clr-icon *ngIf="!isViya" shape="caret down"></clr-icon>
</button>
<clr-dropdown-menu clrPosition="bottom-right" *clrIfOpen>
<div #dropdownItemDebug class="debug-switch-item" clrDropdownItem>
<clr-toggle-container
class="toggle-switch"
(click)="onDebugRowClick($event, dropdownItemDebug)"
>
<clr-toggle-wrapper>
<input
id="debug-toggle1"
type="checkbox"
[(ngModel)]="sasjsConfig.debug"
(ngModelChange)="onDebugModeChange()"
clrToggle
/>
<label>Debug Mode</label>
</clr-toggle-wrapper>
</clr-toggle-container>
</div>
<a (click)="openRequestsModal()" clrDropdownItem>
<span>SAS Requests</span>
</a>
<ng-container *ngIf="!isDeployPage">
<a target="_blank" href="https://docs.datacontroller.io" clrDropdownItem>
<span class="dropdown-text">Documentation</span>
</a>
</ng-container>
<div class="separator"></div>
<a href="..." routerLink="/system" clrDropdownItem>
<span>System</span>
</a>
<a href="..." (click)="logout($event)" clrDropdownItem>
<span>Log Out</span>
<clr-icon class="clr-logout" shape="logout"></clr-icon>
</a>
<div class="copyRight">
<span>v{{ commitVer }}</span>
</div>
</clr-dropdown-menu>
</clr-dropdown>
<div class="content-container h-auto">
<nav class="sidenav d-block d-md-none" [clr-nav-level]="2">
<section class="sidenav-content">
<a href="..." class="nav-link active">
{{ userName }}
</a>
<div>
<form>
<div class="toggle-switch">
<input
id="debug-toggle2"
type="checkbox"
[(ngModel)]="sasjsConfig.debug"
(ngModelChange)="onDebugModeChange()"
[ngModelOptions]="{ standalone: true }"
/>
<label
for="debug-toggle2"
class="debug-toggle-label color-dark-gray"
>Debug Mode</label
>
</div>
</form>
</div>
<!-- <a href="..." class="nav-link d-block" [routerLink]="['/application-logs']">
<span>Application Logs</span>
<span class="badge" *ngIf="appLogs.length > 0">{{appLogs.length}}</span>
</a>
<a *ngIf="debugMode" class="nav-link d-block" href="..." [routerLink]="['/debug-logs']">
<span>Debug Logs</span>
<span class="badge badge-info" *ngIf="debugLogs.length > 0">{{debugLogs.length}}</span>
</a>
<a *ngIf="!debugMode" class="nav-link d-block" href="..." [routerLink]="['/failed-requests']">
<span>Failed Requests</span>
<span class="badge badge-danger" *ngIf="failedReqs.length > 0">{{failedReqs.length}}</span>
</a>
<a href="..." class="nav-link d-block" [routerLink]="['/errors']">
<span>Errors</span>
<span class="badge badge-warning" *ngIf="sasErrors.length > 0">{{sasErrors.length}}</span>
</a> -->
<a
class="nav-link d-block"
target="_blank"
href="https://docs.datacontroller.io"
>
<span>Documentation</span>
</a>
<div class="separator"></div>
<a routerLink="/system" class="nav-link d-block">
<span>System</span>
<clr-icon shape="logout"></clr-icon>
</a>
<a href="..." class="nav-link d-block" (click)="logout($event)">
<span>Log Out</span>
<clr-icon shape="logout"></clr-icon>
</a>
</section>
</nav>
</div>

16
client/src/app/shared/user-nav-dropdown/header-actions.component.scss → client/src/app/shared/user-nav-dropdown/user-nav-dropdown.component.scss
View File

@ -1,12 +1,17 @@
// it must be a better way to read clarity variables...
//@import '../../../../node_modules/@clr/ui/src/utils/helpers.clarity';
//@import '../../../../node_modules/@clr/ui/src/color/utils/colors.clarity';
//@import '../../../../node_modules/@clr/ui/src/color/utils/contrast-cache.clarity';
//@import '../../../../node_modules/@clr/ui/src/color/utils/helpers.clarity';
//@import '../../../../node_modules/@clr/ui/src/utils/variables.clarity';
$clr-header-height: 3rem;
$clr-near-white: #fafafa;
$clr-dark-gray: #565656;
$clr-light-gray: #eee;
:host {
display: contents;
}
.copyRight {
margin-top: 10px;
@ -65,6 +70,9 @@ $clr-light-gray: #eee;
height: 45px;
line-height: 40px;
span.dropdown-text{
color: $clr-dark-gray;
}
.badge {
position: absolute;

13
client/src/app/shared/user-nav-dropdown/header-actions.component.ts → client/src/app/shared/user-nav-dropdown/user-nav-dropdown.component.ts
View File

@ -8,11 +8,11 @@ import { EventService } from '../../services/event.service'
import { Router } from '@angular/router'
@Component({
selector: 'app-header-actions',
templateUrl: './header-actions.component.html',
styleUrls: ['./header-actions.component.scss']
selector: 'app-user-nav-dropdown',
templateUrl: './user-nav-dropdown.component.html',
styleUrls: ['./user-nav-dropdown.component.scss']
})
export class HeaderActions implements OnInit, OnDestroy {
export class UserNavDropdownComponent implements OnInit, OnDestroy {
public userName: string = 'Not logged in'
private reqSub: Subscription = new Subscription()
private userSub: Subscription = new Subscription()
@ -26,7 +26,6 @@ export class HeaderActions implements OnInit, OnDestroy {
public sasjsConfig: SASjsConfig = new SASjsConfig()
public requestsCount: number = 0
public commitVer: string = ''
public darkMode = this.eventService.darkMode
constructor(
private userService: UserService,
@ -52,10 +51,6 @@ export class HeaderActions implements OnInit, OnDestroy {
this.userSub.unsubscribe()
}
toggleDarkMode(value: boolean) {
this.eventService.toggleDarkMode(value)
}
openRequestsModal() {
this.eventService.openRequestsModal()
}

1
client/src/app/shared/viewboxes/viewboxes.component.html
View File

@ -389,7 +389,6 @@
*ngIf="viewboxTableIndex > -1"
[hotId]="'hotInstance_viewbox_' + viewbox.id"
id="hotTable"
className="htDark"
[readOnly]="true"
[modifyColWidth]="maxWidthCheker"
[copyPaste]="viewboxTables[viewboxTableIndex].hotTable.copyPaste"

42
client/src/app/shared/viewboxes/viewboxes.component.scss
View File

@ -38,10 +38,6 @@ dc-tree {
.add-new {
width: 50%;
padding-right: 5px;
> p {
margin-bottom: 1px;
}
}
.viewbox-limit-notice {
@ -49,38 +45,6 @@ dc-tree {
color: #E74C3C
}
::ng-deep body[cds-theme="dark"] {
.currently-open .open-viewbox:hover {
background: #314b57;
}
.cols-list {
background: #314b57;
color: #fff;
border-color: #858585;
}
.col-box {
background: #314b57;
border-color: #858585;
color: inherit;
}
}
::ng-deep body[cds-theme="light"] {
.currently-open .open-viewbox:hover {
background: #e8e8e8;
}
.cols-list {
background: #fff;
}
.col-box {
background: #fff;
}
}
.currently-open {
width: 50%;
@ -91,6 +55,10 @@ dc-tree {
&.selected {
background: #3c85002e;
}
&:hover {
background: #e8e8e8;
}
}
}
@ -212,6 +180,7 @@ dc-tree {
.cols-list {
border: solid 1px #ccc;
min-height: 60px;
background: white;
border-radius: 4px;
overflow: hidden;
display: block;
@ -230,6 +199,7 @@ dc-tree {
justify-content: space-between;
box-sizing: border-box;
cursor: move;
background: white;
font-size: 14px;
&.search:focus {

6
client/src/app/shared/viewboxes/viewboxes.component.ts
View File

@ -433,8 +433,6 @@ export class ViewboxesComponent implements OnInit, AfterViewInit, OnDestroy {
viewboxTable!.hotTable.headerPks.indexOf(column) > -1
if (isPKCol) th.classList.add('primaryKeyHeaderStyle')
// Dark mode
th.classList.add('darkTH')
}
})
hotInstance?.render()
@ -1078,7 +1076,7 @@ export class ViewboxesComponent implements OnInit, AfterViewInit, OnDestroy {
const hotInstance = this.getViewboxHotInstance(viewboxId)
if (hotInstance) {
const column = hotInstance.propToCol(colProp) as number
const column = hotInstance.propToCol(colProp)
const plugin = hotInstance.getPlugin('manualColumnMove')
plugin.moveColumn(column, finalIndex)
@ -1143,7 +1141,7 @@ export class ViewboxesComponent implements OnInit, AfterViewInit, OnDestroy {
if (hotInstance) {
const columns = colProps.map((prop: string) => {
return hotInstance.propToCol(prop) as number
return hotInstance.propToCol(prop)
})
hotInstance.updateSettings({

44
client/src/app/stage/stage.component.html
View File

@ -16,7 +16,7 @@
</div>
</div>
<div class="clr-row" ng-if="loaded">
<div class="card-block clr-col-md-6 no-borders">
<div class="card-block clr-col-md-6">
<div class="card-header py-5">
<div class="card-title text-center">Basic Submitted Details</div>
</div>
@ -51,65 +51,41 @@
</span>
</div>
</div>
<div class="clr-col-md-6 card-block no-borders">
<div class="clr-col-md-6 card-block">
<div class="card-header py-5">
<div class="card-title text-center">Actions</div>
</div>
<div class="mt-20">
<div class="row">
<button
class="btn btn-sm btn-outline text-center mr-5i"
class="btn btn-sm btn-outline text-center mt-20"
(click)="viewerTableScreen()"
[disabled]="revertingChanges"
>
View base table
Go to base table screen
</button>
<button
*ngIf="!(tableDetails?.['ALLOW_RESTORE'] === 'YES')"
id="approval-btn"
class="btn btn-sm btn-success-outline text-center mr-5i"
class="btn btn-sm btn-success-outline text-center mt-20"
[disabled]="
tableDetails?.REVIEW_STATUS_ID === 'APPROVED' ||
tableDetails?.REVIEW_STATUS_ID === 'REJECTED'
"
(click)="approveTableScreen()"
[disabled]="revertingChanges"
>
Approve
Go to approvals screen
</button>
<button
class="btn btn-sm btn-info-outline text-center mr-5i"
class="btn btn-sm btn-info-outline text-center mt-20"
(click)="goBack()"
[disabled]="revertingChanges"
>
Edit base table
Go back to editor
</button>
<button
class="btn btn-sm btn-success text-center mr-5i min-w-0"
class="btn btn-sm btn-success text-center mt-20 min-w-0"
(click)="download(tableDetails?.TABLE_ID)"
>
<clr-icon shape="download"></clr-icon>
</button>
<clr-tooltip>
<button
*ngIf="tableDetails?.['ALLOW_RESTORE'] === 'YES'"
(click)="revertChanges()"
clrTooltipTrigger
[clrLoading]="revertingChanges"
class="btn btn-sm btn-danger text-center mt-20"
>
REVERT
<clr-tooltip-content
clrPosition="bottom-left"
clrSize="lg"
*clrIfOpen
>
<span> Revert this and all subsequent changes </span>
</clr-tooltip-content>
</button>
</clr-tooltip>
</div>
</div>
</div>
@ -118,14 +94,12 @@
<hot-table
hotId="hotInstance"
id="hotTable"
className="htDark"
[data]="hotTable.data"
[colHeaders]="hotTable.colHeaders"
[columns]="hotTable.columns"
[maxRows]="hotTable.maxRows"
[height]="hotTable.height"
[licenseKey]="hotTable.licenseKey"
[afterGetColHeader]="hotTable.afterGetColHeader"
stretchH="all"
[cells]="hotTable.cells"
>

6
client/src/app/stage/stage.component.scss
View File

@ -12,10 +12,4 @@
cursor:pointer;
margin-top:10px;
color: #007cbb;
}
::ng-deep body[cds-theme="dark"] {
.baseTableLink {
color: #4ec0ff;
}
}

34
client/src/app/stage/stage.component.ts
View File

@ -4,10 +4,10 @@ import { Router } from '@angular/router'
import { ActivatedRoute } from '@angular/router'
import { SasService } from '../services/sas.service'
import { EventService } from '../services/event.service'
import { AppService } from '../services/app.service'
import { HotTableInterface } from '../models/HotTable.interface'
import { LicenceService } from '../services/licence.service'
import { globals } from '../_globals'
import { EditorsRestoreServiceResponse } from '../models/sas/editors-restore.model'
@Component({
selector: 'app-stage',
@ -23,7 +23,6 @@ export class StageComponent implements OnInit {
public keysArray: any
public tableDetails: any
public loaded: boolean = false
public revertingChanges: boolean = false
public licenceState = this.licenceService.licenceState
public hotTable: HotTableInterface = {
data: [],
@ -32,11 +31,7 @@ export class StageComponent implements OnInit {
height: 500,
settings: {},
licenseKey: undefined,
maxRows: this.licenceState.value.stage_rows_allowed || Infinity,
afterGetColHeader: (column, th, headerLevel) => {
// Dark mode
th.classList.add('darkTH')
}
maxRows: this.licenceState.value.stage_rows_allowed || Infinity
}
constructor(
@ -167,31 +162,6 @@ export class StageComponent implements OnInit {
}
}
revertChanges() {
this.revertingChanges = true
const data = {
restore_in: [
{
load_ref: this.table_id
}
]
}
this.sasService
.request('editors/restore', data)
.then((res: EditorsRestoreServiceResponse) => {
if (res.restore_out) {
this.route.navigate([`/stage`]).then(() => {
this.route.navigate([`/stage/${res.restore_out[0].LOADREF}`])
})
}
})
.finally(() => {
this.revertingChanges = false
})
}
private setFocus() {
setTimeout(() => {
let approvalBtn: any = window.document.getElementById('approval-btn')

1
client/src/app/system/models/environment-info.model.ts
View File

@ -6,7 +6,6 @@ export interface EnvironmentInfo {
MEMSIZE: string
SYSPROCESSMODE: string
SYSHOSTNAME: string
SYSUSERID: string
SYSHOSTINFOLONG: string
SYSENCODING: string
AUTOEXEC: string

76
client/src/app/system/system.component.html
View File

@ -9,94 +9,86 @@
class="sys-info d-flex clr-justify-content-center clr-flex-column clr-flex-lg-row"
>
<div>
<h6 cds-text="subsection" class="mb-10">
Environment Details <span class="dark"></span>
</h6>
<p cds-text="label" class="m-0">
<h6 class="m-0">Environment Details <span class="dark"></span></h6>
<p class="m-0">
SYSSITE: <span class="dark">{{ environmentInfo?.SYSSITE }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
SYSSCPL: <span class="dark">{{ environmentInfo?.SYSSCPL }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
SYSTCPIPHOSTNAME:
<span class="dark">{{ environmentInfo?.SYSTCPIPHOSTNAME }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
SYSVLONG: <span class="dark">{{ environmentInfo?.SYSVLONG }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
MEMSIZE: <span class="dark">{{ environmentInfo?.MEMSIZE }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
SYSPROCESSMODE:
<span class="dark">{{ environmentInfo?.SYSPROCESSMODE }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
SYSHOSTNAME:
<span class="dark">{{ environmentInfo?.SYSHOSTNAME }}</span>
</p>
<p cds-text="label" class="m-0">
SYSUSERID:
<span class="dark">{{ environmentInfo?.SYSUSERID }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
SYSHOSTINFOLONG:
<span class="dark">{{ environmentInfo?.SYSHOSTINFOLONG }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
SYSENCODING:
<span class="dark">{{ environmentInfo?.SYSENCODING }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
AUTOEXEC: <span class="dark">{{ environmentInfo?.AUTOEXEC }}</span>
</p>
<p class="m-0">
DC ADMIN GROUP:
<span class="dark">{{ environmentInfo?.DC_ADMIN_GROUP }}</span>
</p>
</div>
<div class="d-flex clr-justify-content-lg-center">
<div>
<h6 cds-text="subsection" class="mb-10">
<h6 class="m-0">
Data Controller Details <span class="dark"></span>
</h6>
<p cds-text="label" class="m-0">
<p class="m-0">
Application version:
<span class="dark">{{ appInfo.appVersion }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
Build timestamp:
<span class="dark">{{ appInfo.buildTimestamp }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
Adapter version:
<span class="dark">{{ appInfo.adapterVersion }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
HTTP: <span class="dark">{{ http ? 'YES' : 'NO' }}</span>
</p>
<p cds-text="label" class="m-0">
DC Admin Group:
<span class="dark">{{ environmentInfo?.DC_ADMIN_GROUP }}</span>
</p>
</div>
</div>
<div>
<h6 cds-text="subsection" class="mb-10">
Licence details <span class="dark"></span>
</h6>
<p cds-text="label" class="m-0">
<h6 class="m-0">Licence details <span class="dark"></span></h6>
<p class="m-0">
Valid until:
<span class="dark">{{ licenceInfo?.valid_until }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
Users allowed:
<span class="dark">{{ licenceInfo?.users_allowed }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
Site IDs:
<span class="dark">{{ licenceInfo?.site_id_multiple }}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
Free Tier:
<span class="dark">{{ licenceInfo?.demo ? 'YES' : 'NO' }}</span>
</p>
@ -165,25 +157,25 @@
licenceState.value.lineage_daily_limit
}}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
Viewboxes:
<span class="dark">{{
licenceState.value.viewbox ? 'YES' : 'NO'
}}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
File Upload:
<span class="dark">{{
licenceState.value.fileUpload ? 'YES' : 'NO'
}}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
Edit record:
<span class="dark">{{
licenceState.value.editRecord ? 'YES' : 'NO'
}}</span>
</p>
<p cds-text="label" class="m-0">
<p class="m-0">
Add record:
<span class="dark">{{
licenceState.value.addRecord ? 'YES' : 'NO'
@ -194,16 +186,6 @@
<hr class="w-100 light" />
<!-- Keep the logic in case we in future have more then 2 themes (light, dark) -->
<!-- -->
<!-- <div class="user-action">
Keep selected theme after reload
<clr-checkbox-wrapper>
<input [(ngModel)]="settings.persistSelectedTheme" (change)="settingChange($event)" value="persistDarkMode" type="checkbox" clrToggle />
</clr-checkbox-wrapper>
</div> -->
<ng-container *ngIf="environmentInfo?.ISADMIN === 1">
<div *ngIf="serverType === 'SAS9'" class="admin-action">
Refresh Data Lineage

5
client/src/app/system/system.component.scss
View File

@ -12,7 +12,7 @@
}
}
.admin-action, .user-action {
.admin-action {
display: flex;
justify-content: space-between;
align-items: center;
@ -27,8 +27,7 @@
}
.dark {
font-weight: bold;
margin-left: 5px;
color: black;
}
@media (max-width: 993px) {

15
client/src/app/system/system.component.ts
View File

@ -7,8 +7,6 @@ import { LicenceService } from '../services/licence.service'
import { SasService } from '../services/sas.service'
import { AppInfo } from './models/app-info.model'
import { EnvironmentInfo } from './models/environment-info.model'
import { AppSettingsService } from '../services/app-settings.service'
import { AppSettings } from '../models/AppSettings'
@Component({
selector: 'app-system',
@ -38,36 +36,25 @@ export class SystemComponent implements OnInit {
Infinity = Infinity
licenceState = this.licenceService.licenceState
settings: AppSettings
constructor(
private appService: AppService,
private sasService: SasService,
private licenceService: LicenceService,
private appSettingsService: AppSettingsService
private licenceService: LicenceService
) {
this.serverType = this.sasService.getServerType()
this.licenceInfo = this.licenceService.getLicenseKeyData()
this.environmentInfo = this.appService.getEnvironmentInfo()
this.settings = this.appSettingsService.settings.value
if (this.environmentInfo) {
this.environmentInfo.AUTOEXEC = decodeURIComponent(
this.environmentInfo.AUTOEXEC
)
}
this.appSettingsService.settings.subscribe((settings: AppSettings) => {
this.settings = settings
})
}
ngOnInit(): void {}
settingChange(event: Event) {
this.appSettingsService.setAppSettings(this.settings)
}
downloadConfiguration() {
let sasjsConfig = this.sasService.getSasjsConfig()
let storage = sasjsConfig.serverUrl

3
client/src/app/system/system.module.ts
View File

@ -4,10 +4,9 @@ import { CommonModule } from '@angular/common'
import { SystemRoutingModule } from './system-routing.module'
import { SystemComponent } from './system.component'
import { ClarityModule } from '@clr/angular'
import { FormsModule } from '@angular/forms'
@NgModule({
declarations: [SystemComponent],
imports: [CommonModule, SystemRoutingModule, ClarityModule, FormsModule]
imports: [CommonModule, SystemRoutingModule, ClarityModule]
})
export class SystemModule {}

3
client/src/app/user/user.component.html
View File

@ -3,7 +3,6 @@
<clr-tree-node *ngIf="users" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchLibTreeInput
placeholder="Filter by Users"
@ -27,7 +26,7 @@
<clr-tree-node
(click)="userOnClick(user)"
*ngIf="!user['hidden']"
[class.active]="userInfo?.URI === user.URI"
[class.table-active]="userInfo?.URI === user.URI"
>
<p class="m-0 cursor-pointer list-padding">
<clr-icon shape="user"></clr-icon>

53
client/src/app/user/user.component.scss
View File

@ -1,61 +1,24 @@
@import '../../colors.scss';
.sidebar-height{
height: 100%;
}
.user-info-text{
display: inline;
display: inline;
font-size: 20px;
}
::ng-deep body[cds-theme="dark"] {
.user-info {
background-color: $headerBackground;
border-color: $headerBackground;
}
.user-data {
background-color: $headerBackground;
border-color: $headerBackground;
}
.user-table tbody{
tr:hover{
background-color: #29404b;
}
}
}
::ng-deep body[cds-theme="light"] {
.user-info {
background-color: #f9f9f9;
border-color: #a7a7a7;
box-shadow: 0px 2px 5px #dad7d7;
}
.user-data {
background-color: #f9f9f9;
border-color: #a7a7a7;
box-shadow: 0px 2px 5px #dad7d7;
}
.user-table tbody{
tr:hover{
background-color: #e6e6e6;
}
}
}
.user-info{
border: 1px solid;
background-color: #f9f9f9;
border: 1px solid #a7a7a7;
border-radius: 3px;
box-shadow: 0px 2px 5px #dad7d7;
}
.user-info td{
text-align: center;
}
.user-data{
border: 1px solid;
background-color: #f9f9f9;
border: 1px solid #a7a7a7;
border-radius: 3px;
box-shadow: 0px 2px 5px #dad7d7;
}
.user-data{
min-height: auto;
@ -65,6 +28,7 @@
}
.user-table{
background-color: #f9f9f9;
width: 100%;
}
.user-table thead{
@ -72,6 +36,7 @@
}
.user-table tbody{
tr:hover{
background-color: #e6e6e6;
cursor: pointer;
}
}

147
client/src/app/viewer/viewer.component.html
View File

@ -7,7 +7,6 @@
<clr-tree-node *ngIf="libraries" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchLibTreeInput
[(ngModel)]="librariesSearch"
@ -51,7 +50,6 @@
<clr-tree-node *ngIf="library['tables']" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchTreeInput
[id]="'search_' + library.LIBRARYREF"
@ -93,7 +91,7 @@
(click)="!tableLocked ? onTableClick(libTable, library) : ''"
class="clr-treenode-link"
[class.dc-locked-control]="tableLocked"
[class.active]="libTabActive(library.LIBRARYREF, libTable)"
[class.table-active]="libTabActive(library.LIBRARYREF, libTable)"
>
<ng-container [ngSwitch]="libTable.includes('-FC')">
<clr-icon *ngSwitchCase="true" shape="bolt"></clr-icon>
@ -101,18 +99,15 @@
</ng-container>
{{ libTable.replace('-FC', '') }}
</button>
<ng-container *ngIf="tableLocked">
<clr-tooltip-content
clrPosition="bottom-right"
clrSize="lg"
*clrIfOpen
>
<span>
To unlock all tables, contact support&#64;datacontroller.io
</span>
</clr-tooltip-content>
</ng-container>
<clr-tooltip-content
clrPosition="bottom-right"
clrSize="lg"
*clrIfOpen
>
<span *ngIf="tableLocked">
To unlock all tables, contact support&#64;datacontroller.io
</span>
</clr-tooltip-content>
</clr-tooltip>
</clr-tree-node>
</clr-tree-node>
@ -197,7 +192,7 @@
<div class="modal-body web-query">
<div class="row">
<div class="clr-col-lg-12 clr-col-md-12 clr-col-sm-12 clr-col-xs-12">
<div class="card no-borders">
<div class="card">
<div class="card-header d-flex justify-content-between">
<span>Copy the below into your preferred client tool:</span>
@ -227,16 +222,15 @@
</div>
</div>
</div>
<div class="card-block web-query-wrapper word-break-all">
<div class="card-block word-break-all">
<textarea
clrTextarea
class="web-query-text"
class="web-query-text w-100"
rows="4"
cols="50"
#cliCommandInput
(focus)="onCliCommandFocus($event)"
type="text"
[value]="webQueryText"
value="{{ webQueryText }}"
readonly
>
</textarea>
@ -318,15 +312,12 @@
<div class="loadingSpinner" *ngIf="loadingTableView">
<span class="spinner"> Loading... </span>
<div class="mt-10">
<p cds-text="section">Loading Table Viewer</p>
<div>
<h4>Loading table viewer</h4>
</div>
</div>
<div
class="card no-borders h-100 d-flex clr-flex-column"
*ngIf="!loadingTableView"
>
<div class="card h-100 d-flex clr-flex-column" *ngIf="!loadingTableView">
<div
*ngIf="table"
class="header-row clr-row justify-content-between clr-justify-content-center w-100 m-0"
@ -367,11 +358,10 @@
</section>
<div class="title-col clr-col-auto clr-flex-column clr-flex-sm-row">
<p
cds-text="section"
class="clr-flex-column d-flex clr-flex-sm-row clr-align-items-center clr-justify-content-center"
<h3
class="viewerTitle clr-flex-column d-flex clr-flex-sm-row clr-align-items-center clr-justify-content-center"
>
<clr-tooltip class="d-flex clr-align-items-center">
<clr-tooltip class="d-flex">
<clr-icon
clrTooltipTrigger
(click)="datasetInfo = true"
@ -383,22 +373,19 @@
<clr-icon
*ngIf="tableTitle?.includes('-FC')"
shape="bolt"
class="color-yellow mr-5"
class="color-yellow mt-5 mr-5"
></clr-icon>
<span clrTooltipTrigger *ngIf="tableTitle && tableTitle.length > 0">
{{ tableTitle?.replace('-FC', '') }}
</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-content
clrPosition="bottom-left"
clrSize="lg"
*clrIfOpen
>
{{ this.dsNote }}
</clr-tooltip-content>
</clr-tooltip>
<ng-container *ngIf="tableTitle && tableTitle.length > 0">
@ -414,7 +401,7 @@
shape="refresh"
></clr-icon>
</ng-container>
</p>
</h3>
</div>
<div class="options-col clr-col-md">
@ -432,34 +419,62 @@
options
</button>
<clr-dropdown-menu clrPosition="bottom-right" *clrIfOpen>
<div (click)="newViewbox()" clrDropdownItem>
<button
type="button"
class="btn btn-sm btn-success-outline"
(click)="newViewbox()"
clrDropdownItem
>
<clr-icon shape="view-cards"></clr-icon>
<span>Viewboxes</span>
</div>
<div
</button>
<button
type="button"
class="btn btn-sm btn-success-outline"
*ngIf="tableEditExists()"
(click)="editTable()"
clrDropdownItem
>
<clr-icon shape="pencil"></clr-icon>
<span>Edit</span>
</div>
<div *ngIf="tableuri" (click)="goToLineage()" clrDropdownItem>
</button>
<button
type="button"
class="btn btn-sm btn-success-outline"
*ngIf="tableuri"
(click)="goToLineage()"
clrDropdownItem
>
<clr-icon shape="switch"></clr-icon>
<span>Lineage</span>
</div>
<div (click)="openQb()" clrDropdownItem>
</button>
<button
type="button"
class="btn btn-sm btn-outline btn-block"
(click)="openQb()"
clrDropdownItem
>
<clr-icon shape="filter"></clr-icon>
<span>Filter</span>
</div>
<div (click)="openDownload = true" clrDropdownItem>
</button>
<button
type="button"
class="btn btn-sm btn-success-outline"
(click)="openDownload = true"
clrDropdownItem
>
<clr-icon shape="download"></clr-icon>
<span>Download</span>
</div>
<div (click)="showWebQuery()" clrDropdownItem>
</button>
<button
type="button"
class="btn btn-sm btn-success-outline"
(click)="showWebQuery()"
clrDropdownItem
>
<clr-icon shape="download-cloud"></clr-icon>
<span>Web Query URL</span>
</div>
</button>
</clr-dropdown-menu>
</clr-dropdown>
</div>
@ -485,9 +500,7 @@
size="60"
class="is-info icon-dc-fill"
></clr-icon>
<h3 class="text-center color-gray mt-10" cds-text="section">
Please select a library
</h3>
<h3 class="text-center color-gray">Please select a library</h3>
</div>
<ng-container *ngIf="!noData && !noDataReqErr && !table && lib">
@ -498,10 +511,10 @@
class="form-block table-search-wrapper sw clr-col-md"
></section>
<div class="title-col clr-col-auto mt-15 mb-15">
<p cds-text="section">
<div class="title-col clr-col-auto">
<h3 class="viewerTitle mt-17">
{{ lib }}
</p>
</h3>
<clr-icon
(click)="reloadLibInfo()"
class="refresh-table"
@ -525,9 +538,7 @@
size="40"
class="is-info icon-dc-fill"
></clr-icon>
<p class="text-center color-gray mt-10" cds-text="section">
Please select a table
</p>
<h3 class="text-center color-gray">Please select a table</h3>
</div>
<div *ngIf="libinfo !== null" class="libinfo m-0 clr-row">
@ -617,7 +628,6 @@
<hot-table
hotId="hotInstance"
id="hotTable"
className="htDark"
[multiColumnSorting]="true"
[viewportRowRenderingOffset]="50"
[data]="hotTable.data"
@ -633,7 +643,6 @@
[cells]="hotTable.cells"
[maxRows]="hotTable.maxRows"
[manualColumnResize]="true"
[afterGetColHeader]="hotTable.afterGetColHeader"
[rowHeaders]="hotTable.rowHeaders"
[rowHeaderWidth]="hotTable.rowHeaderWidth"
[rowHeights]="hotTable.rowHeights"
@ -658,12 +667,6 @@
</div>
</div>
<app-dataset-info
[(open)]="datasetInfo"
[dsmeta]="dsmeta"
[versions]="versions"
(rowClicked)="datasetInfoModalRowClicked($event)"
>
</app-dataset-info>
<app-dataset-info [(open)]="datasetInfo" [dsmeta]="dsmeta"></app-dataset-info>
<app-viewboxes [(viewboxModal)]="viewboxOpen"></app-viewboxes>

58
client/src/app/viewer/viewer.component.scss
View File

@ -1,5 +1,3 @@
@import '../../colors.scss';
.card {
margin-top: 0;
@ -13,8 +11,8 @@ clr-tree-node button {
}
.toggle-switch input[type=checkbox]:checked+label:before {
border-color: $headerBackground;
background-color: $headerBackground !important;
border-color: #314351;
background-color: #314351!important;
transition: .15s ease-in;
transition-property: border-color,background-color;
}
@ -56,6 +54,11 @@ clr-tree-node button {
}
}
.viewerTitle {
text-align:center;
margin-bottom: 15px;
}
.dropdown-menu {
width: 180px;
margin-top: -18px;
@ -122,14 +125,8 @@ clr-tree-node button {
hot-table {
::ng-deep {
.handsontable tbody th.ht__highlight, .handsontable thead th.ht__highlight {
&.primaryKeyHeaderStyle {
background-color: #306b00b0 !important;
}
}
.primaryKeyHeaderStyle {
background-color: #306b006e !important;
background: #306b006e;
}
}
}
@ -147,45 +144,6 @@ hot-table {
.web-query-text {
min-height: 100px;
max-height: 100px;
width: 100% !important;
}
.web-query-wrapper {
::ng-deep {
.clr-control-container {
width: 100%;
}
clr-textarea-container {
margin: 0 !important;
}
.clr-textarea-wrapper {
margin: 0 !important;
}
}
}
}
.table-search-wrapper {
margin-left: 0;
form {
padding-left: 0;
}
clr-icon {
margin-top: 4px;
}
::ng-deep {
clr-input-container {
margin-top: 0;
}
.clr-control-container {
margin-left: 0;
}
}
}

27
client/src/app/viewer/viewer.component.ts
View File

@ -25,11 +25,7 @@ import { FilterGroup, FilterQuery } from '../models/FilterQuery'
import { HotTableInterface } from '../models/HotTable.interface'
import { LoggerService } from '../services/logger.service'
import Handsontable from 'handsontable'
import {
$DataFormats,
DSMeta,
Version
} from '../models/sas/editors-getdata.model'
import { $DataFormats, DSMeta } from '../models/sas/editors-getdata.model'
import { mergeColsRules } from '../shared/dc-validator/utils/mergeColsRules'
import { PublicViewtablesServiceResponse } from '../models/sas/public-viewtables.model'
import { PublicViewlibsServiceResponse } from '../models/sas/public-viewlibs.model'
@ -99,7 +95,6 @@ export class ViewerComponent implements AfterContentInit, AfterViewInit {
public $dataFormats: $DataFormats | null = null
public datasetInfo: boolean = false
public dsmeta: DSMeta[] = []
public versions: Version[] = []
public dsNote = ''
public licenceState = this.licenceService.licenceState
@ -112,14 +107,11 @@ export class ViewerComponent implements AfterContentInit, AfterViewInit {
height: '100%',
maxRows: this.licenceState.value.viewer_rows_allowed || Infinity,
settings: {},
afterGetColHeader: undefined,
licenseKey: undefined,
rowHeaders: (index: number) => {
return ' '
},
afterGetColHeader: (col: number, th: any, headerLevel: number) => {
// Dark mode
th.classList.add('darkTH')
},
rowHeaderWidth: 15,
rowHeights: 20,
contextMenu: ['copy_with_column_headers', 'copy_column_headers_only'],
@ -255,7 +247,6 @@ export class ViewerComponent implements AfterContentInit, AfterViewInit {
this.hotTable.data = res.viewdata
this.$dataFormats = res.$viewdata
this.dsmeta = res.dsmeta
this.versions = res.versions || []
this.setDSNote()
this.numberOfRows = res.sasparams[0].NOBS
this.queryText = res.sasparams[0].FILTER_TEXT
@ -814,7 +805,6 @@ export class ViewerComponent implements AfterContentInit, AfterViewInit {
this.hotTable.data = res.viewdata
this.$dataFormats = res.$viewdata
this.dsmeta = res.dsmeta
this.versions = res.versions || []
this.setDSNote()
this.queryText = res.sasparams[0].FILTER_TEXT
let columns: any[] = []
@ -1029,16 +1019,6 @@ export class ViewerComponent implements AfterContentInit, AfterViewInit {
this.sasStoreService.removeClause()
}
public datasetInfoModalRowClicked(value: Version | DSMeta) {
if ((<Version>value).LOAD_REF !== undefined) {
// Type is Version
const row = value as Version
const url = `/stage/${row.LOAD_REF}`
this.router.navigate([url])
}
}
private setDSNote() {
const notes = this.dsmeta.find((item) => item.NAME === 'NOTES')
const longDesc = this.dsmeta.find((item) => item.NAME === 'DD_LONGDESC')
@ -1074,9 +1054,6 @@ export class ViewerComponent implements AfterContentInit, AfterViewInit {
const isPKCol = column && this.headerPks.indexOf(column) > -1
if (isPKCol) th.classList.add('primaryKeyHeaderStyle')
// Dark mode
th.classList.add('darkTH')
}
})
}

1
client/src/app/viya-api-explorer/viya-api-explorer.component.html
View File

@ -38,7 +38,6 @@
<clr-tree-node *ngIf="endpointLinks.length > 0" class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchLinksTreeInput
placeholder="Search links"

33
client/src/app/xlmap/xlmap.component.html
View File

@ -7,7 +7,6 @@
<clr-tree-node class="search-node">
<div class="tree-search-wrapper">
<input
appStealFocus
clrInput
#searchXLMapTreeInput
placeholder="Filter by Id"
@ -33,7 +32,7 @@
<button
(click)="xlmapOnClick(xlmap)"
class="clr-treenode-link"
[class.active]="isActiveXLMap(xlmap.id)"
[class.table-active]="isActiveXLMap(xlmap.id)"
>
<clr-icon shape="file"></clr-icon>
{{ xlmap.id }}
@ -50,20 +49,12 @@
size="60"
class="is-info icon-dc-fill"
></clr-icon>
<p
*ngIf="xlmaps.length > 0"
class="text-center color-gray mt-10"
cds-text="section"
>
<h3 *ngIf="xlmaps.length > 0" class="text-center color-gray">
Please select a map
</p>
<p
*ngIf="xlmaps.length < 1"
class="text-center color-gray mt-10"
cds-text="section"
>
</h3>
<h3 *ngIf="xlmaps.length < 1" class="text-center color-gray">
No excel map is found
</p>
</h3>
</div>
<div class="loadingSpinner" *ngIf="isLoading">
@ -103,21 +94,13 @@
}}</i>
<h5 class="d-flex clr-col-12 clr-justify-content-center mt-5-i">
Rules Source:
<a
cds-text="labelLink"
class="ml-10"
[routerLink]="'/view/data/' + rulesSource"
>
<a class="ml-10" [routerLink]="'/view/data/' + rulesSource">
{{ rulesSource }}
</a>
</h5>
<h5 class="d-flex clr-col-12 clr-justify-content-center mt-5-i">
Target dataset:
<a
cds-text="labelLink"
class="ml-10"
[routerLink]="'/view/data/' + selectedXLMap.targetDS"
>
<a class="ml-10" [routerLink]="'/view/data/' + selectedXLMap.targetDS">
{{ selectedXLMap.targetDS }}
</a>
</h5>
@ -127,7 +110,6 @@
<hot-table
hotId="hotInstance"
id="hot-table"
className="htDark"
[multiColumnSorting]="true"
[viewportRowRenderingOffset]="50"
[data]="selectedTab === TabsEnum.Rules ? xlmapRules : xlData"
@ -140,7 +122,6 @@
[filters]="true"
[height]="'100%'"
stretchH="all"
[afterGetColHeader]="afterGetColHeader"
[modifyColWidth]="maxWidthChecker"
[cells]="getCellConfiguration"
[maxRows]="hotTableMaxRows"

6
client/src/app/xlmap/xlmap.component.ts
View File

@ -117,7 +117,6 @@ export class XLMapComponent implements AfterContentInit, AfterViewInit, OnInit {
data: 'VALUE_TXT'
}
]
public xlData: XLUploadEntry[] = []
public showUploadModal = false
@ -143,11 +142,6 @@ export class XLMapComponent implements AfterContentInit, AfterViewInit, OnInit {
private sasService: SasService
) {}
public afterGetColHeader(column: number, th: any) {
// Dark mode
th.classList.add('darkTH')
}
public xlmapOnClick(xlmap: XLMapListItem) {
if (xlmap.id !== this.selectedXLMap?.id) {
this.selectedXLMap = xlmap

Some files were not shown because too many files have changed in this diff Show More