Compare commits
72 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6ceb681463 | |||
| 716ee6eba0 | |||
| f6b0f6b0cd | |||
| 737a652ff0 | |||
| 2995e5c9dc | |||
| 338c7a2e41 | |||
| ad27358deb | |||
| 495754816c | |||
|
|
96f2518af9 | ||
|
|
280bdeeb1b | ||
| 46cdeb0bab | |||
| d41f88f8bf | |||
| 815d6e97a8 | |||
| 4e35aefe41 | |||
| ca84915e43 | |||
|
|
31cc7e9e4d | ||
| 4ec107705e | |||
|
|
7740d2ac86 | ||
|
|
8c2aeacc85 | ||
|
|
8b8e8aec15 | ||
|
|
6ac3f660e9 | ||
| 7ee576a9c1 | |||
| f4c8699aaf | |||
|
|
4273ca6e5c | ||
|
|
4ba043b77e | ||
| 0169415ea2 | |||
| 86791dbaca | |||
| d5b58a3cbd | |||
| 3d8281d27e | |||
| b1a014c7bc | |||
| 505d0af2b3 | |||
| ece6bd1d78 | |||
| 8dc18b155a | |||
| aecd597687 | |||
| c99f106bae | |||
| d2fc7ae6fe | |||
|
|
c1c1d0055a | ||
| f37ec82d39 | |||
| 6e9e30e0f0 | |||
| 990ddb5cd3 | |||
| c6ebbb48bb | |||
| 95cc0b1c91 | |||
| 81b282f1f1 | |||
| 8c5b357dd2 | |||
| a13b2cbfd2 | |||
| 19617c2285 | |||
| f9794a973f | |||
| 65efe62d19 | |||
| 683ddcaf53 | |||
|
|
113e0bbc3c | ||
| 2af97e40bf | |||
|
|
83cbe3aece | ||
| ceac1ba614 | |||
|
|
765fdbdf9d | ||
|
|
43ae73c5f3 | ||
|
|
e57a0de8a9 | ||
|
|
3de491105b | ||
|
|
2fe690e962 | ||
|
|
b826d37086 | ||
|
|
bfbfd55fe7 | ||
|
|
15f38efd52 | ||
|
|
5d25681485 | ||
|
|
d26df376f8 | ||
| cff3fb3bad | |||
|
|
fb3c49aa8b | ||
|
|
af1657e226 | ||
|
|
d7c7302c12 | ||
| 26ce95f7c1 | |||
|
|
4924df2ef3 | ||
| 2e141a5d52 | |||
|
|
cb1978bcaf | ||
|
|
387f5122f1 |
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* text=auto eol=lf
|
||||
@@ -10,7 +10,7 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20.15.1
|
||||
node-version: 24.5.0
|
||||
|
||||
- name: Install Google Chrome
|
||||
run: |
|
||||
@@ -58,7 +58,7 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20.15.1
|
||||
node-version: 24.5.0
|
||||
|
||||
- name: Write .npmrc file
|
||||
run: |
|
||||
|
||||
@@ -7,7 +7,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [20.15.1]
|
||||
node-version: [24.5.0]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
@@ -98,4 +98,4 @@ jobs:
|
||||
with:
|
||||
name: Lighthouse results
|
||||
path: client/lighthouse-reports
|
||||
include-hidden-files: true
|
||||
include-hidden-files: true
|
||||
|
||||
@@ -13,12 +13,12 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20.14.0
|
||||
node-version: 24.5.0
|
||||
|
||||
- name: Write .npmrc file
|
||||
run: |
|
||||
touch client/.npmrc
|
||||
echo '${{ secrets.NPMRC}}' > client/.npmrc
|
||||
touch client/.npmrc
|
||||
echo '${{ secrets.NPMRC}}' > client/.npmrc
|
||||
|
||||
- name: Install Chrome for Angular tests
|
||||
run: |
|
||||
@@ -41,7 +41,7 @@ jobs:
|
||||
npm ci
|
||||
|
||||
- name: Check audit
|
||||
# Audit should fail and stop the CI if critical vulnerability found
|
||||
# Audit should fail and stop the CI if critical vulnerability found
|
||||
run: |
|
||||
npm audit --audit-level=critical --omit=dev
|
||||
cd ./sas
|
||||
@@ -68,12 +68,12 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20.14.0
|
||||
node-version: 24.5.0
|
||||
|
||||
- name: Write .npmrc file
|
||||
run: |
|
||||
touch client/.npmrc
|
||||
echo '${{ secrets.NPMRC}}' > client/.npmrc
|
||||
touch client/.npmrc
|
||||
echo '${{ secrets.NPMRC}}' > client/.npmrc
|
||||
|
||||
- run: apt-get update
|
||||
- run: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
|
||||
@@ -158,7 +158,7 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 20.14.0
|
||||
node-version: 24.5.0
|
||||
|
||||
- name: Write .npmrc file
|
||||
run: |
|
||||
@@ -228,6 +228,8 @@ jobs:
|
||||
cp sasjs/utils/favicon.ico ../client/dist/favicon.ico
|
||||
sasjs c -t server
|
||||
rm -rf sasjsbuild/tests
|
||||
server_apploc="/Public/app/dc"
|
||||
sed -i "s|apploc=\"[^\"]*\"|apploc=\"${server_apploc}\"|g" sasjsbuild/services/web/index.html
|
||||
sasjs b -t server
|
||||
cp sasjsbuild/server.json.zip ./sasjs_server.json.zip
|
||||
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -14,6 +14,7 @@ client/documentation
|
||||
client/**/sheet-crypto.tgz
|
||||
client/.nx
|
||||
client/libraries/sheet-crypto.tgz
|
||||
client/lighthouse-reports
|
||||
cypress.env.json
|
||||
sasjsbuild
|
||||
sasjsresults
|
||||
|
||||
41
CHANGELOG.md
41
CHANGELOG.md
@@ -1,3 +1,44 @@
|
||||
## [7.2.8](https://git.datacontroller.io/dc/dc/compare/v7.2.7...v7.2.8) (2026-02-06)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* bump adapter version ([f4c8699](https://git.datacontroller.io/dc/dc/commit/f4c8699aaf0b1e01b447296978a4f6dedc8903f9))
|
||||
|
||||
## [7.2.7](https://git.datacontroller.io/dc/dc/compare/v7.2.6...v7.2.7) (2026-02-05)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* dclib not found error in getchangeinfo job ([86791db](https://git.datacontroller.io/dc/dc/commit/86791dbaca39034a19bf8f34efbddf898c57f2f7))
|
||||
|
||||
## [7.2.6](https://git.datacontroller.io/dc/dc/compare/v7.2.5...v7.2.6) (2026-01-05)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **deps:** update angular and moment ([8c5b357](https://git.datacontroller.io/dc/dc/commit/8c5b357dd286db331a6dcdeb3fd499fe3b634288))
|
||||
|
||||
## [7.2.5](https://git.datacontroller.io/dc/dc/compare/v7.2.4...v7.2.5) (2025-12-09)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* (build) rebuilt package-lock files ([bfbfd55](https://git.datacontroller.io/dc/dc/commit/bfbfd55fe7e2dff3ce707763a2c7939ff365318b))
|
||||
* (deps) bump @sasjs/cli and @sasjs/core ([d7c7302](https://git.datacontroller.io/dc/dc/commit/d7c7302c12ac60f355ab9b3b1b461fcf7d0719b8))
|
||||
* (deps) bumped @sasjs/core, @sasjs/cli, @sasjs/utils and @sasjs/adapter ([af1657e](https://git.datacontroller.io/dc/dc/commit/af1657e226a4efd22cc87401a3850c4a665c2680))
|
||||
* configurable audit table on restore check ([26ce95f](https://git.datacontroller.io/dc/dc/commit/26ce95f7c1d2260f81c240cd6b058db154d997e4)), closes [#193](https://git.datacontroller.io/dc/dc/issues/193)
|
||||
* improved testing ([fb3c49a](https://git.datacontroller.io/dc/dc/commit/fb3c49aa8bfdc6acf2ae3034b885010dcdce32a6))
|
||||
* output values to intended macro variables ([43ae73c](https://git.datacontroller.io/dc/dc/commit/43ae73c5f3ad919394201f54984b61bb2a52fcfe))
|
||||
|
||||
## [7.2.4](https://git.datacontroller.io/dc/dc/compare/v7.2.3...v7.2.4) (2025-10-14)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* ensure reload after applying licence key ([cb1978b](https://git.datacontroller.io/dc/dc/commit/cb1978bcaf23b0bf45b5d3b78b9707fd4e48a5f4))
|
||||
* snyk report security patches ([387f512](https://git.datacontroller.io/dc/dc/commit/387f5122f1ea6dff55d23c9223f17737283a94d3))
|
||||
|
||||
## [7.2.3](https://git.datacontroller.io/dc/dc/compare/v7.2.2...v7.2.3) (2025-10-02)
|
||||
|
||||
|
||||
|
||||
@@ -41,6 +41,8 @@
|
||||
"zone.js",
|
||||
"text-encoding",
|
||||
"crypto-js/md5",
|
||||
"crypto-js/sha1",
|
||||
"crypto-js/sha512",
|
||||
"buffer",
|
||||
"numbro",
|
||||
"@clr/icons",
|
||||
@@ -51,26 +53,22 @@
|
||||
"base64-arraybuffer",
|
||||
"@handsontable/formulajs"
|
||||
],
|
||||
"polyfills": [
|
||||
"src/polyfills.ts",
|
||||
"zone.js"
|
||||
],
|
||||
"polyfills": ["src/polyfills.ts", "zone.js"],
|
||||
"outputPath": "dist",
|
||||
"resourcesOutputPath": "images",
|
||||
"index": "src/index.html",
|
||||
"main": "src/main.ts",
|
||||
"tsConfig": "tsconfig.app.json",
|
||||
"inlineStyleLanguage": "scss",
|
||||
"assets": [
|
||||
"src/images"
|
||||
{
|
||||
"glob": "**/*",
|
||||
"input": "src/images",
|
||||
"output": "images"
|
||||
}
|
||||
],
|
||||
"styles": [
|
||||
"src/styles.scss"
|
||||
],
|
||||
"scripts": [
|
||||
"node_modules/marked/marked.min.js"
|
||||
],
|
||||
"webWorkerTsConfig": "tsconfig.worker.json"
|
||||
"styles": ["src/styles.scss"],
|
||||
"scripts": ["node_modules/marked/marked.min.js"],
|
||||
"webWorkerTsConfig": "tsconfig.worker.json",
|
||||
"main": "src/main.ts"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
@@ -103,9 +101,7 @@
|
||||
}
|
||||
},
|
||||
"development": {
|
||||
"vendorChunk": true,
|
||||
"extractLicenses": false,
|
||||
"buildOptimizer": false,
|
||||
"sourceMap": true,
|
||||
"optimization": false,
|
||||
"namedChunks": true
|
||||
@@ -134,20 +130,11 @@
|
||||
"test": {
|
||||
"builder": "@angular-devkit/build-angular:karma",
|
||||
"options": {
|
||||
"polyfills": [
|
||||
"src/polyfills.ts",
|
||||
"zone.js",
|
||||
"zone.js/testing"
|
||||
],
|
||||
"polyfills": ["src/polyfills.ts", "zone.js", "zone.js/testing"],
|
||||
"tsConfig": "tsconfig.spec.json",
|
||||
"inlineStyleLanguage": "scss",
|
||||
"assets": [
|
||||
"src/favicon.ico",
|
||||
"src/assets"
|
||||
],
|
||||
"styles": [
|
||||
"src/styles.scss"
|
||||
],
|
||||
"assets": ["src/favicon.ico", "src/assets"],
|
||||
"styles": ["src/styles.scss"],
|
||||
"scripts": [],
|
||||
"karmaConfig": "karma.conf.js",
|
||||
"webWorkerTsConfig": "tsconfig.worker.json"
|
||||
@@ -156,10 +143,7 @@
|
||||
"lint": {
|
||||
"builder": "@angular-eslint/builder:lint",
|
||||
"options": {
|
||||
"lintFilePatterns": [
|
||||
"src/**/*.ts",
|
||||
"src/**/*.html"
|
||||
]
|
||||
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -309,6 +309,83 @@ context('excel tests: ', function () {
|
||||
})
|
||||
})
|
||||
|
||||
it('22 | Uploads password protected Excel and unlocks with correct password', (done) => {
|
||||
openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
|
||||
|
||||
cy.get('.buttonBar button:last-child')
|
||||
.should('exist')
|
||||
.click()
|
||||
.then(() => {
|
||||
cy.get('input[type="file"]#file-upload')
|
||||
.attachFile(`/${fixturePath}/regular_excel_password.xlsx`)
|
||||
.then(() => {
|
||||
// Wait for password modal to appear
|
||||
cy.get('#filePasswordInput', { timeout: 10000 })
|
||||
.should('be.visible')
|
||||
.type('123123')
|
||||
|
||||
// Click Unlock button
|
||||
cy.get('.btn.btn-success-outline').should('not.be.disabled').click()
|
||||
|
||||
// Click away the overlay
|
||||
cy.get('.modal-footer .btn.btn-primary', { timeout: 5000 }).click()
|
||||
|
||||
// Verify file loads successfully
|
||||
cy.get('.btn-upload-preview', { timeout: 60000 })
|
||||
.should('be.visible')
|
||||
.then(() => {
|
||||
submitExcel()
|
||||
rejectExcel(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
it('23 | Uploads password protected Excel and handles wrong password', (done) => {
|
||||
openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
|
||||
|
||||
cy.get('.buttonBar button:last-child')
|
||||
.should('exist')
|
||||
.click()
|
||||
.then(() => {
|
||||
cy.get('input[type="file"]#file-upload')
|
||||
.attachFile(`/${fixturePath}/regular_excel_password.xlsx`)
|
||||
.then(() => {
|
||||
// First attempt: Enter wrong password
|
||||
cy.get('#filePasswordInput', { timeout: 10000 })
|
||||
.should('be.visible')
|
||||
.type('wrongpassword')
|
||||
|
||||
cy.get('.btn.btn-success-outline').should('not.be.disabled').click()
|
||||
|
||||
// Verify error message appears
|
||||
cy.get('.modal-footer .color-red', { timeout: 10000 })
|
||||
.should('be.visible')
|
||||
.should('contain', "Sorry that didn't work, try again.")
|
||||
|
||||
// Modal should still be open for retry
|
||||
cy.get('#filePasswordInput')
|
||||
.should('be.visible')
|
||||
.clear()
|
||||
.type('123123')
|
||||
|
||||
// Second attempt: Enter correct password
|
||||
cy.get('.btn.btn-success-outline').should('not.be.disabled').click()
|
||||
|
||||
// Click away the overlay
|
||||
cy.get('.modal-footer .btn.btn-primary', { timeout: 5000 }).click()
|
||||
|
||||
// Verify file loads successfully
|
||||
cy.get('.btn-upload-preview', { timeout: 60000 })
|
||||
.should('be.visible')
|
||||
.then(() => {
|
||||
submitExcel()
|
||||
rejectExcel(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
// Large files break Cypress
|
||||
|
||||
// it ('? | Uploads Excel with size of 5MB', (done) => {
|
||||
|
||||
BIN
client/cypress/fixtures/excels/regular_excel_password.xlsx
Normal file
BIN
client/cypress/fixtures/excels/regular_excel_password.xlsx
Normal file
Binary file not shown.
BIN
client/libraries/xlsx-0.20.3.tgz
Normal file
BIN
client/libraries/xlsx-0.20.3.tgz
Normal file
Binary file not shown.
@@ -10,7 +10,7 @@ const check = (cwd) => {
|
||||
onlyAllow:
|
||||
'AFLv2.1;Apache 2.0;Apache-2.0;Apache*;Artistic-2.0;0BSD;BSD*;BSD-2-Clause;BSD-3-Clause;CC0-1.0;CC-BY-3.0;CC-BY-4.0;ISC;MIT;MPL-2.0;ODC-By-1.0;Python-2.0;Unlicense;',
|
||||
excludePackages:
|
||||
'@cds/city@1.1.0;@handsontable/angular-wrapper@16.0.1;handsontable@16.0.1;hyperformula@2.7.1;hyperformula@3.0.0;jackspeak@3.4.3;path-scurry@1.11.1;package-json-from-dist@1.0.1'
|
||||
'@cds/city@1.1.0;@handsontable/angular-wrapper@16.0.1;handsontable@^16.0.1;handsontable@16.2.0;hyperformula@2.7.1;hyperformula@3.0.0;hyperformula@3.1.0;jackspeak@3.4.3;path-scurry@1.11.1;package-json-from-dist@1.0.1'
|
||||
},
|
||||
(error, json) => {
|
||||
if (error) {
|
||||
|
||||
@@ -2,8 +2,8 @@ module.exports = {
|
||||
ci: {
|
||||
collect: {
|
||||
settings: {
|
||||
preset: "desktop",
|
||||
chromeFlags: "--no-sandbox --disable-dev-shm-usage"
|
||||
preset: 'desktop',
|
||||
chromeFlags: '--no-sandbox --disable-dev-shm-usage'
|
||||
},
|
||||
url: [
|
||||
'http://localhost:5000/AppStream/clickme/#/home/tables',
|
||||
@@ -37,6 +37,10 @@ module.exports = {
|
||||
{ minScore: 0.4, aggregationMethod: 'median' }
|
||||
]
|
||||
}
|
||||
},
|
||||
upload: {
|
||||
target: 'filesystem',
|
||||
outputDir: './lighthouse-reports'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
11699
client/package-lock.json
generated
11699
client/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -32,26 +32,27 @@
|
||||
"compodoc:build": "compodoc -p tsconfig.doc.json --name 'Data Controller Client'",
|
||||
"compodoc:build-and-serve": "compodoc -p tsconfig.doc.json -s --name 'Data Controller Client'",
|
||||
"compodoc:serve": "compodoc -s --name 'Data Controller Client'",
|
||||
"lighthouse": "lhci autorun"
|
||||
"lighthouse": "lhci autorun",
|
||||
"ng": "ng"
|
||||
},
|
||||
"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",
|
||||
"@angular/animations": "^19.2.18",
|
||||
"@angular/cdk": "^19.2.19",
|
||||
"@angular/common": "^19.2.18",
|
||||
"@angular/compiler": "^19.2.18",
|
||||
"@angular/core": "^19.2.18",
|
||||
"@angular/forms": "^19.2.18",
|
||||
"@angular/platform-browser": "^19.2.18",
|
||||
"@angular/platform-browser-dynamic": "^19.2.18",
|
||||
"@angular/router": "^19.2.18",
|
||||
"@cds/core": "^6.15.1",
|
||||
"@clr/angular": "file:libraries/clr-angular-17.9.0.tgz",
|
||||
"@clr/icons": "^13.0.2",
|
||||
"@clr/ui": "file:libraries/clr-ui-17.9.0.tgz",
|
||||
"@handsontable/angular-wrapper": "16.0.1",
|
||||
"@sasjs/adapter": "^4.12.2",
|
||||
"@sasjs/utils": "^3.4.0",
|
||||
"@sasjs/adapter": "^4.16.3",
|
||||
"@sasjs/utils": "^3.5.3",
|
||||
"@sheet/crypto": "file:libraries/sheet-crypto.tgz",
|
||||
"@types/d3-graphviz": "^2.6.7",
|
||||
"@types/text-encoding": "0.0.35",
|
||||
@@ -68,7 +69,7 @@
|
||||
"jquery-datetimepicker": "^2.5.21",
|
||||
"jsrsasign": "^11.1.0",
|
||||
"marked": "^5.0.0",
|
||||
"moment": "^2.26.0",
|
||||
"moment": "^2.30.1",
|
||||
"ngx-clipboard": "^16.0.0",
|
||||
"ngx-json-viewer": "file:libraries/ngx-json-viewer-3.2.1.tgz",
|
||||
"nodejs": "0.0.0",
|
||||
@@ -81,18 +82,18 @@
|
||||
"tslib": "^2.3.0",
|
||||
"vm": "^0.1.0",
|
||||
"webpack": "^5.91.0",
|
||||
"xlsx": "^0.18.5",
|
||||
"zone.js": "~0.14.4"
|
||||
"xlsx": "file:libraries/xlsx-0.20.3.tgz",
|
||||
"zone.js": "~0.15.1"
|
||||
},
|
||||
"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": "^19.2.19",
|
||||
"@angular-eslint/builder": "19.8.1",
|
||||
"@angular-eslint/eslint-plugin": "19.8.1",
|
||||
"@angular-eslint/eslint-plugin-template": "19.8.1",
|
||||
"@angular-eslint/schematics": "19.8.1",
|
||||
"@angular-eslint/template-parser": "19.8.1",
|
||||
"@angular/cli": "^19.2.19",
|
||||
"@angular/compiler-cli": "^19.2.18",
|
||||
"@babel/plugin-proposal-private-methods": "^7.18.6",
|
||||
"@compodoc/compodoc": "^1.1.21",
|
||||
"@cypress/webpack-preprocessor": "^5.17.1",
|
||||
@@ -128,7 +129,7 @@
|
||||
"rimraf": "3.0.2",
|
||||
"ts-loader": "^9.2.8",
|
||||
"ts-node": "^3.3.0",
|
||||
"typescript": "~5.4.4",
|
||||
"typescript": "~5.8.3",
|
||||
"wait-on": "^6.0.1",
|
||||
"watch": "^1.0.2"
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import { Location } from '@angular/common'
|
||||
import '@clr/icons'
|
||||
import '@clr/icons/shapes/all-shapes'
|
||||
import { globals } from './_globals'
|
||||
import * as moment from 'moment'
|
||||
import moment from 'moment'
|
||||
import { EventService } from './services/event.service'
|
||||
import { AppService } from './services/app.service'
|
||||
import { InfoModal } from './models/InfoModal'
|
||||
@@ -42,7 +42,8 @@ ClarityIcons.addIcons(
|
||||
selector: 'my-app',
|
||||
templateUrl: './app.component.html',
|
||||
styleUrls: ['./app.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class AppComponent {
|
||||
private dcAdapterSettings: DcAdapterSettings | undefined
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { HttpClientModule } from '@angular/common/http'
|
||||
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
|
||||
import { NgModule } from '@angular/core'
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
|
||||
import { BrowserModule } from '@angular/platform-browser'
|
||||
@@ -36,12 +36,12 @@ import { AppSettingsService } from './services/app-settings.service'
|
||||
InfoModalComponent,
|
||||
ViyaApiExplorerComponent
|
||||
],
|
||||
bootstrap: [AppComponent],
|
||||
imports: [
|
||||
BrowserAnimationsModule,
|
||||
BrowserModule,
|
||||
FormsModule,
|
||||
ReactiveFormsModule,
|
||||
HttpClientModule,
|
||||
ROUTING,
|
||||
SharedModule,
|
||||
ClarityModule,
|
||||
@@ -50,7 +50,12 @@ import { AppSettingsService } from './services/app-settings.service'
|
||||
DirectivesModule,
|
||||
NgxJsonViewerModule
|
||||
],
|
||||
providers: [AppService, SasStoreService, LicensingGuard, AppSettingsService],
|
||||
bootstrap: [AppComponent]
|
||||
providers: [
|
||||
AppService,
|
||||
SasStoreService,
|
||||
LicensingGuard,
|
||||
AppSettingsService,
|
||||
provideHttpClient(withInterceptorsFromDi())
|
||||
]
|
||||
})
|
||||
export class AppModule {}
|
||||
|
||||
@@ -14,7 +14,8 @@ import { DcAdapterSettings } from '../models/DcAdapterSettings'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class DeployComponent implements OnInit {
|
||||
public step: number = 0
|
||||
|
||||
@@ -29,7 +29,8 @@ import {
|
||||
selector: 'app-automatic-deploy',
|
||||
templateUrl: './automatic.component.html',
|
||||
styleUrls: ['./automatic.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class AutomaticComponent implements OnInit {
|
||||
@Input() sasJs!: SASjs
|
||||
|
||||
@@ -18,7 +18,8 @@ import { SasService } from 'src/app/services/sas.service'
|
||||
selector: 'app-manual-deploy',
|
||||
templateUrl: './manual.component.html',
|
||||
styleUrls: ['./manual.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ManualComponent implements OnInit {
|
||||
@Input() sasJs!: SASjs
|
||||
|
||||
@@ -20,7 +20,8 @@ import { SasjsService } from 'src/app/services/sasjs.service'
|
||||
selector: 'app-sasjs-configurator',
|
||||
templateUrl: './sasjs-configurator.component.html',
|
||||
styleUrls: ['./sasjs-configurator.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class SasjsConfiguratorComponent implements OnInit {
|
||||
@Input() sasJs!: SASjs
|
||||
|
||||
@@ -7,7 +7,8 @@ import {
|
||||
} from '@angular/core'
|
||||
|
||||
@Directive({
|
||||
selector: '[appDragNdrop]'
|
||||
selector: '[appDragNdrop]',
|
||||
standalone: false
|
||||
})
|
||||
export class DragNdropDirective {
|
||||
@HostBinding('class.fileover') fileOver: boolean = false
|
||||
|
||||
@@ -9,7 +9,8 @@ import {
|
||||
import { FileUploader } from '../models/FileUploader.class'
|
||||
|
||||
@Directive({
|
||||
selector: '[appFileDrop]'
|
||||
selector: '[appFileDrop]',
|
||||
standalone: false
|
||||
})
|
||||
export class FileDropDirective {
|
||||
@Input() uploader?: FileUploader
|
||||
|
||||
@@ -9,7 +9,8 @@ import {
|
||||
import { FileUploader } from '../models/FileUploader.class'
|
||||
|
||||
@Directive({
|
||||
selector: '[appFileSelect]'
|
||||
selector: '[appFileSelect]',
|
||||
standalone: false
|
||||
})
|
||||
export class FileSelectDirective {
|
||||
@Input() uploader?: FileUploader
|
||||
|
||||
@@ -6,7 +6,8 @@ import { Directive, Input, TemplateRef, ViewContainerRef } from '@angular/core'
|
||||
* Calling functions in html is bad for performance
|
||||
*/
|
||||
@Directive({
|
||||
selector: '[ngVar]'
|
||||
selector: '[ngVar]',
|
||||
standalone: false
|
||||
})
|
||||
export class NgVarDirective {
|
||||
@Input()
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Directive, HostListener } from '@angular/core'
|
||||
|
||||
@Directive({
|
||||
selector: '[appStealFocus]'
|
||||
selector: '[appStealFocus]',
|
||||
standalone: false
|
||||
})
|
||||
export class StealFocusDirective {
|
||||
constructor() {}
|
||||
|
||||
@@ -14,6 +14,7 @@ import { HelperService } from 'src/app/services/helper.service'
|
||||
import { SasStoreService } from 'src/app/services/sas-store.service'
|
||||
import { DcValidator } from 'src/app/shared/dc-validator/dc-validator'
|
||||
import { DcValidation } from 'src/app/shared/dc-validator/models/dc-validation.model'
|
||||
import { isEmpty } from 'src/app/shared/dc-validator/utils/isEmpty'
|
||||
import {
|
||||
EditRecordDropdownChangeEvent,
|
||||
EditRecordInputFocusedEvent
|
||||
@@ -24,7 +25,8 @@ import { EditRecordModal } from '../../models/EditRecordModal'
|
||||
selector: 'app-edit-record',
|
||||
templateUrl: './edit-record.component.html',
|
||||
styleUrls: ['./edit-record.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class EditRecordComponent implements OnInit {
|
||||
@Input() currentRecord!: EditRecordModal
|
||||
@@ -145,23 +147,63 @@ export class EditRecordComponent implements OnInit {
|
||||
}, 0)
|
||||
}
|
||||
|
||||
async recordInputChange(event: any, colName: string) {
|
||||
async recordInputChange(event: any, colName: string): Promise<void> {
|
||||
const colRules = this.currentRecordValidator?.getRule(colName)
|
||||
const value = event.target.value
|
||||
|
||||
this.helperService.debounceCall(300, () => {
|
||||
this.validateRecordCol(colRules, value).then((valid: boolean) => {
|
||||
const index = this.currentRecordInvalidCols.indexOf(colName)
|
||||
this.updateValidationState(colName, valid)
|
||||
|
||||
if (valid) {
|
||||
if (index > -1) this.currentRecordInvalidCols.splice(index, 1)
|
||||
} else {
|
||||
if (index < 0) this.currentRecordInvalidCols.push(colName)
|
||||
if (!valid) {
|
||||
this.tryAutoPopulateNotNull(event, colName, colRules, value)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the invalid columns list based on validation result
|
||||
*/
|
||||
private updateValidationState(colName: string, valid: boolean): void {
|
||||
const index = this.currentRecordInvalidCols.indexOf(colName)
|
||||
|
||||
if (valid && index > -1) {
|
||||
this.currentRecordInvalidCols.splice(index, 1)
|
||||
} else if (!valid && index < 0) {
|
||||
this.currentRecordInvalidCols.push(colName)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Auto-populates NOTNULL default value when the field is empty and has a default
|
||||
*/
|
||||
private tryAutoPopulateNotNull(
|
||||
event: any,
|
||||
colName: string,
|
||||
colRules: DcValidation | undefined,
|
||||
value: any
|
||||
): void {
|
||||
if (
|
||||
!isEmpty(value) ||
|
||||
!this.currentRecordValidator ||
|
||||
!this.currentRecord
|
||||
) {
|
||||
return
|
||||
}
|
||||
|
||||
const defaultValue =
|
||||
this.currentRecordValidator.getNotNullDefaultValue(colName)
|
||||
if (defaultValue === undefined) return
|
||||
|
||||
this.currentRecord[colName] = defaultValue
|
||||
event.target.value = defaultValue
|
||||
|
||||
this.validateRecordCol(colRules, defaultValue).then((isValid: boolean) => {
|
||||
this.updateValidationState(colName, isValid)
|
||||
})
|
||||
}
|
||||
|
||||
onNextRecordClick() {
|
||||
this.onNextRecord.emit()
|
||||
}
|
||||
@@ -171,23 +213,8 @@ export class EditRecordComponent implements OnInit {
|
||||
}
|
||||
|
||||
public copyToClip(text: string) {
|
||||
const modalElement = document.querySelector('#recordModalRef .modal-title')
|
||||
|
||||
if (modalElement) {
|
||||
const selBox = document.createElement('textarea')
|
||||
selBox.style.position = 'fixed'
|
||||
selBox.style.left = '0'
|
||||
selBox.style.top = '0'
|
||||
selBox.style.opacity = '0'
|
||||
selBox.style.zIndex = '5000'
|
||||
selBox.value = text
|
||||
modalElement.appendChild(selBox)
|
||||
selBox.focus()
|
||||
selBox.select()
|
||||
document.execCommand('copy')
|
||||
modalElement.removeChild(selBox)
|
||||
this.generatedRecordUrl = text
|
||||
}
|
||||
navigator.clipboard.writeText(text)
|
||||
this.generatedRecordUrl = text
|
||||
}
|
||||
|
||||
async generateEditRecordUrl() {
|
||||
|
||||
@@ -11,7 +11,8 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'
|
||||
selector: 'app-upload-stater',
|
||||
templateUrl: './upload-stater.component.html',
|
||||
styleUrls: ['./upload-stater.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class UploadStaterComponent implements OnInit {
|
||||
public statesList: string[] = [] //States appended to be displayed
|
||||
|
||||
@@ -43,6 +43,7 @@ import { Col } from '../shared/dc-validator/models/col.model'
|
||||
import { DcValidation } from '../shared/dc-validator/models/dc-validation.model'
|
||||
import { DQRule } from '../shared/dc-validator/models/dq-rules.model'
|
||||
import { getHotDataSchema } from '../shared/dc-validator/utils/getHotDataSchema'
|
||||
import { isEmpty } from '../shared/dc-validator/utils/isEmpty'
|
||||
import { globals } from '../_globals'
|
||||
import { UploadStaterComponent } from './components/upload-stater/upload-stater.component'
|
||||
import { DynamicExtendedCellValidation } from './models/dynamicExtendedCellValidation'
|
||||
@@ -70,7 +71,8 @@ import { ParseResult } from '../models/ParseResult.interface'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class EditorComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||
@ViewChildren('uploadStater')
|
||||
@@ -1044,12 +1046,16 @@ export class EditorComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new empty row object with proper structure
|
||||
* Creates a new empty row object with proper structure.
|
||||
* Columns with NOTNULL DQ rules are pre-populated with their RULE_VALUE.
|
||||
*/
|
||||
private createEmptyRow(): any {
|
||||
const newRow: any = {}
|
||||
this.headerColumns.forEach((col: string) => {
|
||||
newRow[col] = ''
|
||||
this.cellValidation.forEach((rule: any) => {
|
||||
const dataKey = rule.data
|
||||
newRow[dataKey] = this.hotDataSchema.hasOwnProperty(dataKey)
|
||||
? this.hotDataSchema[dataKey]
|
||||
: ''
|
||||
})
|
||||
newRow['noLinkOption'] = true
|
||||
return newRow
|
||||
@@ -2675,13 +2681,14 @@ export class EditorComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||
// Note: this.headerColumns and this.columnHeader contains same data
|
||||
// need to resolve redundancy
|
||||
|
||||
// default schema
|
||||
// default schema - includes NOTNULL defaults from DQ rules
|
||||
for (let i = 0; i < this.headerColumns.length; i++) {
|
||||
const colType = this.cellValidation[i].type
|
||||
|
||||
this.hotDataSchema[this.cellValidation[i].data] = getHotDataSchema(
|
||||
colType,
|
||||
this.cellValidation[i]
|
||||
this.cellValidation[i],
|
||||
this.dcValidator?.getDqDetails()
|
||||
)
|
||||
}
|
||||
|
||||
@@ -2986,6 +2993,29 @@ export class EditorComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||
}
|
||||
)
|
||||
|
||||
// Auto-populate NOTNULL default when validation fails due to empty value
|
||||
hot.addHook(
|
||||
'afterValidate',
|
||||
(isValid: boolean, value: any, row: number, prop: string | number) => {
|
||||
if (isValid || !isEmpty(value)) return
|
||||
|
||||
const colName =
|
||||
typeof prop === 'string'
|
||||
? prop
|
||||
: (hot.colToProp(prop as number) as string)
|
||||
|
||||
const defaultValue = this.dcValidator?.getNotNullDefaultValue(colName)
|
||||
if (defaultValue === undefined) return
|
||||
|
||||
// Auto-populate using setTimeout to avoid modifying during validation
|
||||
setTimeout(() => {
|
||||
if (isEmpty(hot.getDataAtRowProp(row, colName))) {
|
||||
hot.setDataAtRowProp(row, colName, defaultValue, 'autoPopulate')
|
||||
}
|
||||
}, 0)
|
||||
}
|
||||
)
|
||||
|
||||
hot.addHook('beforePaste', (data: any, cords: any) => {
|
||||
const startCol = cords[0].startCol
|
||||
|
||||
|
||||
@@ -15,7 +15,8 @@ import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapper
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class GroupComponent implements OnInit {
|
||||
public groups: Array<any> | undefined
|
||||
|
||||
@@ -19,7 +19,8 @@ import { LicenceService } from '../services/licence.service'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class HomeComponent implements AfterContentInit {
|
||||
public treeNodeLibraries: Array<any> | null = null
|
||||
|
||||
@@ -1,178 +1,182 @@
|
||||
import { Component, OnInit, ViewEncapsulation } from '@angular/core'
|
||||
import { ActivatedRoute, Router } from '@angular/router'
|
||||
import { AppService, LicenceService, SasService } from '../services'
|
||||
import { LicenseKeyData } from '../models/LicenseKeyData'
|
||||
import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapperResponse'
|
||||
|
||||
enum LicenseActions {
|
||||
key = 'key',
|
||||
register = 'register',
|
||||
limit = 'limit',
|
||||
update = 'update'
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-licensing',
|
||||
templateUrl: './licensing.component.html',
|
||||
styleUrls: ['./licensing.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
})
|
||||
export class LicensingComponent implements OnInit {
|
||||
public action: LicenseActions | null = null
|
||||
|
||||
public licenseErrors: { [key: string]: string } = {
|
||||
missing: `Licence key is missing - please contact <a class="color-green" href="mailto: support@datacontroller.io">support@datacontroller.io</a> and enter valid keys below.`,
|
||||
expired: `Licence key is expired - please contact <a class="color-green" href="mailto: support@datacontroller.io">support@datacontroller.io</a> and enter valid keys below.`,
|
||||
invalid: `Licence key is invalid - please contact <a class="color-green" href="mailto: support@datacontroller.io">support@datacontroller.io</a> and enter valid keys below.`,
|
||||
missmatch: `Your SYSSITE (below) is not found in the licence key - please contact <a class="color-green" href="mailto: support@datacontroller.io">support@datacontroller.io</a> and enter valid keys below.`
|
||||
}
|
||||
|
||||
public keyError: string | undefined
|
||||
public errorDetails: string | undefined
|
||||
public missmatchedKey: string | undefined
|
||||
public licenceKeyValue: string = ''
|
||||
public activationKeyValue: string = ''
|
||||
|
||||
public applyingKeys: boolean = false
|
||||
|
||||
public syssite = this.appService.syssite
|
||||
public currentLicenceKey = this.licenceService.licenceKey
|
||||
public currentActivationKey = this.licenceService.activationKey
|
||||
public isAppFreeTier = this.licenceService.isAppFreeTier
|
||||
public userCountLimitation = this.licenceService.userCountLimitation
|
||||
|
||||
public licenseKeyData: LicenseKeyData | null = null
|
||||
|
||||
public inputType: 'file' | 'paste' = 'file'
|
||||
public licenceFileError: string | undefined
|
||||
public licenceFileLoading: boolean = false
|
||||
public licencefile: { filename: string } = {
|
||||
filename: ''
|
||||
}
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private licenceService: LicenceService,
|
||||
private sasService: SasService,
|
||||
private appService: AppService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.licenceKeyValue = this.currentLicenceKey || ''
|
||||
this.activationKeyValue = this.currentActivationKey || ''
|
||||
|
||||
this.route.queryParams.subscribe((queryParams: any) => {
|
||||
this.keyError = queryParams.error
|
||||
this.missmatchedKey = queryParams.missmatchId
|
||||
|
||||
if (queryParams.details) {
|
||||
this.errorDetails = atob(queryParams.details)
|
||||
}
|
||||
})
|
||||
|
||||
this.route.params.subscribe((params: any) => {
|
||||
let actionInUrl = params.action
|
||||
|
||||
if (actionInUrl) {
|
||||
if (Object.values(LicenseActions).includes(actionInUrl)) {
|
||||
this.action = actionInUrl
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
this.licenseKeyData = this.licenceService.getLicenseKeyData()
|
||||
}
|
||||
|
||||
public trimKeys() {
|
||||
this.licenceKeyValue = this.licenceKeyValue.trim()
|
||||
this.activationKeyValue = this.activationKeyValue.trim()
|
||||
}
|
||||
|
||||
public copySyssite(copyIconRef: any, copyTooltip: any, syssite: string[]) {
|
||||
const syssiteString = syssite.join('\n')
|
||||
|
||||
navigator.clipboard.writeText(syssiteString).then(() => {
|
||||
copyIconRef.setAttribute('shape', 'check')
|
||||
copyIconRef.setAttribute('class', 'is-success')
|
||||
copyTooltip.innerText = 'Copied!'
|
||||
|
||||
setTimeout(() => {
|
||||
copyIconRef.setAttribute('shape', 'copy')
|
||||
copyIconRef.removeAttribute('class')
|
||||
copyTooltip.innerText = 'Copy to clipboard'
|
||||
}, 1000)
|
||||
})
|
||||
}
|
||||
|
||||
public applyKeys() {
|
||||
this.applyingKeys = true
|
||||
|
||||
let table = {
|
||||
keyupload: [
|
||||
{
|
||||
ACTIVATION_KEY: this.activationKeyValue,
|
||||
LICENCE_KEY: this.licenceKeyValue
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
this.sasService
|
||||
.request('admin/registerkey', table)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
if (
|
||||
res.adapterResponse.return &&
|
||||
res.adapterResponse.return[0] &&
|
||||
res.adapterResponse.return[0].MSG === 'SUCCESS'
|
||||
) {
|
||||
location.replace(location.href.split('#')[0])
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
this.applyingKeys = false
|
||||
})
|
||||
}
|
||||
|
||||
public onFileCapture(event: any, dropped = false) {
|
||||
let file = dropped ? event[0] : event.target.files[0]
|
||||
this.licencefile.filename = file.name
|
||||
|
||||
if (!file) return
|
||||
|
||||
this.licenceFileLoading = true
|
||||
|
||||
const reader = new FileReader()
|
||||
|
||||
reader.onload = (evt) => {
|
||||
this.licenceFileError = 'Error reading file.'
|
||||
|
||||
if (!evt || !evt.target) return
|
||||
if (evt.target.readyState != 2) return
|
||||
if (evt.target.error) return
|
||||
if (!evt.target.result) return
|
||||
|
||||
this.licenceFileLoading = false
|
||||
this.licenceFileError = undefined
|
||||
const fileArr = evt.target.result.toString().split('\n')
|
||||
this.activationKeyValue = fileArr[1]
|
||||
this.licenceKeyValue = fileArr[0]
|
||||
}
|
||||
|
||||
reader.readAsText(file)
|
||||
}
|
||||
|
||||
public switchType(type: 'paste' | 'file') {
|
||||
this.inputType = type
|
||||
}
|
||||
|
||||
get disableApplyButton(): boolean {
|
||||
if (this.licenceKeyValue.length < 1 || this.activationKeyValue.length < 1)
|
||||
return true
|
||||
if (
|
||||
this.licenceKeyValue === this.currentLicenceKey &&
|
||||
this.activationKeyValue === this.currentActivationKey
|
||||
)
|
||||
return true
|
||||
|
||||
return false
|
||||
}
|
||||
}
|
||||
import { Component, OnInit, ViewEncapsulation } from '@angular/core'
|
||||
import { ActivatedRoute, Router } from '@angular/router'
|
||||
import { AppService, LicenceService, SasService } from '../services'
|
||||
import { LicenseKeyData } from '../models/LicenseKeyData'
|
||||
import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapperResponse'
|
||||
|
||||
enum LicenseActions {
|
||||
key = 'key',
|
||||
register = 'register',
|
||||
limit = 'limit',
|
||||
update = 'update'
|
||||
}
|
||||
|
||||
@Component({
|
||||
selector: 'app-licensing',
|
||||
templateUrl: './licensing.component.html',
|
||||
styleUrls: ['./licensing.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class LicensingComponent implements OnInit {
|
||||
public action: LicenseActions | null = null
|
||||
|
||||
public licenseErrors: { [key: string]: string } = {
|
||||
missing: `Licence key is missing - please contact <a class="color-green" href="mailto: support@datacontroller.io">support@datacontroller.io</a> and enter valid keys below.`,
|
||||
expired: `Licence key is expired - please contact <a class="color-green" href="mailto: support@datacontroller.io">support@datacontroller.io</a> and enter valid keys below.`,
|
||||
invalid: `Licence key is invalid - please contact <a class="color-green" href="mailto: support@datacontroller.io">support@datacontroller.io</a> and enter valid keys below.`,
|
||||
missmatch: `Your SYSSITE (below) is not found in the licence key - please contact <a class="color-green" href="mailto: support@datacontroller.io">support@datacontroller.io</a> and enter valid keys below.`
|
||||
}
|
||||
|
||||
public keyError: string | undefined
|
||||
public errorDetails: string | undefined
|
||||
public missmatchedKey: string | undefined
|
||||
public licenceKeyValue: string = ''
|
||||
public activationKeyValue: string = ''
|
||||
|
||||
public applyingKeys: boolean = false
|
||||
|
||||
public syssite = this.appService.syssite
|
||||
public currentLicenceKey = this.licenceService.licenceKey
|
||||
public currentActivationKey = this.licenceService.activationKey
|
||||
public isAppFreeTier = this.licenceService.isAppFreeTier
|
||||
public userCountLimitation = this.licenceService.userCountLimitation
|
||||
|
||||
public licenseKeyData: LicenseKeyData | null = null
|
||||
|
||||
public inputType: 'file' | 'paste' = 'file'
|
||||
public licenceFileError: string | undefined
|
||||
public licenceFileLoading: boolean = false
|
||||
public licencefile: { filename: string } = {
|
||||
filename: ''
|
||||
}
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private router: Router,
|
||||
private licenceService: LicenceService,
|
||||
private sasService: SasService,
|
||||
private appService: AppService
|
||||
) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.licenceKeyValue = this.currentLicenceKey || ''
|
||||
this.activationKeyValue = this.currentActivationKey || ''
|
||||
|
||||
this.route.queryParams.subscribe((queryParams: any) => {
|
||||
this.keyError = queryParams.error
|
||||
this.missmatchedKey = queryParams.missmatchId
|
||||
|
||||
if (queryParams.details) {
|
||||
this.errorDetails = atob(queryParams.details)
|
||||
}
|
||||
})
|
||||
|
||||
this.route.params.subscribe((params: any) => {
|
||||
let actionInUrl = params.action
|
||||
|
||||
if (actionInUrl) {
|
||||
if (Object.values(LicenseActions).includes(actionInUrl)) {
|
||||
this.action = actionInUrl
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
this.licenseKeyData = this.licenceService.getLicenseKeyData()
|
||||
}
|
||||
|
||||
public trimKeys() {
|
||||
this.licenceKeyValue = this.licenceKeyValue.trim()
|
||||
this.activationKeyValue = this.activationKeyValue.trim()
|
||||
}
|
||||
|
||||
public copySyssite(copyIconRef: any, copyTooltip: any, syssite: string[]) {
|
||||
const syssiteString = syssite.join('\n')
|
||||
|
||||
navigator.clipboard.writeText(syssiteString).then(() => {
|
||||
copyIconRef.setAttribute('shape', 'check')
|
||||
copyIconRef.setAttribute('class', 'is-success')
|
||||
copyTooltip.innerText = 'Copied!'
|
||||
|
||||
setTimeout(() => {
|
||||
copyIconRef.setAttribute('shape', 'copy')
|
||||
copyIconRef.removeAttribute('class')
|
||||
copyTooltip.innerText = 'Copy to clipboard'
|
||||
}, 1000)
|
||||
})
|
||||
}
|
||||
|
||||
public applyKeys() {
|
||||
this.applyingKeys = true
|
||||
|
||||
let table = {
|
||||
keyupload: [
|
||||
{
|
||||
ACTIVATION_KEY: this.activationKeyValue,
|
||||
LICENCE_KEY: this.licenceKeyValue
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
this.sasService
|
||||
.request('admin/registerkey', table)
|
||||
.then((res: RequestWrapperResponse) => {
|
||||
if (
|
||||
res.adapterResponse.return &&
|
||||
res.adapterResponse.return[0] &&
|
||||
res.adapterResponse.return[0].MSG === 'SUCCESS'
|
||||
) {
|
||||
this.router.navigateByUrl('/').then(() => {
|
||||
window.location.reload()
|
||||
})
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
this.applyingKeys = false
|
||||
})
|
||||
}
|
||||
|
||||
public onFileCapture(event: any, dropped = false) {
|
||||
let file = dropped ? event[0] : event.target.files[0]
|
||||
this.licencefile.filename = file.name
|
||||
|
||||
if (!file) return
|
||||
|
||||
this.licenceFileLoading = true
|
||||
|
||||
const reader = new FileReader()
|
||||
|
||||
reader.onload = (evt) => {
|
||||
this.licenceFileError = 'Error reading file.'
|
||||
|
||||
if (!evt || !evt.target) return
|
||||
if (evt.target.readyState != 2) return
|
||||
if (evt.target.error) return
|
||||
if (!evt.target.result) return
|
||||
|
||||
this.licenceFileLoading = false
|
||||
this.licenceFileError = undefined
|
||||
const fileArr = evt.target.result.toString().split('\n')
|
||||
this.activationKeyValue = fileArr[1]
|
||||
this.licenceKeyValue = fileArr[0]
|
||||
}
|
||||
|
||||
reader.readAsText(file)
|
||||
}
|
||||
|
||||
public switchType(type: 'paste' | 'file') {
|
||||
this.inputType = type
|
||||
}
|
||||
|
||||
get disableApplyButton(): boolean {
|
||||
if (this.licenceKeyValue.length < 1 || this.activationKeyValue.length < 1)
|
||||
return true
|
||||
if (
|
||||
this.licenceKeyValue === this.currentLicenceKey &&
|
||||
this.activationKeyValue === this.currentActivationKey
|
||||
)
|
||||
return true
|
||||
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -239,13 +239,7 @@
|
||||
|
||||
<clr-dropdown-menu clrPosition="bottom-left" *clrIfOpen>
|
||||
<div (click)="downloadSVG()" clrDropdownItem>SVG</div>
|
||||
<div
|
||||
*ngIf="!helperService.isMicrosoft"
|
||||
(click)="downloadPNG()"
|
||||
clrDropdownItem
|
||||
>
|
||||
PNG
|
||||
</div>
|
||||
<div (click)="downloadPNG()" clrDropdownItem>PNG</div>
|
||||
<div (click)="downloadDot()" clrDropdownItem>Dot</div>
|
||||
<div *ngIf="flatdata" (click)="downloadCSV()" clrDropdownItem>
|
||||
CSV
|
||||
@@ -366,13 +360,7 @@
|
||||
|
||||
<clr-dropdown-menu clrPosition="bottom-left" *clrIfOpen>
|
||||
<div (click)="renderToDownload('SVG')" clrDropdownItem>SVG</div>
|
||||
<div
|
||||
*ngIf="!helperService.isMicrosoft"
|
||||
(click)="renderToDownload('PNG')"
|
||||
clrDropdownItem
|
||||
>
|
||||
PNG
|
||||
</div>
|
||||
<div (click)="renderToDownload('PNG')" clrDropdownItem>PNG</div>
|
||||
<div (click)="downloadDot(); cancelRenderingGraph()" clrDropdownItem>
|
||||
Dot
|
||||
</div>
|
||||
|
||||
@@ -19,7 +19,8 @@ const moment = require('moment')
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class LineageComponent {
|
||||
public switchFlag: boolean = false
|
||||
@@ -746,28 +747,13 @@ export class LineageComponent {
|
||||
return URL.createObjectURL(svg_blob)
|
||||
}
|
||||
|
||||
private getSVGBlob() {
|
||||
let svg: any = document.getElementById('graph')
|
||||
let serializer = new XMLSerializer()
|
||||
let svg_blob = new Blob([serializer.serializeToString(svg)], {
|
||||
type: 'image/svg+xml'
|
||||
})
|
||||
return svg_blob
|
||||
}
|
||||
|
||||
downloadSVG() {
|
||||
d3Viz.graphviz('#graph').resetZoom()
|
||||
|
||||
if (navigator.appVersion.toString().indexOf('.NET') > 0) {
|
||||
window.navigator.msSaveBlob(this.getSVGBlob(), this.constructName('svg'))
|
||||
} else {
|
||||
let downloadLink = document.createElement('a')
|
||||
downloadLink.href = this.getSVGURL()
|
||||
downloadLink.download = this.constructName('svg')
|
||||
document.body.appendChild(downloadLink)
|
||||
downloadLink.click()
|
||||
document.body.removeChild(downloadLink)
|
||||
}
|
||||
let downloadLink = document.createElement('a')
|
||||
downloadLink.href = this.getSVGURL()
|
||||
downloadLink.download = this.constructName('svg')
|
||||
downloadLink.click()
|
||||
}
|
||||
|
||||
async downloadPNG() {
|
||||
@@ -795,16 +781,11 @@ export class LineageComponent {
|
||||
var a = document.createElement('a')
|
||||
var blob = new Blob([csvArray], { type: 'text/csv' })
|
||||
|
||||
if (navigator.appVersion.toString().indexOf('.NET') > 0) {
|
||||
window.navigator.msSaveBlob(blob, this.constructName('csv'))
|
||||
} else {
|
||||
var url = window.URL.createObjectURL(blob)
|
||||
a.href = url
|
||||
a.download = this.constructName('csv')
|
||||
a.click()
|
||||
window.URL.revokeObjectURL(url)
|
||||
a.remove()
|
||||
}
|
||||
var url = window.URL.createObjectURL(blob)
|
||||
a.href = url
|
||||
a.download = this.constructName('csv')
|
||||
a.click()
|
||||
window.URL.revokeObjectURL(url)
|
||||
}
|
||||
|
||||
private getDotUrl() {
|
||||
@@ -813,23 +794,11 @@ export class LineageComponent {
|
||||
return window.URL.createObjectURL(dot_blob)
|
||||
}
|
||||
|
||||
private getDotBlob() {
|
||||
let data = this.vizInput
|
||||
let dot_blob = new Blob([data], { type: 'text/plain' })
|
||||
return dot_blob
|
||||
}
|
||||
|
||||
downloadDot() {
|
||||
if (navigator.appVersion.toString().indexOf('.NET') > 0) {
|
||||
window.navigator.msSaveBlob(this.getDotBlob(), this.constructName('txt'))
|
||||
} else {
|
||||
let downloadLink = document.createElement('a')
|
||||
downloadLink.href = this.getDotUrl()
|
||||
downloadLink.download = this.constructName('txt')
|
||||
document.body.appendChild(downloadLink)
|
||||
downloadLink.click()
|
||||
document.body.removeChild(downloadLink)
|
||||
}
|
||||
let downloadLink = document.createElement('a')
|
||||
downloadLink.href = this.getDotUrl()
|
||||
downloadLink.download = this.constructName('txt')
|
||||
downloadLink.click()
|
||||
}
|
||||
|
||||
public showSvg() {
|
||||
|
||||
@@ -51,7 +51,8 @@ class ValueFilter implements ClrDatagridStringFilterInterface<MetaData> {
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class MetadataComponent implements OnInit {
|
||||
metaDataList: Array<any> | undefined
|
||||
|
||||
@@ -48,7 +48,8 @@ enum FileLoadingState {
|
||||
selector: 'app-multi-dataset',
|
||||
templateUrl: './multi-dataset.component.html',
|
||||
styleUrls: ['./multi-dataset.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class MultiDatasetComponent implements OnInit, AfterViewInit {
|
||||
@HostBinding('class.content-container') contentContainerClass = true
|
||||
|
||||
@@ -7,7 +7,8 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class NotFoundComponent implements OnInit {
|
||||
constructor() {}
|
||||
|
||||
@@ -2,7 +2,8 @@ import { Pipe, PipeTransform } from '@angular/core'
|
||||
import { bytesToSize } from '@sasjs/utils/utils/bytesToSize'
|
||||
|
||||
@Pipe({
|
||||
name: 'convertSize'
|
||||
name: 'convertSize',
|
||||
standalone: false
|
||||
})
|
||||
export class ConvertSizePipe implements PipeTransform {
|
||||
transform(bytes: string | number, ...args: string[]): string {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Pipe, PipeTransform } from '@angular/core'
|
||||
import * as moment from 'moment'
|
||||
import moment from 'moment'
|
||||
@Pipe({
|
||||
name: 'dateTimeFormatter'
|
||||
name: 'dateTimeFormatter',
|
||||
standalone: false
|
||||
})
|
||||
export class DateTimeFormatterPipe implements PipeTransform {
|
||||
transform(value: Date | string, type: string): string {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Pipe, PipeTransform } from '@angular/core'
|
||||
|
||||
@Pipe({
|
||||
name: 'linkinze'
|
||||
name: 'linkinze',
|
||||
standalone: false
|
||||
})
|
||||
export class LinkinzePipe implements PipeTransform {
|
||||
/**
|
||||
|
||||
@@ -2,7 +2,8 @@ import { Pipe, PipeTransform } from '@angular/core'
|
||||
import { HelperService } from '../services/helper.service'
|
||||
|
||||
@Pipe({
|
||||
name: 'sasToJsDate'
|
||||
name: 'sasToJsDate',
|
||||
standalone: false
|
||||
})
|
||||
export class sasToJsDatePipe implements PipeTransform {
|
||||
constructor(private helperService: HelperService) {}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Pipe, PipeTransform } from '@angular/core'
|
||||
|
||||
@Pipe({
|
||||
name: 'pkSpaceSeparate'
|
||||
name: 'pkSpaceSeparate',
|
||||
standalone: false
|
||||
})
|
||||
export class PkSpaceSeparatePipe implements PipeTransform {
|
||||
transform(value: string): string {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Pipe, PipeTransform } from '@angular/core'
|
||||
|
||||
@Pipe({
|
||||
name: 'prettyjson'
|
||||
name: 'prettyjson',
|
||||
standalone: false
|
||||
})
|
||||
export class PrettyjsonPipe implements PipeTransform {
|
||||
transform(rawJson: any): string {
|
||||
|
||||
@@ -2,7 +2,8 @@ import { Pipe, PipeTransform } from '@angular/core'
|
||||
import { HelperService } from '../services/helper.service'
|
||||
|
||||
@Pipe({
|
||||
name: 'secondsParser'
|
||||
name: 'secondsParser',
|
||||
standalone: false
|
||||
})
|
||||
export class SecondsParserPipe implements PipeTransform {
|
||||
constructor(private helperService: HelperService) {}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Pipe, PipeTransform } from '@angular/core'
|
||||
|
||||
@Pipe({
|
||||
name: 'thousandSeparator'
|
||||
name: 'thousandSeparator',
|
||||
standalone: false
|
||||
})
|
||||
export class ThousandSeparatorPipe implements PipeTransform {
|
||||
transform(value: string | number, separator?: string): string {
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { Pipe, PipeTransform } from '@angular/core'
|
||||
|
||||
@Pipe({
|
||||
name: 'toNumber'
|
||||
name: 'toNumber',
|
||||
standalone: false
|
||||
})
|
||||
export class ToNumberPipe implements PipeTransform {
|
||||
transform(value: string | number): number {
|
||||
|
||||
@@ -29,7 +29,8 @@ registerLocaleData(localeEnGB)
|
||||
templateUrl: './query.component.html',
|
||||
styleUrls: ['./query.component.scss'],
|
||||
providers: [{ provide: LOCALE_ID, useValue: 'en-GB' }],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class QueryComponent
|
||||
implements AfterViewInit, AfterContentInit, OnDestroy
|
||||
|
||||
@@ -30,7 +30,8 @@ interface ChangesObj {
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ApproveDetailsComponent implements AfterViewInit, OnDestroy {
|
||||
private _detailsSub: Subscription | undefined
|
||||
|
||||
@@ -38,9 +38,7 @@ class SubmittedFilter implements ClrDatagridStringFilterInterface<ApproveData> {
|
||||
}
|
||||
}
|
||||
|
||||
class SubmitReasonFilter
|
||||
implements ClrDatagridStringFilterInterface<ApproveData>
|
||||
{
|
||||
class SubmitReasonFilter implements ClrDatagridStringFilterInterface<ApproveData> {
|
||||
accepts(data: ApproveData, search: string): boolean {
|
||||
return data.submitReason.toLowerCase().indexOf(search.toLowerCase()) >= 0
|
||||
}
|
||||
@@ -53,7 +51,8 @@ class SubmitReasonFilter
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ApproveComponent implements OnInit {
|
||||
public approveList: Array<ApproveData> | undefined
|
||||
|
||||
@@ -38,9 +38,7 @@ class SubmitterFilter implements ClrDatagridStringFilterInterface<HistoryData> {
|
||||
}
|
||||
}
|
||||
|
||||
class SubmitReasonFilter
|
||||
implements ClrDatagridStringFilterInterface<HistoryData>
|
||||
{
|
||||
class SubmitReasonFilter implements ClrDatagridStringFilterInterface<HistoryData> {
|
||||
accepts(data: HistoryData, search: string): boolean {
|
||||
return data.submittedReason.toLowerCase().indexOf(search.toLowerCase()) >= 0
|
||||
}
|
||||
@@ -65,7 +63,8 @@ class ReviewedFilter implements ClrDatagridStringFilterInterface<HistoryData> {
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class HistoryComponent implements OnInit {
|
||||
public history: Array<any> = []
|
||||
|
||||
@@ -17,17 +17,13 @@ interface SubmitterData {
|
||||
approver: string
|
||||
}
|
||||
|
||||
class SubmittedFilter
|
||||
implements ClrDatagridStringFilterInterface<SubmitterData>
|
||||
{
|
||||
class SubmittedFilter implements ClrDatagridStringFilterInterface<SubmitterData> {
|
||||
accepts(data: SubmitterData, search: string): boolean {
|
||||
return data.submitted.toLowerCase().indexOf(search.toLowerCase()) >= 0
|
||||
}
|
||||
}
|
||||
|
||||
class SubmitReasonFilter
|
||||
implements ClrDatagridStringFilterInterface<SubmitterData>
|
||||
{
|
||||
class SubmitReasonFilter implements ClrDatagridStringFilterInterface<SubmitterData> {
|
||||
accepts(data: SubmitterData, search: string): boolean {
|
||||
return data.submitReason.toLowerCase().indexOf(search.toLowerCase()) >= 0
|
||||
}
|
||||
@@ -40,7 +36,8 @@ class SubmitReasonFilter
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class SubmitterComponent implements OnInit, AfterViewInit {
|
||||
public remained: number = 0
|
||||
|
||||
@@ -13,7 +13,8 @@ import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapper
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class RoleComponent implements OnInit {
|
||||
public roles: Array<any> | undefined
|
||||
|
||||
@@ -7,7 +7,8 @@ import { Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class HomeRouteComponent implements OnInit, OnDestroy {
|
||||
constructor() {}
|
||||
|
||||
@@ -5,7 +5,8 @@ import { Component, OnInit, OnDestroy } from '@angular/core'
|
||||
templateUrl: './multi-dataset-route.component.html',
|
||||
host: {
|
||||
class: 'content-container'
|
||||
}
|
||||
},
|
||||
standalone: false
|
||||
})
|
||||
export class MultiDatasetRouteComponent implements OnInit, OnDestroy {
|
||||
constructor() {}
|
||||
|
||||
@@ -7,7 +7,8 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ReviewRouteComponent implements OnInit {
|
||||
constructor() {}
|
||||
|
||||
@@ -7,7 +7,8 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class UsernavRouteComponent implements OnInit {
|
||||
constructor() {}
|
||||
|
||||
@@ -7,7 +7,8 @@ import { Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ViewRouteComponent implements OnInit, OnDestroy {
|
||||
constructor() {}
|
||||
|
||||
@@ -7,7 +7,8 @@ import { Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class XLMapRouteComponent implements OnInit, OnDestroy {
|
||||
constructor() {}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Injectable } from '@angular/core'
|
||||
import cloneDeep from 'lodash-es/cloneDeep'
|
||||
import * as CryptoMD5 from 'crypto-js/md5'
|
||||
import CryptoMD5 from 'crypto-js/md5'
|
||||
import { SasService } from './sas.service'
|
||||
|
||||
const librariesToShow = 50
|
||||
@@ -11,12 +11,8 @@ const librariesToShow = 50
|
||||
export class HelperService {
|
||||
public shownLibraries: number = librariesToShow
|
||||
public loadMoreCount: number = librariesToShow
|
||||
public isMicrosoft: boolean = false
|
||||
|
||||
constructor(private sasService: SasService) {
|
||||
this.isMicrosoft = this.isIEorEDGE()
|
||||
console.log('Is IE or Edge?', this.isMicrosoft)
|
||||
}
|
||||
constructor(private sasService: SasService) {}
|
||||
|
||||
/**
|
||||
* Converts a JavaScript date object to a SAS Date or Datetime, given the logic below:
|
||||
@@ -215,32 +211,6 @@ export class HelperService {
|
||||
})
|
||||
}
|
||||
|
||||
public isIEorEDGE() {
|
||||
var ua = window.navigator.userAgent
|
||||
|
||||
var msie = ua.indexOf('MSIE ')
|
||||
if (msie > 0) {
|
||||
// IE 10 or older => return version number
|
||||
return true
|
||||
}
|
||||
|
||||
var trident = ua.indexOf('Trident/')
|
||||
if (trident > 0) {
|
||||
// IE 11 => return version number
|
||||
var rv = ua.indexOf('rv:')
|
||||
return true
|
||||
}
|
||||
|
||||
var edge = ua.indexOf('Edge/')
|
||||
if (edge > 0) {
|
||||
// Edge (IE 12+) => return version number
|
||||
return true
|
||||
}
|
||||
|
||||
// other browser
|
||||
return false
|
||||
}
|
||||
|
||||
public convertObjectsToArray(
|
||||
objectArray: Array<object>,
|
||||
deepClone: boolean = false
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
|
||||
import { BehaviorSubject } from 'rxjs'
|
||||
import { LicenseKeyData } from '../models/LicenseKeyData'
|
||||
import { SasService } from './sas.service'
|
||||
import * as moment from 'moment'
|
||||
import moment from 'moment'
|
||||
import * as base64Converter from 'base64-arraybuffer'
|
||||
import * as encoding from 'text-encoding'
|
||||
import { Router } from '@angular/router'
|
||||
|
||||
@@ -120,9 +120,12 @@ export class SasViyaService {
|
||||
}
|
||||
|
||||
getComputeContexts(): Observable<ViyaComputeContexts> {
|
||||
return this.get<ViyaComputeContexts>(`${this.serverUrl}/compute/contexts`, {
|
||||
withCredentials: true
|
||||
})
|
||||
return this.get<ViyaComputeContexts>(
|
||||
`${this.serverUrl}/compute/contexts?limit=1000`,
|
||||
{
|
||||
withCredentials: true
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
getComputeContextById(id: string): Observable<ComputeContextDetails> {
|
||||
|
||||
@@ -17,7 +17,8 @@ import { AbortDetails, InfoModal } from '../../models/InfoModal'
|
||||
selector: 'app-info-modal',
|
||||
templateUrl: './info-modal.component.html',
|
||||
styleUrls: ['./info-modal.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class InfoModalComponent implements OnInit {
|
||||
@Output() onConfirmModalClick: EventEmitter<any> = new EventEmitter()
|
||||
|
||||
@@ -7,7 +7,8 @@ import { AlertsService } from './alerts.service'
|
||||
selector: 'app-alerts',
|
||||
templateUrl: './alerts.component.html',
|
||||
styleUrls: ['./alerts.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class AlertsComponent implements OnInit {
|
||||
public alerts: Array<Alert> = []
|
||||
|
||||
@@ -19,7 +19,8 @@ export type OnLoadingMoreEvent = {
|
||||
selector: 'app-autocomplete',
|
||||
templateUrl: './autocomplete.component.html',
|
||||
styleUrls: ['./autocomplete.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class AutocompleteComponent implements OnInit, AfterViewInit {
|
||||
@ViewChild('input') inputElement: any
|
||||
|
||||
@@ -4,7 +4,8 @@ import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core'
|
||||
selector: 'contact-link',
|
||||
templateUrl: './contact-link.component.html',
|
||||
styleUrls: ['./contact-link.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ContactLinkComponent implements OnInit {
|
||||
@Input() classes: string = ''
|
||||
|
||||
@@ -15,7 +15,8 @@ import { Tab } from './models/dsmeta-groupped.model'
|
||||
selector: 'app-dataset-info',
|
||||
templateUrl: './dataset-info.component.html',
|
||||
styleUrls: ['./dataset-info.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class DatasetInfoComponent implements OnInit, OnChanges {
|
||||
@Input() open: boolean = false
|
||||
|
||||
@@ -22,7 +22,8 @@ import { TableClickEmitter } from './models/TableClickEmitter'
|
||||
selector: 'dc-tree',
|
||||
templateUrl: './dc-tree.component.html',
|
||||
styleUrls: ['./dc-tree.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class DcTreeComponent implements OnInit, AfterViewInit, OnChanges {
|
||||
// REFACTOR NOTICE
|
||||
|
||||
@@ -15,6 +15,7 @@ import {
|
||||
} from './models/dc-validation.model'
|
||||
import { DQRule, DQRuleTypes } from './models/dq-rules.model'
|
||||
import { getDqDataCols } from './utils/getDqDataCols'
|
||||
import { getNotNullDefault } from './utils/getNotNullDefault'
|
||||
import { mergeColsRules } from './utils/mergeColsRules'
|
||||
import { parseColType } from './utils/parseColType'
|
||||
import { dqValidate } from './validations/dq-validation'
|
||||
@@ -133,6 +134,19 @@ export class DcValidator {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the RULE_VALUE for a NOTNULL rule on the given column.
|
||||
* Used for auto-populating default values when cells are empty.
|
||||
* Converts to number for numeric columns.
|
||||
*
|
||||
* @param col column name
|
||||
* @returns RULE_VALUE (string or number) if NOTNULL rule exists, otherwise undefined
|
||||
*/
|
||||
getNotNullDefaultValue(col: string): string | number | undefined {
|
||||
const colRule = this.getRule(col)
|
||||
return getNotNullDefault(col, this.dqrules, colRule?.type)
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves dropdown source for given dc validation rule
|
||||
* The values comes from MPE_SELECTBOX table
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import Handsontable from 'handsontable'
|
||||
import Core from 'handsontable/core'
|
||||
|
||||
export class CustomAutocompleteEditor extends Handsontable.editors
|
||||
.AutocompleteEditor {
|
||||
export class CustomAutocompleteEditor
|
||||
extends Handsontable.editors.AutocompleteEditor
|
||||
{
|
||||
constructor(instance: Core) {
|
||||
super(instance)
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ export interface DcColumnSettings {
|
||||
export interface DcValidation extends HotColumnSettings, DcColumnSettings {}
|
||||
|
||||
export interface DcValidationRuleUpdate
|
||||
extends Handsontable.ColumnSettings,
|
||||
DcColumnSettings {
|
||||
extends Handsontable.ColumnSettings, DcColumnSettings {
|
||||
data?: string
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { DQRule } from '../models/dq-rules.model'
|
||||
import { getHotDataSchema } from '../utils/getHotDataSchema'
|
||||
|
||||
describe('DC Validator - hot data schema', () => {
|
||||
@@ -8,4 +9,58 @@ describe('DC Validator - hot data schema', () => {
|
||||
).toEqual(1)
|
||||
expect(getHotDataSchema('missing')).toEqual('')
|
||||
})
|
||||
|
||||
describe('NOTNULL defaults', () => {
|
||||
const dqRules: DQRule[] = [
|
||||
{
|
||||
BASE_COL: 'TEXT_COL',
|
||||
RULE_TYPE: 'NOTNULL',
|
||||
RULE_VALUE: 'default_text',
|
||||
X: 1
|
||||
},
|
||||
{ BASE_COL: 'NUM_COL', RULE_TYPE: 'NOTNULL', RULE_VALUE: '42', X: 1 }
|
||||
]
|
||||
|
||||
it('should return NOTNULL default for text column', () => {
|
||||
expect(getHotDataSchema('text', { data: 'TEXT_COL' }, dqRules)).toEqual(
|
||||
'default_text'
|
||||
)
|
||||
})
|
||||
|
||||
it('should return NOTNULL default as number for numeric column', () => {
|
||||
expect(getHotDataSchema('numeric', { data: 'NUM_COL' }, dqRules)).toEqual(
|
||||
42
|
||||
)
|
||||
})
|
||||
|
||||
it('should fall back to type default when no NOTNULL rule exists', () => {
|
||||
expect(
|
||||
getHotDataSchema('numeric', { data: 'OTHER_COL' }, dqRules)
|
||||
).toEqual('')
|
||||
})
|
||||
|
||||
it('should prioritize NOTNULL over autocomplete first option', () => {
|
||||
const rulesWithAutocomplete: DQRule[] = [
|
||||
{
|
||||
BASE_COL: 'SELECT_COL',
|
||||
RULE_TYPE: 'NOTNULL',
|
||||
RULE_VALUE: 'priority_value',
|
||||
X: 1
|
||||
},
|
||||
{
|
||||
BASE_COL: 'SELECT_COL',
|
||||
RULE_TYPE: 'HARDSELECT',
|
||||
RULE_VALUE: 'ignored',
|
||||
X: 1
|
||||
}
|
||||
]
|
||||
expect(
|
||||
getHotDataSchema(
|
||||
'autocomplete',
|
||||
{ data: 'SELECT_COL', source: ['first', 'second'] },
|
||||
rulesWithAutocomplete
|
||||
)
|
||||
).toEqual('priority_value')
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
import { DQRule } from '../models/dq-rules.model'
|
||||
import { getNotNullDefault } from '../utils/getNotNullDefault'
|
||||
|
||||
describe('DC Validator - getNotNullDefault', () => {
|
||||
const dqRules: DQRule[] = [
|
||||
{
|
||||
BASE_COL: 'TEXT_COL',
|
||||
RULE_TYPE: 'NOTNULL',
|
||||
RULE_VALUE: 'default_text',
|
||||
X: 1
|
||||
},
|
||||
{ BASE_COL: 'NUM_COL', RULE_TYPE: 'NOTNULL', RULE_VALUE: '42', X: 1 },
|
||||
{ BASE_COL: 'EMPTY_RULE', RULE_TYPE: 'NOTNULL', RULE_VALUE: ' ', X: 1 },
|
||||
{
|
||||
BASE_COL: 'OTHER_COL',
|
||||
RULE_TYPE: 'HARDSELECT',
|
||||
RULE_VALUE: 'some_value',
|
||||
X: 1
|
||||
}
|
||||
]
|
||||
|
||||
it('should return string value for text columns', () => {
|
||||
expect(getNotNullDefault('TEXT_COL', dqRules, 'text')).toEqual(
|
||||
'default_text'
|
||||
)
|
||||
})
|
||||
|
||||
it('should return number for numeric columns when RULE_VALUE is numeric', () => {
|
||||
expect(getNotNullDefault('NUM_COL', dqRules, 'numeric')).toEqual(42)
|
||||
})
|
||||
|
||||
it('should return string for numeric columns when RULE_VALUE is not numeric', () => {
|
||||
const rulesWithNonNumeric: DQRule[] = [
|
||||
{
|
||||
BASE_COL: 'NUM_COL',
|
||||
RULE_TYPE: 'NOTNULL',
|
||||
RULE_VALUE: 'not_a_number',
|
||||
X: 1
|
||||
}
|
||||
]
|
||||
expect(
|
||||
getNotNullDefault('NUM_COL', rulesWithNonNumeric, 'numeric')
|
||||
).toEqual('not_a_number')
|
||||
})
|
||||
|
||||
it('should return undefined for empty RULE_VALUE', () => {
|
||||
expect(getNotNullDefault('EMPTY_RULE', dqRules, 'text')).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should return undefined for columns without NOTNULL rule', () => {
|
||||
expect(getNotNullDefault('OTHER_COL', dqRules, 'text')).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should return undefined for non-existent columns', () => {
|
||||
expect(getNotNullDefault('MISSING_COL', dqRules, 'text')).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should return undefined for empty dqRules array', () => {
|
||||
expect(getNotNullDefault('TEXT_COL', [], 'text')).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should return string when colType is undefined', () => {
|
||||
expect(getNotNullDefault('NUM_COL', dqRules, undefined)).toEqual('42')
|
||||
})
|
||||
})
|
||||
39
client/src/app/shared/dc-validator/tests/isEmpty.spec.ts
Normal file
39
client/src/app/shared/dc-validator/tests/isEmpty.spec.ts
Normal file
@@ -0,0 +1,39 @@
|
||||
import { isEmpty } from '../utils/isEmpty'
|
||||
|
||||
describe('DC Validator - isEmpty', () => {
|
||||
it('should return true for null', () => {
|
||||
expect(isEmpty(null)).toBe(true)
|
||||
})
|
||||
|
||||
it('should return true for undefined', () => {
|
||||
expect(isEmpty(undefined)).toBe(true)
|
||||
})
|
||||
|
||||
it('should return true for empty string', () => {
|
||||
expect(isEmpty('')).toBe(true)
|
||||
})
|
||||
|
||||
it('should return true for whitespace-only string', () => {
|
||||
expect(isEmpty(' ')).toBe(true)
|
||||
expect(isEmpty('\t\n')).toBe(true)
|
||||
})
|
||||
|
||||
it('should return false for non-empty string', () => {
|
||||
expect(isEmpty('hello')).toBe(false)
|
||||
expect(isEmpty(' hello ')).toBe(false)
|
||||
})
|
||||
|
||||
it('should return false for number zero', () => {
|
||||
expect(isEmpty(0)).toBe(false)
|
||||
})
|
||||
|
||||
it('should return false for non-zero numbers', () => {
|
||||
expect(isEmpty(42)).toBe(false)
|
||||
expect(isEmpty(-1)).toBe(false)
|
||||
})
|
||||
|
||||
it('should return false for boolean values', () => {
|
||||
expect(isEmpty(true)).toBe(false)
|
||||
expect(isEmpty(false)).toBe(false)
|
||||
})
|
||||
})
|
||||
@@ -1,4 +1,6 @@
|
||||
import { DcValidation } from '../models/dc-validation.model'
|
||||
import { DQRule } from '../models/dq-rules.model'
|
||||
import { getNotNullDefault } from './getNotNullDefault'
|
||||
|
||||
const schemaTypeMap: { [key: string]: any } = {
|
||||
numeric: '',
|
||||
@@ -7,14 +9,25 @@ const schemaTypeMap: { [key: string]: any } = {
|
||||
|
||||
/**
|
||||
* Schema defines the default values for given types. For example when new row is added.
|
||||
* Priority: NOTNULL RULE_VALUE > autocomplete first option > type default
|
||||
*/
|
||||
export const getHotDataSchema = (
|
||||
export function getHotDataSchema(
|
||||
type: string | undefined,
|
||||
cellValidation?: DcValidation
|
||||
): any => {
|
||||
cellValidation?: DcValidation,
|
||||
dqRules?: DQRule[]
|
||||
): any {
|
||||
// Check for NOTNULL default first
|
||||
if (dqRules && cellValidation?.data) {
|
||||
const defaultValue = getNotNullDefault(cellValidation.data, dqRules, type)
|
||||
if (defaultValue !== undefined) {
|
||||
return defaultValue
|
||||
}
|
||||
}
|
||||
|
||||
if (!type) return schemaTypeMap.default
|
||||
|
||||
switch (type) {
|
||||
case 'dropdown':
|
||||
case 'autocomplete': {
|
||||
return cellValidation && cellValidation.source
|
||||
? (cellValidation.source as string[] | number[])[0]
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
import { DQRule } from '../models/dq-rules.model'
|
||||
|
||||
/**
|
||||
* Returns the NOTNULL default value for a column from DQ rules.
|
||||
* Converts to number for numeric columns based on colType parameter.
|
||||
*
|
||||
* @param colName column name to look up
|
||||
* @param dqRules array of DQ rules
|
||||
* @param colType column type (e.g., 'numeric', 'text')
|
||||
* @returns default value (string or number) if NOTNULL rule exists with non-empty value, otherwise undefined
|
||||
*/
|
||||
export function getNotNullDefault(
|
||||
colName: string,
|
||||
dqRules: DQRule[],
|
||||
colType?: string
|
||||
): string | number | undefined {
|
||||
const notNullRule = dqRules.find(
|
||||
(rule: DQRule) => rule.BASE_COL === colName && rule.RULE_TYPE === 'NOTNULL'
|
||||
)
|
||||
|
||||
if (!notNullRule?.RULE_VALUE || notNullRule.RULE_VALUE.trim().length === 0) {
|
||||
return undefined
|
||||
}
|
||||
|
||||
if (colType === 'numeric' && !isNaN(Number(notNullRule.RULE_VALUE))) {
|
||||
return Number(notNullRule.RULE_VALUE)
|
||||
}
|
||||
|
||||
return notNullRule.RULE_VALUE
|
||||
}
|
||||
8
client/src/app/shared/dc-validator/utils/isEmpty.ts
Normal file
8
client/src/app/shared/dc-validator/utils/isEmpty.ts
Normal file
@@ -0,0 +1,8 @@
|
||||
/**
|
||||
* Checks if a value is considered empty for NOTNULL validation purposes.
|
||||
* A value is empty if it's null, undefined, or a string that is blank after trimming.
|
||||
*/
|
||||
export function isEmpty(value: unknown): boolean {
|
||||
if (value === null || value === undefined) return true
|
||||
return value.toString().trim().length === 0
|
||||
}
|
||||
@@ -7,7 +7,8 @@ import { Options } from './models/options.interface'
|
||||
selector: 'app-excel-password-modal',
|
||||
styleUrls: ['./excel-password-modal.component.scss'],
|
||||
templateUrl: './excel-password-modal.component.html',
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ExcelPasswordModalComponent {
|
||||
options$: Observable<Options> = this.excelPasswordModalService.optionsSubject$
|
||||
|
||||
@@ -7,7 +7,8 @@ import { Service } from '../service.interface'
|
||||
selector: 'app-loading-indicator',
|
||||
templateUrl: './loading-indicator.component.html',
|
||||
styleUrls: ['./loading-indicator.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class LoadingIndicatorComponent implements OnInit, OnDestroy {
|
||||
public loading: boolean = false
|
||||
|
||||
@@ -13,7 +13,8 @@ interface User {
|
||||
selector: 'app-login',
|
||||
templateUrl: './login.component.html',
|
||||
styleUrls: ['./login.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class LoginComponent implements OnInit, OnDestroy {
|
||||
private _subscription: Subscription = new Subscription()
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
ViewEncapsulation
|
||||
} from '@angular/core'
|
||||
import { SASjsRequest } from '@sasjs/adapter'
|
||||
import * as moment from 'moment'
|
||||
import moment from 'moment'
|
||||
import { HelperService } from 'src/app/services/helper.service'
|
||||
import { LoggerService } from '../../services/logger.service'
|
||||
import { SasService } from '../../services/sas.service'
|
||||
@@ -23,7 +23,8 @@ interface SASjsRequestExtended extends SASjsRequest {
|
||||
selector: 'app-requests-modal',
|
||||
templateUrl: './requests-modal.component.html',
|
||||
styleUrls: ['./requests-modal.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class RequestsModalComponent implements OnInit {
|
||||
private _opened: boolean = false
|
||||
|
||||
@@ -18,7 +18,8 @@ import { globals } from '../../_globals'
|
||||
selector: 'app-sidebar',
|
||||
templateUrl: './sidebar.component.html',
|
||||
styleUrls: ['./sidebar.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class SidebarComponent implements OnInit {
|
||||
@ViewChild('sidebarNav') sidebarNav!: ElementRef
|
||||
|
||||
@@ -15,7 +15,8 @@ import { OnLoadingMoreEvent } from '../autocomplete/autocomplete.component'
|
||||
selector: 'app-soft-select',
|
||||
templateUrl: './soft-select.component.html',
|
||||
styleUrls: ['./soft-select.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class SoftSelectComponent implements OnInit, OnChanges {
|
||||
@Input() inputId: string = ''
|
||||
|
||||
@@ -511,6 +511,21 @@ export class SpreadsheetUtil {
|
||||
return resolve(XLSX.read(data, opts))
|
||||
}
|
||||
|
||||
// TEMPORARILY DISABLED: Web Worker for XLSX parsing
|
||||
// Worker is disabled because Angular/webpack bundles it as a separate chunk
|
||||
// with a numeric filename (e.g., 411.hash.js). In SAS9/Viya streaming
|
||||
// environments, all JS files need to be served through SASJobExecution
|
||||
// with _program= parameter, but our post-build processor can't reliably
|
||||
// find and replace the worker chunk reference in the minified output.
|
||||
// FIX: Add "namedChunks": true to production config in angular.json
|
||||
// (under projects.datacontroller.architect.build.configurations.production)
|
||||
// This will output worker as "spreadsheet-worker.hash.js" instead of
|
||||
// numeric ID, making it findable by post-processor.
|
||||
// Trade-off: UI may briefly freeze when parsing large Excel files.
|
||||
|
||||
return resolve(XLSX.read(data, opts))
|
||||
|
||||
/*
|
||||
if (typeof Worker === 'undefined') {
|
||||
console.info(
|
||||
'Not using worker to parse the XLSX - no Worker available in this environment'
|
||||
@@ -551,6 +566,7 @@ export class SpreadsheetUtil {
|
||||
setTimeout(() => {
|
||||
return resolve(XLSX.read(data, opts))
|
||||
}, 600 * 1000) // 10 minutes
|
||||
*/
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,8 @@ import { RequestWrapperResponse } from 'src/app/models/request-wrapper/RequestWr
|
||||
selector: 'app-terms',
|
||||
templateUrl: './terms.component.html',
|
||||
styleUrls: ['./terms.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class TermsComponent implements OnInit, AfterViewInit {
|
||||
@ViewChild('markdownCard') markdownCard!: ElementRef
|
||||
|
||||
@@ -12,7 +12,8 @@ import { globals } from 'src/app/_globals'
|
||||
selector: 'app-header-actions',
|
||||
templateUrl: './header-actions.component.html',
|
||||
styleUrls: ['./header-actions.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class HeaderActions implements OnInit, OnDestroy {
|
||||
public userName: string = 'Not logged in'
|
||||
|
||||
@@ -48,7 +48,8 @@ import { Viewbox } from './models/viewbox.model'
|
||||
selector: 'app-viewboxes',
|
||||
templateUrl: './viewboxes.component.html',
|
||||
styleUrls: ['./viewboxes.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ViewboxesComponent implements OnInit, AfterViewInit, OnDestroy {
|
||||
@ViewChildren('resizeBox') resizeBoxQuery!: QueryList<ElementRef> //make query list, handle multiple
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
* We use normal version of the XLSX (SheetJS)
|
||||
* Because at the moment "@sheet/crypto" can't work in the Web Worker environment
|
||||
* Because of the missing "global" variable.
|
||||
*
|
||||
* Version bumped to v0.20.3 (`libraries/xlsx-0.20.3.tgz`)
|
||||
* @see https://cdn.sheetjs.com/
|
||||
*/
|
||||
import * as XLSX from 'xlsx'
|
||||
|
||||
|
||||
@@ -24,7 +24,8 @@ import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapper
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class StageComponent implements OnInit, AfterViewInit {
|
||||
public table_id: any
|
||||
|
||||
@@ -18,7 +18,8 @@ import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapper
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class SystemComponent implements OnInit {
|
||||
appInfo: AppInfo = {
|
||||
|
||||
@@ -15,7 +15,8 @@ import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapper
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class UserComponent implements OnInit {
|
||||
public users: Array<any> | undefined
|
||||
|
||||
@@ -49,7 +49,8 @@ import { RequestWrapperResponse } from '../models/request-wrapper/RequestWrapper
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ViewerComponent
|
||||
implements AfterContentInit, AfterViewInit, OnDestroy
|
||||
@@ -159,11 +160,7 @@ export class ViewerComponent
|
||||
afterGetColHeader: (col: number, th: any, headerLevel: number) => {
|
||||
// CRITICAL: Prevent "colToProp method cannot be called because this Handsontable instance has been destroyed" error
|
||||
// This callback can be triggered even after the instance is destroyed during rapid table switching
|
||||
if (
|
||||
!this.hotInstance ||
|
||||
this.hotInstance.isDestroyed ||
|
||||
this.isTableSwitching
|
||||
) {
|
||||
if (!this.hotInstance || this.hotInstance.isDestroyed) {
|
||||
// Graceful fallback: apply only dark mode styling when instance is unavailable
|
||||
th.classList.add(globals.handsontable.darkTableHeaderClass)
|
||||
return
|
||||
@@ -536,17 +533,7 @@ export class ViewerComponent
|
||||
}
|
||||
|
||||
public copyToClip() {
|
||||
let selBox = document.createElement('textarea')
|
||||
selBox.style.position = 'fixed'
|
||||
selBox.style.left = '0'
|
||||
selBox.style.top = '0'
|
||||
selBox.style.opacity = '0'
|
||||
selBox.value = this.webQueryText
|
||||
document.body.appendChild(selBox)
|
||||
selBox.focus()
|
||||
selBox.select()
|
||||
document.execCommand('copy')
|
||||
document.body.removeChild(selBox)
|
||||
navigator.clipboard.writeText(this.webQueryText)
|
||||
}
|
||||
|
||||
public goToViewer() {
|
||||
@@ -770,10 +757,6 @@ export class ViewerComponent
|
||||
// This prevents callbacks from accessing destroyed instances during table switching
|
||||
this.isTableSwitching = true
|
||||
|
||||
// CLEANUP: Ensure any existing Handsontable instance is properly destroyed
|
||||
// This prevents "instance destroyed" errors
|
||||
this.cleanupHotInstance()
|
||||
|
||||
this.loadingTableView = true
|
||||
|
||||
let libDataset: any
|
||||
@@ -1186,8 +1169,6 @@ export class ViewerComponent
|
||||
* Purpose: Prevents "instance destroyed" errors and memory leaks during table switching
|
||||
*
|
||||
* Called from:
|
||||
* - viewData() - before loading new table data
|
||||
* - setupHot() - before creating new instance
|
||||
* - ngOnDestroy() - component cleanup
|
||||
*
|
||||
* Safety features:
|
||||
@@ -1204,107 +1185,113 @@ export class ViewerComponent
|
||||
}
|
||||
}
|
||||
this.hotInstance = null
|
||||
this.hooksAttached = false
|
||||
}
|
||||
|
||||
/**
|
||||
* PERFORMANCE: Configures Handsontable with enhanced error handling (workaround needed for HOT version 16 and above)
|
||||
*
|
||||
* 1. Duplicate call prevention (500ms window)
|
||||
* 2. Reduced timeout delays (200ms + 50ms vs original 1000ms + 200ms)
|
||||
* 3. Multiple validation checks to prevent race conditions
|
||||
* 4. Forced render for immediate primary key styling
|
||||
* 2. Multiple validation checks to prevent race conditions
|
||||
* 3. Forced render for immediate primary key styling
|
||||
*
|
||||
* Timeline: 50ms (viewData) + 200ms (main) + 50ms (component ready) = ~300ms total
|
||||
* Previous: 100ms + 600ms + 100ms = 800ms (plus render delays = ~2 seconds)
|
||||
* Instance lifecycle is managed by Angular's hot-table component via [data] and [settings] bindings.
|
||||
* This method only applies additional config that can't go through bindings (hooks, PK styling).
|
||||
*/
|
||||
private setupHot() {
|
||||
// DUPLICATE PREVENTION: Avoid multiple setup calls during rapid table switching
|
||||
const now = Date.now()
|
||||
if (now - this.lastSetupTime < 500) {
|
||||
return
|
||||
}
|
||||
this.lastSetupTime = now
|
||||
|
||||
// VALIDATION: Don't setup if we're currently switching tables or still loading
|
||||
if (this.loadingTableView || !this.libDataset) {
|
||||
return
|
||||
}
|
||||
|
||||
if (!this.hotInstance || this.hotInstance.isDestroyed) {
|
||||
this.hotInstance = this.hotTableComponent?.hotInstance
|
||||
}
|
||||
|
||||
if (this.hotInstance && !this.hotInstance.isDestroyed) {
|
||||
this.configureHotInstance()
|
||||
return
|
||||
}
|
||||
|
||||
// Instance not ready yet — Angular may still be creating the component
|
||||
setTimeout(() => {
|
||||
// VALIDATION: Don't setup if we're currently switching tables or still loading
|
||||
if (this.loadingTableView || !this.libDataset) {
|
||||
if (this.isTableSwitching || this.loadingTableView || !this.libDataset) {
|
||||
return
|
||||
}
|
||||
|
||||
// CLEANUP: Ensure clean slate before new setup
|
||||
this.cleanupHotInstance()
|
||||
this.hotInstance = this.hotTableComponent?.hotInstance
|
||||
this.configureHotInstance()
|
||||
}, 250)
|
||||
}
|
||||
|
||||
// TIMING: Wait for Angular component to be ready (optimized from 100ms to 50ms)
|
||||
setTimeout(() => {
|
||||
// DOUBLE-CHECK: Ensure we're still in valid state after delays
|
||||
if (
|
||||
this.isTableSwitching ||
|
||||
this.loadingTableView ||
|
||||
!this.libDataset
|
||||
) {
|
||||
private hooksAttached = false
|
||||
|
||||
/**
|
||||
* Applies settings that can't go through Angular [settings] binding:
|
||||
* - Primary key column header styling
|
||||
* - Column width cap
|
||||
* - ARIA accessibility hooks (attached once per instance)
|
||||
*/
|
||||
private configureHotInstance() {
|
||||
if (!this.hotInstance || this.hotInstance.isDestroyed) return
|
||||
|
||||
this.hotInstance.updateSettings({
|
||||
height: this.hotTable.height,
|
||||
modifyColWidth: (width: any, col: any) => {
|
||||
if (width > 500) return 500
|
||||
else return width
|
||||
},
|
||||
afterGetColHeader: (col: number, th: any) => {
|
||||
// CRITICAL: Same safety checks as initial callback to prevent destroyed instance errors
|
||||
if (!this.hotInstance || this.hotInstance.isDestroyed) {
|
||||
th.classList.add(globals.handsontable.darkTableHeaderClass)
|
||||
return
|
||||
}
|
||||
|
||||
this.hotInstance = this.hotTableComponent?.hotInstance
|
||||
try {
|
||||
const column = this.hotInstance.colToProp(col) as string
|
||||
|
||||
if (this.hotInstance && !this.hotInstance.isDestroyed) {
|
||||
this.hotInstance.updateSettings({
|
||||
height: this.hotTable.height,
|
||||
modifyColWidth: (width: any, col: any) => {
|
||||
if (width > 500) return 500
|
||||
else return width
|
||||
},
|
||||
afterGetColHeader: (col: number, th: any) => {
|
||||
// CRITICAL: Same safety checks as initial callback to prevent destroyed instance errors
|
||||
if (
|
||||
!this.hotInstance ||
|
||||
this.hotInstance.isDestroyed ||
|
||||
this.isTableSwitching
|
||||
) {
|
||||
th.classList.add(globals.handsontable.darkTableHeaderClass)
|
||||
return
|
||||
}
|
||||
// PRIMARY KEY STYLING: Apply special styling to PK columns (populated from API response)
|
||||
const isPKCol = column && this.headerPks.indexOf(column) > -1
|
||||
if (isPKCol) th.classList.add('primaryKeyHeaderStyle')
|
||||
|
||||
try {
|
||||
const column = this.hotInstance.colToProp(col) as string
|
||||
|
||||
// PRIMARY KEY STYLING: Apply special styling to PK columns (populated from API response)
|
||||
const isPKCol = column && this.headerPks.indexOf(column) > -1
|
||||
if (isPKCol) th.classList.add('primaryKeyHeaderStyle')
|
||||
|
||||
// DARK MODE: Apply to all headers
|
||||
th.classList.add(globals.handsontable.darkTableHeaderClass)
|
||||
} catch (error) {
|
||||
// SAFETY NET: Ensure basic styling is always applied
|
||||
th.classList.add(globals.handsontable.darkTableHeaderClass)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Add hooks for accessibility fixes
|
||||
this.hotInstance.addHook('afterRender', () => {
|
||||
// Fix ARIA accessibility issues after each render
|
||||
this.fixAriaAccessibility()
|
||||
})
|
||||
|
||||
this.hotInstance.addHook('afterChange', () => {
|
||||
// Fix ARIA accessibility issues after any data change
|
||||
setTimeout(() => {
|
||||
this.fixAriaAccessibility()
|
||||
}, 50)
|
||||
})
|
||||
|
||||
// Force immediate render to apply primary key styling
|
||||
// Without this, styling would wait for ~2 seconds to be applied
|
||||
// With this, styling appears in ~300ms total (workaround needed for HOT version 16 and above)
|
||||
setTimeout(() => {
|
||||
if (this.hotInstance && !this.hotInstance.isDestroyed) {
|
||||
this.hotInstance.render()
|
||||
}
|
||||
}, 10)
|
||||
// DARK MODE: Apply to all headers
|
||||
th.classList.add(globals.handsontable.darkTableHeaderClass)
|
||||
} catch (error) {
|
||||
// SAFETY NET: Ensure basic styling is always applied
|
||||
th.classList.add(globals.handsontable.darkTableHeaderClass)
|
||||
}
|
||||
}, 50) // Optimized Angular component readiness delay
|
||||
}, 200) // Optimized main setup delay (was 600ms)
|
||||
}
|
||||
})
|
||||
|
||||
// Add hooks for accessibility fixes
|
||||
// Hooks are attached once per instance to avoid accumulating duplicate listeners
|
||||
if (!this.hooksAttached) {
|
||||
this.hotInstance.addHook('afterRender', () => {
|
||||
// Fix ARIA accessibility issues after each render
|
||||
this.fixAriaAccessibility()
|
||||
})
|
||||
|
||||
this.hotInstance.addHook('afterChange', () => {
|
||||
// Fix ARIA accessibility issues after any data change
|
||||
setTimeout(() => {
|
||||
this.fixAriaAccessibility()
|
||||
}, 50)
|
||||
})
|
||||
|
||||
this.hooksAttached = true
|
||||
}
|
||||
|
||||
// Force immediate render to apply primary key styling
|
||||
// Without this, styling would wait for ~2 seconds to be applied
|
||||
// (workaround needed for HOT version 16 and above)
|
||||
this.hotInstance.render()
|
||||
}
|
||||
|
||||
async loadWithParameters() {
|
||||
|
||||
@@ -14,7 +14,8 @@ import { ViyaApis } from './models/viya-apis.models'
|
||||
host: {
|
||||
class: 'content-container'
|
||||
},
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class ViyaApiExplorerComponent implements OnInit {
|
||||
collections: ViyaApis = {}
|
||||
|
||||
@@ -62,7 +62,8 @@ enum Tabs {
|
||||
selector: 'app-xlmap',
|
||||
templateUrl: './xlmap.component.html',
|
||||
styleUrls: ['./xlmap.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
standalone: false
|
||||
})
|
||||
export class XLMapComponent implements AfterContentInit, AfterViewInit, OnInit {
|
||||
@HostBinding('class.content-container') contentContainerClass = true
|
||||
|
||||
@@ -10,12 +10,6 @@
|
||||
"outDir": "./app",
|
||||
"types": []
|
||||
},
|
||||
"files": [
|
||||
"src/polyfills.ts",
|
||||
"src/main.ts",
|
||||
"src/app/app.d.ts"
|
||||
],
|
||||
"include": [
|
||||
"src/**/*.d.ts"
|
||||
]
|
||||
}
|
||||
"files": ["src/polyfills.ts", "src/main.ts", "src/app/app.d.ts"],
|
||||
"include": ["src/**/*.d.ts"]
|
||||
}
|
||||
|
||||
@@ -1,55 +1,37 @@
|
||||
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||
{
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"baseUrl": "",
|
||||
"outDir": "dist",
|
||||
"downlevelIteration": true,
|
||||
"declaration": false,
|
||||
"experimentalDecorators": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
"lib": [
|
||||
"ES2022",
|
||||
"dom"
|
||||
],
|
||||
"skipLibCheck": true,
|
||||
"module": "ES2022",
|
||||
"importHelpers": true,
|
||||
"moduleResolution": "node",
|
||||
"sourceMap": true,
|
||||
"resolveJsonModule": true,
|
||||
"target": "ES2022",
|
||||
"paths": {
|
||||
"crypto": [
|
||||
"./node_modules/crypto-browserify"
|
||||
],
|
||||
"stream": [
|
||||
"./node_modules/stream-browserify"
|
||||
],
|
||||
"assert": [
|
||||
"./node_modules/assert"
|
||||
],
|
||||
"http": [
|
||||
"./node_modules/stream-http"
|
||||
],
|
||||
"https": [
|
||||
"./node_modules/https-browserify"
|
||||
],
|
||||
"os": [
|
||||
"./node_modules/os-browserify"
|
||||
]
|
||||
},
|
||||
"useDefineForClassFields": false
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"baseUrl": "",
|
||||
"outDir": "dist",
|
||||
"downlevelIteration": true,
|
||||
"declaration": false,
|
||||
"experimentalDecorators": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
"lib": ["ES2022", "dom"],
|
||||
"skipLibCheck": true,
|
||||
"module": "ES2022",
|
||||
"importHelpers": true,
|
||||
"moduleResolution": "node",
|
||||
"sourceMap": true,
|
||||
"resolveJsonModule": true,
|
||||
"target": "ES2022",
|
||||
"paths": {
|
||||
"crypto": ["./node_modules/crypto-browserify"],
|
||||
"stream": ["./node_modules/stream-browserify"],
|
||||
"assert": ["./node_modules/assert"],
|
||||
"http": ["./node_modules/stream-http"],
|
||||
"https": ["./node_modules/https-browserify"],
|
||||
"os": ["./node_modules/os-browserify"]
|
||||
},
|
||||
"angularCompilerOptions": {
|
||||
"enableI18nLegacyMessageIdFormat": false,
|
||||
"strictInjectionParameters": true,
|
||||
"strictInputAccessModifiers": true,
|
||||
"strictTemplates": true,
|
||||
},
|
||||
"exclude": [
|
||||
"cypress/**/*.ts",
|
||||
"cypress.config.ts"
|
||||
]
|
||||
"useDefineForClassFields": false
|
||||
},
|
||||
"angularCompilerOptions": {
|
||||
"enableI18nLegacyMessageIdFormat": false,
|
||||
"strictInjectionParameters": true,
|
||||
"strictInputAccessModifiers": true,
|
||||
"strictTemplates": true
|
||||
},
|
||||
"exclude": ["cypress/**/*.ts", "cypress.config.ts"]
|
||||
}
|
||||
|
||||
@@ -3,15 +3,8 @@
|
||||
"extends": "./tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "./out-tsc/spec",
|
||||
"types": [
|
||||
"jasmine"
|
||||
]
|
||||
"types": ["jasmine"]
|
||||
},
|
||||
"files": [
|
||||
"src/polyfills.ts"
|
||||
],
|
||||
"include": [
|
||||
"src/**/*.spec.ts",
|
||||
"src/**/*.d.ts"
|
||||
]
|
||||
"files": ["src/polyfills.ts"],
|
||||
"include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
|
||||
}
|
||||
|
||||
559
package-lock.json
generated
559
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dcfrontend",
|
||||
"version": "7.2.3",
|
||||
"version": "7.2.8",
|
||||
"description": "Data Controller",
|
||||
"devDependencies": {
|
||||
"@saithodev/semantic-release-gitea": "^2.1.0",
|
||||
@@ -10,7 +10,7 @@
|
||||
"@semantic-release/npm": "11.0.0",
|
||||
"@semantic-release/release-notes-generator": "^11.0.4",
|
||||
"commit-and-tag-version": "^11.2.2",
|
||||
"prettier": "3.6.2"
|
||||
"prettier": "^3.7.4"
|
||||
},
|
||||
"scripts": {
|
||||
"install": "cd client && npm i && cd ../sas && npm i",
|
||||
@@ -32,6 +32,5 @@
|
||||
"//": [
|
||||
"Readme",
|
||||
"We must set private: true so that semantic-release/npm plugin will update the package.json version but not try to release it as NPM package"
|
||||
],
|
||||
"dependencies": {}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"fromjs": [
|
||||
{
|
||||
"ADMIN": "DCDEFAULT",
|
||||
"DCPATH": "/tmp/mihajlo/dcserverfrs"
|
||||
"DCPATH": "/tmp/dcdata"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
531
sas/package-lock.json
generated
531
sas/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -28,7 +28,7 @@
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@sasjs/cli": "^4.12.11",
|
||||
"@sasjs/core": "^4.59.5"
|
||||
"@sasjs/cli": "^4.13.1",
|
||||
"@sasjs/core": "^4.60.0"
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user