chore(release): 6.10.1 [skip ci]

## [6.10.1](https://git.datacontroller.io/dc/dc/compare/v6.10.0...v6.10.1) (2024-06-07)

### Bug Fixes

* adding 60 more colours to crayons table. Closes [#112](#112) ([3521579](3521579dea))
* terms and conditions colours, editor on smaller screens show only icons ([e32d44b](e32d44b1bc))

.gitea/workflows/build.yaml

@@ -1,5 +1,5 @@
 name: Build
-run-name: Running Lint Check
+run-name: Running Lint Check and Licence checker on Pull Request
 on: [pull_request]
 
 jobs:
@@ -8,9 +8,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20.14.0
+
+      - name: Install Google Chrome
+        run: |
+          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
+          echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list
+          apt-get update
+          apt-get install -y google-chrome-stable xvfb
 
       - name: Write .npmrc file
         run: echo "$NPMRC" > client/.npmrc
@@ -18,4 +25,27 @@ jobs:
         env:
           NPMRC: ${{ secrets.NPMRC}}
 
-      - run: npm run lint:check
+      - name: Lint check
+        run: npm run lint:check
+
+      - name: Install dependencies
+        run: |
+          cd client
+          # Decrypt and Install sheet
+          echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
+          npm ci
+
+      - name: Licence checker
+        run: |
+          cd client
+          npm run license-checker
+
+      - name: Angular Tests
+        run: |
+          cd client
+          npm run test:headless
+
+      - name: Production Build
+        run: |
+          cd client
+          npm run build

.gitea/workflows/development-test.yaml

@@ -1,223 +0,0 @@
-name: Test
-run-name: Building and testing development branch
-on:
-  push:
-    branches:
-      - development
-
-jobs:
-  Build-production-and-ng-test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Write .npmrc file
-        run: |
-         touch client/.npmrc
-         echo '${{ secrets.NPMRC}}' > client/.npmrc
-
-      - name: Install Chrome for Angular tests
-        run: apt-get update
-        run: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-        run: apt install -y ./google-chrome*.deb;
-        run: export CHROME_BIN=/usr/bin/google-chrome
-
-      - name: Write cypress credentials
-        run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
-        shell: bash
-        env:
-          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Check audit
-      # Audit should fail and stop the CI if critical vulnerability found
-        run: |
-          npm audit --audit-level=critical
-          cd ./sas
-          npm audit --audit-level=critical
-          cd ./client
-          npm audit --audit-level=critical
-
-      - name: Angular Tests
-        run: |
-          npm test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
-
-      - name: Angular Production Build
-        run: |
-          npm run postinstall
-          npm run build
-
-  Build-and-test-development:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Write .npmrc file
-        run: |
-         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
-      - run: apt install -y ./google-chrome*.deb;
-      - run: export CHROME_BIN=/usr/bin/google-chrome
-      - run: apt-get update -y
-      - run: apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
-      - run: apt -y install jq
-
-      - name: Write cypress credentials
-        run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
-        shell: bash
-        env:
-          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      # Install pm2 and prepare SASJS server
-      - run: npm i -g pm2
-      - run: curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
-      - run: unzip linux.zip
-      - run: touch .env
-      - run: echo RUN_TIMES=js >> .env
-      - run: echo NODE_PATH=node >> .env
-      - run: echo CORS=enable >> .env
-      - run: echo WHITELIST=http://localhost:4200 >> .env
-      - run: cat .env
-      - run: pm2 start api-linux --wait-ready
-
-      - name: Deploy mocked services
-        run: |
-          cd ./sas/mocks/sasjs
-          npm install -g @sasjs/cli
-          npm install -g replace-in-files-cli
-          sasjs cbd -t server-ci
-          # sasjs request services/admin/makedata -t server-ci -d ./deploy/makeData4GL.json -c ./deploy/requestConfig.json -o ./output.json
-
-      - name: Install ZIP
-        run: |
-          apt-get update
-          apt-get install zip
-
-      - name: Prepare and run frontend and cypress
-        run: |
-          cd ./client
-          mv ./cypress.env.example.json ./cypress.env.json
-          replace-in-files --regex='"username".*' --replacement='"username":"'${{ secrets.CYPRESS_USERNAME_SASJS }}'",' ./cypress.env.json
-          replace-in-files --regex='"password".*' --replacement='"password":"'${{ secrets.CYPRESS_PWD_SASJS }}'" ' ./cypress.env.json
-          cat ./cypress.env.json
-          npm run postinstall
-          # Prepare index.html to SASJS local
-          replace-in-files --regex='serverUrl=".*?"' --replacement='serverUrl="http://localhost:5000"' ./src/index.html
-          replace-in-files --regex='appLoc=".*?"' --replacement='appLoc="/Public/app/devtest"' ./src/index.html
-          replace-in-files --regex='serverType=".*?"' --replacement='serverType="SASJS"' ./src/index.html
-          replace-in-files --regex='"hosturl".*' --replacement='hosturl:"http://localhost:4200",' ./cypress.config.ts
-          cat ./cypress.config.ts
-          # Start frontend and run cypress
-          npm start & npx wait-on http://localhost:4200 && npx cypress run --browser chrome --spec "cypress/e2e/liveness.cy.ts,cypress/e2e/editor.cy.ts,cypress/e2e/excel.cy.ts,cypress/e2e/filtering.cy.ts,cypress/e2e/licensing.cy.ts"
-
-      - name: Zip Cypress videos
-        if: always()
-        run: |
-          zip -r cypress-videos ./client/cypress/videos
-
-      - name: Cypress videos artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: cypress-videos.zip
-          path: cypress-videos.zip
-
-  Build-and-test-development-latest-adapter:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Write .npmrc file
-        run: echo "$NPMRC" > client/.npmrc
-        shell: bash
-        env:
-          NPMRC: ${{ secrets.NPMRC}}
-
-      - run: apt-get update
-      - run: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-      - run: apt install -y ./google-chrome*.deb;
-      - run: export CHROME_BIN=/usr/bin/google-chrome
-      - run: apt-get update -y
-      - run: apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
-      - run: apt -y install jq
-
-      - name: Write cypress credentials
-        run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
-        shell: bash
-        env:
-          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
-
-      - name: Install dependencies
-        run: npm ci
-
-      # Install pm2 and prepare SASJS server
-      - run: npm i -g pm2
-      - run: curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
-      - run: unzip linux.zip
-      - run: touch .env
-      - run: echo RUN_TIMES=js >> .env
-      - run: echo NODE_PATH=node >> .env
-      - run: echo CORS=enable >> .env
-      - run: echo WHITELIST=http://localhost:4200 >> .env
-      - run: cat .env
-      - run: pm2 start api-linux --wait-ready
-
-      - name: Deploy mocked services
-        run: |
-          cd ./sas/mocks/sasjs
-          npm install -g @sasjs/cli
-          npm install -g replace-in-files-cli
-          sasjs cbd -t server-ci
-
-      - name: Install ZIP
-        run: |
-          apt-get update
-          apt-get install zip
-
-      - name: Prepare and run frontend and cypress
-        run: |
-          cd ./client
-          mv ./cypress.env.example.json ./cypress.env.json
-          replace-in-files --regex='"username".*' --replacement='"username":"'${{ secrets.CYPRESS_USERNAME_SASJS }}'",' ./cypress.env.json
-          replace-in-files --regex='"password".*' --replacement='"password":"'${{ secrets.CYPRESS_PWD_SASJS }}'" ' ./cypress.env.json
-          cat ./cypress.env.json
-          npm run postinstall
-          npm install @sasjs/adapter@latest
-          # Prepare index.html to SASJS local
-          replace-in-files --regex='serverUrl=".*?"' --replacement='serverUrl="http://localhost:5000"' ./src/index.html
-          replace-in-files --regex='appLoc=".*?"' --replacement='appLoc="/Public/app/devtest"' ./src/index.html
-          replace-in-files --regex='serverType=".*?"' --replacement='serverType="SASJS"' ./src/index.html
-          replace-in-files --regex='"hosturl".*' --replacement='hosturl:"http://localhost:4200",' ./cypress.config.ts
-          cat ./cypress.config.ts
-          # Start frontend and run cypress
-          npm start & npx wait-on http://localhost:4200 && npx cypress run --browser chrome --spec "cypress/e2e/liveness.cy.ts,cypress/e2e/editor.cy.ts,cypress/e2e/excel.cy.ts,cypress/e2e/filtering.cy.ts,cypress/e2e/licensing.cy.ts"
-
-      - name: Zip Cypress videos
-        if: always()
-        run: |
-          zip -r cypress-videos ./client/cypress/videos
-
-      - name: Cypress videos artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: cypress-videos-latest-adapter.zip
-          path: cypress-videos.zip

.gitea/workflows/release.yaml

@@ -1,18 +1,164 @@
 name: Release
-run-name: Releasing DC
+run-name: Testing and Releasing DC
 on:
   push:
     branches:
       - main
 
 jobs:
-  release:
+  Build-production-and-ng-test:
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20.14.0
+
+      - name: Write .npmrc file
+        run: |
+         touch client/.npmrc
+         echo '${{ secrets.NPMRC}}' > client/.npmrc
+
+      - name: Install Chrome for Angular tests
+        run: |
+          apt-get update
+          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+          apt install -y ./google-chrome*.deb;
+          export CHROME_BIN=/usr/bin/google-chrome
+
+      - name: Write cypress credentials
+        run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
+        shell: bash
+        env:
+          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
+
+      - name: Install dependencies
+        run: |
+          cd client
+          # Decrypt and Install sheet
+          echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
+          npm ci
+
+      - name: Check audit
+      # Audit should fail and stop the CI if critical vulnerability found
+        run: |
+          npm audit --audit-level=critical --omit=dev
+          cd ./sas
+          npm audit --audit-level=critical --omit=dev
+          cd ../client
+          npm audit --audit-level=critical --omit=dev
+
+      - name: Angular Tests
+        run: |
+          cd client
+          npm run test:headless
+
+      - name: Angular Production Build
+        run: |
+          cd client
+          npm run postinstall
+          npm run build
+
+  Build-and-test-development:
+    runs-on: ubuntu-latest
+    needs: Build-production-and-ng-test
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.14.0
+
+      - name: Write .npmrc file
+        run: |
+         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
+      - run: apt install -y ./google-chrome*.deb;
+      - run: export CHROME_BIN=/usr/bin/google-chrome
+      - run: apt-get update -y
+      - run: apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
+      - run: apt -y install jq
+
+      - name: Write cypress credentials
+        run: echo "$CYPRESS_CREDS" > ./client/cypress.env.json
+        shell: bash
+        env:
+          CYPRESS_CREDS: ${{ secrets.CYPRESS_CREDS }}
+
+      - name: Install dependencies
+        run: |
+          cd client
+          # Decrypt and Install sheet
+          echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
+          npm ci
+
+      # Install pm2 and prepare SASJS server
+      - run: npm i -g pm2
+      - run: curl -L https://github.com/sasjs/server/releases/latest/download/linux.zip > linux.zip
+      - run: unzip linux.zip
+      - run: touch .env
+      - run: echo RUN_TIMES=js >> .env
+      - run: echo NODE_PATH=node >> .env
+      - run: echo CORS=enable >> .env
+      - run: echo WHITELIST=http://localhost:4200 >> .env
+      - run: cat .env
+      - run: pm2 start api-linux --wait-ready
+
+      - name: Deploy mocked services
+        run: |
+          cd ./sas/mocks/sasjs
+          npm install -g @sasjs/cli
+          npm install -g replace-in-files-cli
+          sasjs cbd -t server-ci
+          # sasjs request services/admin/makedata -t server-ci -d ./deploy/makeData4GL.json -c ./deploy/requestConfig.json -o ./output.json
+
+      - name: Install ZIP
+        run: |
+          apt-get update
+          apt-get install zip
+
+      - name: Prepare and run frontend and cypress
+        run: |
+          cd ./client
+          mv ./cypress.env.example.json ./cypress.env.json
+          replace-in-files --regex='"username".*' --replacement='"username":"'${{ secrets.CYPRESS_USERNAME_SASJS }}'",' ./cypress.env.json
+          replace-in-files --regex='"password".*' --replacement='"password":"'${{ secrets.CYPRESS_PWD_SASJS }}'" ' ./cypress.env.json
+          cat ./cypress.env.json
+          npm run postinstall
+          # Prepare index.html to SASJS local
+          replace-in-files --regex='serverUrl=".*?"' --replacement='serverUrl="http://localhost:5000"' ./src/index.html
+          replace-in-files --regex='appLoc=".*?"' --replacement='appLoc="/Public/app/devtest"' ./src/index.html
+          replace-in-files --regex='serverType=".*?"' --replacement='serverType="SASJS"' ./src/index.html
+          replace-in-files --regex='"hosturl".*' --replacement='hosturl:"http://localhost:4200",' ./cypress.config.ts
+          cat ./cypress.config.ts
+          # Start frontend and run cypress
+          npm start & npx wait-on http://localhost:4200 && npx cypress run --browser chrome --spec "cypress/e2e/liveness.cy.ts,cypress/e2e/editor.cy.ts,cypress/e2e/excel.cy.ts,cypress/e2e/filtering.cy.ts,cypress/e2e/licensing.cy.ts"
+
+      - name: Zip Cypress videos
+        if: always()
+        run: |
+          zip -r cypress-videos ./client/cypress/videos
+
+      - name: Add cypress videos artifacts
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: cypress-videos.zip
+          path: cypress-videos.zip
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [Build-production-and-ng-test, Build-and-test-development]
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.14.0
 
       - name: Write .npmrc file
         run: |
@@ -30,25 +176,39 @@ jobs:
           npm i -g @sasjs/cli
           # jq is used to parse the release JSON
           apt-get install jq -y
+          # doxygen is used for the SASJS docs
+          apt-get update
+          apt-get install doxygen -y
+
+      - name: Frontend Preliminary Build
+        description: We want to prevent creating empty release if frontend fails
+        run: |
+          cd client
+          # Decrypt and Install sheet
+          echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
+          npm ci
+          npm i webpack
+          npm run build
 
       - name: Create Empty Release (assets are posted later)
         run: |
           npm i
           npm i -g semantic-release
+          # We do a semantic-release DRY RUN to make the job fail if there are no changes to release
+          GITEA_TOKEN=${{ secrets.RELEASE_TOKEN }} GITEA_URL=https://git.datacontroller.io semantic-release --dry-run | grep -q "There are no relevant changes, so no new version is released." && exit 1
           GITEA_TOKEN=${{ secrets.RELEASE_TOKEN }} GITEA_URL=https://git.datacontroller.io semantic-release
 
       - name: Frontend Build
         description: Must be created AFTER the release as the version (git tag) is used in the interface
         run: |
           cd client
-          npm ci
           npm run build
 
       - name: Build SAS9 EBI Release
         description: Compile SAS 9 services, remove tests & create deployment program
         run: |
           cd sas
-          npm ci
+          npm i
           sasjs c -t sas9
           rm -rf sasjsbuild/tests
           sasjs b -t sas9
@@ -85,6 +245,7 @@ jobs:
           rm sasjsbuild/services/clickme.html
           sasjs b -t viya
           cp sasjsbuild/viya.sas ./viya.sas
+          cp sasjsbuild/viya.json ./viya.json
 
       - name: Zip Frontend (including viya.json for full viya deploy)
         run: |
@@ -97,15 +258,21 @@ jobs:
         run: |
           cd client
           npm -g install cloudron-surfer
-          npm run typedoc
+          npm run compodoc:build
-          surfer put --token ${{ secrets.TSDOC_TOKEN }} --server tsdoc.datacontroller.io ../tsdoc /
+          surfer put --token ${{ secrets.TSDOC_TOKEN }} --server webdoc.datacontroller.io documentation/* /
+
+      - name: Release code.datacontroller.io
+        run: |
+          cd sas
+          sasjs doc
+          surfer put --token ${{ secrets.CODE_DATACONTROLLER_IO }} --server code.datacontroller.io sasjsbuild/sasdocs/* /
 
       - name: Upload assets to release
         run: |
           RELEASE_ID=`curl -k 'https://git.datacontroller.io/api/v1/repos/dc/dc/releases/latest?access_token=${{ secrets.RELEASE_TOKEN }}' | jq -r '.id'`
           RELEASE_BODY=`curl -k 'https://git.datacontroller.io/api/v1/repos/dc/dc/releases/latest?access_token=${{ secrets.RELEASE_TOKEN }}' | jq -r '.body'`
           # Update body
-          curl --data '{"draft": true,"body":"'"$RELEASE_BODY\n\nFor installation instructions, please visit https://docs.datacontroller.io/"'"}' -X PATCH --header 'Content-Type: application/json' -k https://git.datacontroller.io/api/v1/repos/dc/dc/releases/$RELEASE_ID?access_token=${{ secrets.RELEASE_TOKEN }}
+          curl --data '{"draft": false,"body":"'"$RELEASE_BODY\n\nFor installation instructions, please visit https://docs.datacontroller.io/"'"}' -X PATCH --header 'Content-Type: application/json' -k https://git.datacontroller.io/api/v1/repos/dc/dc/releases/$RELEASE_ID?access_token=${{ secrets.RELEASE_TOKEN }}
           # Upload assets
           URL="https://git.datacontroller.io/api/v1/repos/dc/dc/releases/$RELEASE_ID/assets?access_token=${{ secrets.RELEASE_TOKEN }}"
           curl -k $URL -F attachment=@frontend.zip
@@ -114,3 +281,4 @@ jobs:
           curl -k $URL -F attachment=@sas/sasjs_server.json.zip
           curl -k $URL -F attachment=@sas/sas9.sas
           curl -k $URL -F attachment=@sas/viya.sas
+          curl -k $URL -F attachment=@sas/viya.json

.gitignore

@@ -10,6 +10,10 @@ client/src/environments/version.ts
 client/cypress/screenshots
 client/cypress/results
 client/cypress/videos
+client/documentation
+client/**/sheet-crypto.tgz
+client/.nx
+client/libraries/sheet-crypto.tgz
 cypress.env.json
 sasjsbuild
 sasjsresults

.npmrc

@@ -1 +1 @@
-legacy-peer-deps=false
+legacy-peer-deps=true

.releaserc

@@ -6,11 +6,13 @@
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
+    "@semantic-release/npm",
     [
       "@semantic-release/git",
       {
         "assets": [
-          "CHANGELOG.md"
+          "CHANGELOG.md",
+          "package.json"
         ]
       }
     ],

.vscode/settings.json

@@ -1,18 +1,19 @@
 {
-    "cSpell.words": [
+  "cSpell.words": [
-        "SYSERRORTEXT",
+    "Licence",
-        "SYSWARNINGTEXT"
+    "SYSERRORTEXT",
-    ],
+    "SYSWARNINGTEXT",
-    "editor.rulers": [
+    "xlmaprules",
-        80
+    "xlmaps"
-    ],
+  ],
-    "files.trimTrailingWhitespace": true,
+  "editor.rulers": [80],
-    "[markdown]": {
+  "files.trimTrailingWhitespace": true,
-        "files.trimTrailingWhitespace": false
+  "[markdown]": {
-    },
+    "files.trimTrailingWhitespace": false
-    "workbench.colorCustomizations": {
+  },
-        "titleBar.activeForeground": "#ebe8e8",
+  "workbench.colorCustomizations": {
-        "titleBar.activeBackground": "#95ff0053",
+    "titleBar.activeForeground": "#ebe8e8",
-    },
+    "titleBar.activeBackground": "#95ff0053"
-    "terminal.integrated.wordSeparators": " ()[]{}',\"`─‘’"
+  },
-}
+  "terminal.integrated.wordSeparators": " ()[]{}',\"`─‘’"
+}

CHANGELOG.md

@@ -1,14 +1,280 @@
-# [6.2.0](https://git.datacontroller.io/dc/dc/compare/v6.1.0...v6.2.0) (2023-08-24)
+## [6.10.1](https://git.datacontroller.io/dc/dc/compare/v6.10.0...v6.10.1) (2024-06-07)
 
 
 ### Bug Fixes
 
-* re-enabling full REPLACE uploads ([08e39c4](https://git.datacontroller.io/dc/dc/commit/08e39c4fca570406f9aad3d907cb04596421d074))
+* adding 60 more colours to crayons table. Closes [#112](https://git.datacontroller.io/dc/dc/issues/112) ([3521579](https://git.datacontroller.io/dc/dc/commit/3521579dead089eebf62455686be3aee88bde687))
+* terms and conditions colours, editor on smaller screens show only icons ([e32d44b](https://git.datacontroller.io/dc/dc/commit/e32d44b1bcdfeea43d19b21ec0ddf4af1ce3992a))
+
+# [6.10.0](https://git.datacontroller.io/dc/dc/compare/v6.9.0...v6.10.0) (2024-06-07)
 
 
 ### Features
 
-* support for European numeric formats ([e48e47b](https://git.datacontroller.io/dc/dc/commit/e48e47bc635452b59e107b235e597c26e748875e))
+* updated handsontable to v14 ([2f8d0b7](https://git.datacontroller.io/dc/dc/commit/2f8d0b764a957ad8c11cd1088fad5e0670aa1731))
+
+# [6.9.0](https://git.datacontroller.io/dc/dc/compare/v6.8.5...v6.9.0) (2024-05-31)
+
+
+### Bug Fixes
+
+* added colors.scss file, start of a refactor ([110ad9a](https://git.datacontroller.io/dc/dc/commit/110ad9a6e9ed39bd5591ae65c2d0005ba47ca758))
+* added stealFocus directive ([9a79f37](https://git.datacontroller.io/dc/dc/commit/9a79f37bf143a1e05df7407358e2687c678e3e68))
+
+
+### Features
+
+* added app settings service to handle theme persistance, fix: optimised dark mode contrast ([35844e0](https://git.datacontroller.io/dc/dc/commit/35844e0cf1a639553269f2ab0f8666a56ab5cc47))
+* **dark mode:** clarity optimizations ([afa7e38](https://git.datacontroller.io/dc/dc/commit/afa7e380aa3bdabd380c038522b9d73d9a8a3b91))
+* **dark mode:** lineage and metadata ([27907ed](https://git.datacontroller.io/dc/dc/commit/27907ed00fe81f4c752ffe99d2fb029d5c884f0a))
+* **dark mode:** refactoring clarity to enable dark mode, added toggle button ([5564aea](https://git.datacontroller.io/dc/dc/commit/5564aea9c25f8e81ff85afa8352325b9992e4043))
+* **dark mode:** removing custom css rules so clarity can handle dark/light modes. Handsontable css for dark mode ([2c0afd0](https://git.datacontroller.io/dc/dc/commit/2c0afd02684cdf3bda374731b0359665e00ed95d))
+
+## [6.8.5](https://git.datacontroller.io/dc/dc/compare/v6.8.4...v6.8.5) (2024-05-23)
+
+
+### Bug Fixes
+
+* bitemporal load issue [#105](https://git.datacontroller.io/dc/dc/issues/105) ([967698e](https://git.datacontroller.io/dc/dc/commit/967698e4ce1e0abcbc6f0aff8a4be6c512dee93c))
+
+## [6.8.4](https://git.datacontroller.io/dc/dc/compare/v6.8.3...v6.8.4) (2024-05-22)
+
+
+### Bug Fixes
+
+* new approach to fixing [#105](https://git.datacontroller.io/dc/dc/issues/105) ([c11bd9a](https://git.datacontroller.io/dc/dc/commit/c11bd9a2c55e49f10451962cb2e222c21206bce5))
+
+## [6.8.3](https://git.datacontroller.io/dc/dc/compare/v6.8.2...v6.8.3) (2024-05-09)
+
+
+### Bug Fixes
+
+* updating core to increase filename length, closes [#103](https://git.datacontroller.io/dc/dc/issues/103) ([ee58fd5](https://git.datacontroller.io/dc/dc/commit/ee58fd5b4bc0dd3e3f232c4f26bb85b2e7fe2b54))
+
+## [6.8.2](https://git.datacontroller.io/dc/dc/compare/v6.8.1...v6.8.2) (2024-05-03)
+
+
+### Bug Fixes
+
+* dc_request_logs option feature ([93758ef](https://git.datacontroller.io/dc/dc/commit/93758efb275966c181f1ee8b6c752010909a0282))
+* release process ([c0dc919](https://git.datacontroller.io/dc/dc/commit/c0dc9191e3b95ea6f7e5021fc0bdbcab0af4cc64))
+
+## [6.8.1](https://git.datacontroller.io/dc/dc/compare/v6.8.0...v6.8.1) (2024-05-02)
+
+
+### Bug Fixes
+
+* hide approve button when table revertable ([ec0f539](https://git.datacontroller.io/dc/dc/commit/ec0f539a337b176c83a661ff520a6892d47efa02))
+
+# [6.8.0](https://git.datacontroller.io/dc/dc/compare/v6.7.0...v6.8.0) (2024-05-02)
+
+
+### Bug Fixes
+
+* ci sheet lib, submit message auto focus ([c5e4650](https://git.datacontroller.io/dc/dc/commit/c5e46503272f3f3d9cd83ac04225babf79d4de44))
+* **clarity:** new version style issues ([8c7de5a](https://git.datacontroller.io/dc/dc/commit/8c7de5aad7e7e32a64769696af9b93eb9a6225d3))
+* cypress tests ([3dd85cc](https://git.datacontroller.io/dc/dc/commit/3dd85cc60bd5ac99bc930b6b9c89a8e707e4d51d))
+* ensuring that only restorable versions are restorable ([a402856](https://git.datacontroller.io/dc/dc/commit/a4028562ce91b32ff971ab9821328b97cd23f381))
+* ensuring version history only includes loaded versions ([51ebd25](https://git.datacontroller.io/dc/dc/commit/51ebd25aa362aa8e66c83b29b2c64aa0f206f5bd))
+* final testing on restore feature ([297a84d](https://git.datacontroller.io/dc/dc/commit/297a84d3a4ebb47bef7f3ca9758978d727afed8d))
+* issue with multiple adds/deletes, [#84](https://git.datacontroller.io/dc/dc/issues/84) ([904ca30](https://git.datacontroller.io/dc/dc/commit/904ca30f918da085fa05dae066367b512933d1a9))
+* load_ref var ([aaad9f7](https://git.datacontroller.io/dc/dc/commit/aaad9f7207115599a006980fff099d59738dd2cd))
+* removing alerts dummy data, closes [#93](https://git.datacontroller.io/dc/dc/issues/93) ([eba21e9](https://git.datacontroller.io/dc/dc/commit/eba21e96b4fa34e63b4477281f47d9a01d621f2e))
+* restore table version improvement ([549f357](https://git.datacontroller.io/dc/dc/commit/549f35766ba7b5bbe55694845e85bfefc4193375))
+* **sas:** viewer versions fix ([c6595c1](https://git.datacontroller.io/dc/dc/commit/c6595c1f618803d9202cba1a1fe76986449cf2e2))
+* stage and approve buttons renaming ([ef81e33](https://git.datacontroller.io/dc/dc/commit/ef81e33f704d0b4f99405d96498e1d29ac817982))
+* supporting SCD2 data reversions ([fa8396f](https://git.datacontroller.io/dc/dc/commit/fa8396f0394cbddb6dbacb4b355de078fad49980))
+* table info modal, versions - column names ([801c8c6](https://git.datacontroller.io/dc/dc/commit/801c8c6a9fb95388a06a6c6284fec4dc25bb77c5))
+* **updates:** angular, clarity, resolved legacy-peer-deps ([c60dd65](https://git.datacontroller.io/dc/dc/commit/c60dd65a1637333f11a0c39ef697c7292a6ede07))
+
+
+### Features
+
+* backend to show in getchangeinfo whether a user is allowed to restore ([8769841](https://git.datacontroller.io/dc/dc/commit/8769841f08694f672ef7ae1a17beacd0dbedda52))
+* list versions of target tables (backend) ([f8a14d4](https://git.datacontroller.io/dc/dc/commit/f8a14d4bdef055b99930491d1f6fabe55a50a497))
+* restore ([604c2e7](https://git.datacontroller.io/dc/dc/commit/604c2e70bdeeeb1aa5bb18b94f525ebd049397fa))
+* SAS services & tests for RESTORE, [#84](https://git.datacontroller.io/dc/dc/issues/84) ([9ad7ae4](https://git.datacontroller.io/dc/dc/commit/9ad7ae47b5e793ce68ab21c9eeb8dee6cb85e496))
+* staging page, restore buttons ([02a8a1c](https://git.datacontroller.io/dc/dc/commit/02a8a1c5654350cafc53b749cceb686fc6848c33))
+* table metadata modal, versions tab (and link) ([b27fea5](https://git.datacontroller.io/dc/dc/commit/b27fea5b91e33b4673a3a991aedae558e366ca29))
+* **versions:** getting list of versions (plus test) ([8003da9](https://git.datacontroller.io/dc/dc/commit/8003da94e615463ed3ddfd60b0cbf2e58615eab1))
+
+# [6.7.0](https://git.datacontroller.io/dc/dc/compare/v6.6.4...v6.7.0) (2024-04-01)
+
+
+### Features
+
+* numeric values in hot dropdown aligned right ([9635626](https://git.datacontroller.io/dc/dc/commit/963562621ddf0e8d24a29a8481c5e6da1b040708))
+
+## [6.6.4](https://git.datacontroller.io/dc/dc/compare/v6.6.3...v6.6.4) (2024-04-01)
+
+
+### Bug Fixes
+
+* ordering SOFTSELECT numerically in dropdown ([f522038](https://git.datacontroller.io/dc/dc/commit/f522038b8ddb1da14b8adbf8346d0a4539a94cc8)), closes [#85](https://git.datacontroller.io/dc/dc/issues/85)
+* reverting col ([fbbcf90](https://git.datacontroller.io/dc/dc/commit/fbbcf90956bf538b032b0107c07b8576d20353b9))
+* typo ([31d4e5c](https://git.datacontroller.io/dc/dc/commit/31d4e5c727f790d428fb2ea8da60dca929561805))
+
+## [6.6.3](https://git.datacontroller.io/dc/dc/compare/v6.6.2...v6.6.3) (2024-02-26)
+
+
+### Bug Fixes
+
+* allow empty clause value when NE or CONTAINS ([432450a](https://git.datacontroller.io/dc/dc/commit/432450a15b51a269821ba1d430854f5d1dd04703))
+
+## [6.6.2](https://git.datacontroller.io/dc/dc/compare/v6.6.1...v6.6.2) (2024-02-22)
+
+
+### Bug Fixes
+
+* excel with commas getting wrapped in quotes ([3860134](https://git.datacontroller.io/dc/dc/commit/38601346a529cfe3787bb286a639e0293c365020))
+
+## [6.6.1](https://git.datacontroller.io/dc/dc/compare/v6.6.0...v6.6.1) (2024-02-19)
+
+
+### Bug Fixes
+
+* **client:** bumped @sasjs/adapter with fixed redirected login ([eb1c09d](https://git.datacontroller.io/dc/dc/commit/eb1c09d7909ba07faf763da261545dc1efaec1b3))
+
+# [6.6.0](https://git.datacontroller.io/dc/dc/compare/v6.5.2...v6.6.0) (2024-02-12)
+
+
+### Bug Fixes
+
+* adjust the col numbers in extracted data ([cff5989](https://git.datacontroller.io/dc/dc/commit/cff598955930d2581349e5c6e8b2dd3f9ac96b4c))
+
+
+### Features
+
+* extra table metadata for [#75](https://git.datacontroller.io/dc/dc/issues/75) ([837821f](https://git.datacontroller.io/dc/dc/commit/837821fd01477d340524dfdaf8dd3d3758cf3095))
+* show dsnote on hover title ([6565834](https://git.datacontroller.io/dc/dc/commit/6565834ad4089ecf2de39967e6ed6f217ee4a0a5))
+
+## [6.5.2](https://git.datacontroller.io/dc/dc/compare/v6.5.1...v6.5.2) (2024-02-06)
+
+
+### Bug Fixes
+
+* ordering mpe_selectbox data by the data values after selectbox_order ([2b54034](https://git.datacontroller.io/dc/dc/commit/2b5403497317632a4be8a00f21455c036f1e6461))
+
+## [6.5.1](https://git.datacontroller.io/dc/dc/compare/v6.5.0...v6.5.1) (2024-02-02)
+
+
+### Bug Fixes
+
+* ensuring submitter email can be pulled from mpe_emails ([eac0104](https://git.datacontroller.io/dc/dc/commit/eac0104d7aebaf98ff1d1c504c1ce3b25d4a0ce8))
+
+# [6.5.0](https://git.datacontroller.io/dc/dc/compare/v6.4.0...v6.5.0) (2024-01-26)
+
+
+### Features
+
+* filtering by reference to Variables as well as Values ([6eb1aa8](https://git.datacontroller.io/dc/dc/commit/6eb1aa85d29294d63e6af377e622fbed7fd1fab8))
+
+# [6.4.0](https://git.datacontroller.io/dc/dc/compare/v6.3.1...v6.4.0) (2024-01-24)
+
+
+### Bug Fixes
+
+* add dcLib to globals ([5d93346](https://git.datacontroller.io/dc/dc/commit/5d93346b52eda27c2829770e96686a713296d373))
+* add service to get xlmap rules and fixed interface name ([9ffa30a](https://git.datacontroller.io/dc/dc/commit/9ffa30ab747f5b62acbd452431a5e6e440afcb80))
+* increasing length of mpe_excel_map cols to ([2d4d068](https://git.datacontroller.io/dc/dc/commit/2d4d068413dcdac98581f08939e74bde65b73428))
+* providing info on mapids to FE ([fd94945](https://git.datacontroller.io/dc/dc/commit/fd94945466c1a797ddc89815258a65624a9cb0cf))
+* removing tables from EDIT menu that are in xlmaps ([9550ae4](https://git.datacontroller.io/dc/dc/commit/9550ae4d1154a0272f8a2427ac9d2afdfd699c96))
+* removing XLMAP_TARGETLIBDS from mpe_xlmaps_rules table ([93702c6](https://git.datacontroller.io/dc/dc/commit/93702c63dc280cdba1e46f0fd8fe0deaec879611))
+* renaming TABLE macvar to LOAD_REF in postdata.sas ([01915a2](https://git.datacontroller.io/dc/dc/commit/01915a2db9a4dfb94e4e8213e2c32181da36d349))
+* reverting xlmap in getdata change ([2d6e747](https://git.datacontroller.io/dc/dc/commit/2d6e747db9b84e9fb0dfcf9102a2f7dd2cb51891))
+* update edit tab to load ([516e5a2](https://git.datacontroller.io/dc/dc/commit/516e5a206216f79ab1dce9f4eab0d31115743160))
+
+
+### Features
+
+* adding ability to define the target table for excel maps ([c86fba9](https://git.datacontroller.io/dc/dc/commit/c86fba9dc75ddc6033132f469ad1c31b9131b12e))
+* adding ismap attribute to getdata response (and fixing test) ([2702bb3](https://git.datacontroller.io/dc/dc/commit/2702bb3c84c45903def1aa2b8cc20a6dd080281b))
+* Complex Excel Uploads ([cf19381](https://git.datacontroller.io/dc/dc/commit/cf193810606f287b8d6f864c4eb64d43c5ab5f3c)), closes [#69](https://git.datacontroller.io/dc/dc/issues/69)
+* Create Tables / Files dropdown under load tab ([b473b19](https://git.datacontroller.io/dc/dc/commit/b473b198a61f468dff74cd8e64692e7847084a80))
+* display list of maps in sidebar ([5aec024](https://git.datacontroller.io/dc/dc/commit/5aec0242429942f8a989b5fb79f8d3865e9de01a))
+* implemented the logic for xlmap component ([50696bb](https://git.datacontroller.io/dc/dc/commit/50696bb926dd00472db65a008771a4b6352871be))
+* model changes for [#69](https://git.datacontroller.io/dc/dc/issues/69) ([271543a](https://git.datacontroller.io/dc/dc/commit/271543a446a2116718f99f0540e3cd911f9f5fe7))
+* new getxlmaps service to return rules for a particular xlmap_id ([56264ec](https://git.datacontroller.io/dc/dc/commit/56264ecc6908bf6c8e3e666dfeba7068d6195df8))
+* validating the excel map after stage (adding load-ref) ([a485c3b](https://git.datacontroller.io/dc/dc/commit/a485c3b78724a36f7bacb264fb02140cc62d6512))
+
+## [6.3.1](https://git.datacontroller.io/dc/dc/compare/v6.3.0...v6.3.1) (2024-01-01)
+
+
+### Bug Fixes
+
+* enabling excel uploads to tables with retained keys, also adding more validation to MPE_TABLES updates ([3efccc4](https://git.datacontroller.io/dc/dc/commit/3efccc4cf3752763d049836724f2491c287f65db))
+
+# [6.3.0](https://git.datacontroller.io/dc/dc/compare/v6.2.8...v6.3.0) (2023-12-04)
+
+
+### Features
+
+* viewer row handle ([dadac4f](https://git.datacontroller.io/dc/dc/commit/dadac4f13f85b5446198b6340cad28844defc94d))
+
+## [6.2.8](https://git.datacontroller.io/dc/dc/compare/v6.2.7...v6.2.8) (2023-12-04)
+
+
+### Bug Fixes
+
+* bumping sasjs/core to fix mp_loadformat issue ([a1d308e](https://git.datacontroller.io/dc/dc/commit/a1d308ea078786b27bf7ec940d018fc657d4c398))
+* new logic for -fc suffix.  Closes [#63](https://git.datacontroller.io/dc/dc/issues/63) ([5579db0](https://git.datacontroller.io/dc/dc/commit/5579db0eafc668b1bc310099b7cc3062e0598fc4))
+
+## [6.2.7](https://git.datacontroller.io/dc/dc/compare/v6.2.6...v6.2.7) (2023-11-09)
+
+
+### Bug Fixes
+
+* **audit:** updated crypto-js (hashing rows in dynamic cell validation) ([a7aa42a](https://git.datacontroller.io/dc/dc/commit/a7aa42a59b71597399924b8d2d06010c806321f3))
+* missing dependency and avoiding label length limit issue ([91f128c](https://git.datacontroller.io/dc/dc/commit/91f128c2fead1e4f72267d689e67f49ec9a2ab35))
+
+## [6.2.6](https://git.datacontroller.io/dc/dc/compare/v6.2.5...v6.2.6) (2023-10-18)
+
+
+### Bug Fixes
+
+* bumping core to address mm_assigndirectlib issue ([c27cdab](https://git.datacontroller.io/dc/dc/commit/c27cdab3fccbde814a29424d0344173a73ea816c))
+
+## [6.2.5](https://git.datacontroller.io/dc/dc/compare/v6.2.4...v6.2.5) (2023-10-17)
+
+
+### Bug Fixes
+
+* enabling AUTHDOMAIN in MM_ASSIGNDIRECTLIB ([008b45a](https://git.datacontroller.io/dc/dc/commit/008b45ad175ec0e6026f5ef3bc210470226e328f))
+
+## [6.2.4](https://git.datacontroller.io/dc/dc/compare/v6.2.3...v6.2.4) (2023-10-16)
+
+
+### Bug Fixes
+
+* Enable display of metadata-only tables. Closes [#56](https://git.datacontroller.io/dc/dc/issues/56) ([f3e82b4](https://git.datacontroller.io/dc/dc/commit/f3e82b4ee2a9c1c851f812ac60e9eaf05f91a0f9))
+
+## [6.2.3](https://git.datacontroller.io/dc/dc/compare/v6.2.2...v6.2.3) (2023-10-12)
+
+
+### Bug Fixes
+
+* bumping core library to avoid non-ascii char in mp_validatecols.sas. [#50](https://git.datacontroller.io/dc/dc/issues/50) ([11b06f6](https://git.datacontroller.io/dc/dc/commit/11b06f6416300b6d70b1570c415d5a5c004976db))
+* removing copyright symbol from mpe_alerts macro. [#50](https://git.datacontroller.io/dc/dc/issues/50) ([adb7eb7](https://git.datacontroller.io/dc/dc/commit/adb7eb77550c68a2dab15a6ff358129820e9b612))
+
+## [6.2.2](https://git.datacontroller.io/dc/dc/compare/v6.2.1...v6.2.2) (2023-10-09)
+
+
+### Bug Fixes
+
+* updated SheetJS (crypto) to the latest ([8bd0dd2](https://git.datacontroller.io/dc/dc/commit/8bd0dd22c258911672303869e4df893a98e93575))
+
+## [6.2.1](https://git.datacontroller.io/dc/dc/compare/v6.2.0...v6.2.1) (2023-10-09)
+
+
+### Bug Fixes
+
+* approve, history and submit pages grouped in review module ([e056ece](https://git.datacontroller.io/dc/dc/commit/e056ece2234ef6aab050f6a5b1f8de633b163d91))
+* closes [#39](https://git.datacontroller.io/dc/dc/issues/39) upcase issue in MPE_SECURITY ([a00d31c](https://git.datacontroller.io/dc/dc/commit/a00d31caf3c5634cd61a4700fb175e76856edbb6))
+* handsontable v13 ([6f482ec](https://git.datacontroller.io/dc/dc/commit/6f482ec6d909907a304ef9975262889e2370035f))
+* latest adapter ([5e30dc0](https://git.datacontroller.io/dc/dc/commit/5e30dc0f892fab2af41f4ea56e30f27ec3b3912e))
+* sasjs/cli and sasjs/core updated to the latest ([8571e01](https://git.datacontroller.io/dc/dc/commit/8571e01e44a8cb6df9d150d271c34bb75bffdf31))
+* updating editors/stagedata to address issues in particular viya configurations as described in issue [#33](https://git.datacontroller.io/dc/dc/issues/33) ([94ab949](https://git.datacontroller.io/dc/dc/commit/94ab949df8c75072525751a2156b7a32c2e641dc))
+* updating logic for REPLACE loadtype ([1f2ce55](https://git.datacontroller.io/dc/dc/commit/1f2ce55f249f4af56f0cacdec47e69246cd47431))
 
 # [6.2.0](https://git.datacontroller.io/dc/dc/compare/v6.1.0...v6.2.0) (2023-08-24)
 
@@ -17,7 +283,6 @@
 
 * re-enabling full REPLACE uploads ([08e39c4](https://git.datacontroller.io/dc/dc/commit/08e39c4fca570406f9aad3d907cb04596421d074))
 
-
 ### Features
 
 * support for European numeric formats ([e48e47b](https://git.datacontroller.io/dc/dc/commit/e48e47bc635452b59e107b235e597c26e748875e))

CONTRIBUTING.md

@@ -53,6 +53,17 @@ npm run lint:fix
 Typedoc is used for generating typescript documentation based on the code.
 That part is automated and beign done as a part of CI job.
 
+# Release
+Release is automated as a part of CI job. Workflow file: `.gitea/workflows/release.yaml`.  
+It will run automatically when branch merged to the `main` branch.  
+IMPORTANT!  
+If release job fails, after it has been created empty release and a tag, we must not re-run the relase job until we removed the newly create GIT TAG and RELEASE.  
+To remove the git tag run:  
+```
+git push -d origin vX.X.X
+```
+To remove the release, you need to do it with repo administration over at [https://git.datacontroller.io/dc/dc](https://git.datacontroller.io/dc/dc)
+
 # Troubleshooting
 
 ## Makedata service "could not create directory" error

README.md

@@ -27,4 +27,6 @@ For more information:
 
 * Main site:  https://datacontroller.io
 * Docs:  https://docs.datacontroller.io
-* Code: https://code.datacontroller.io
+* Code: https://code.datacontroller.io
+
+For support, contact support@4gl.io or reach out on [Matrix](https://matrix.to/#/#dc:4gl.io)!

client/angular.json

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

client/cypress.config.ts

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

client/cypress/e2e/editor.cy.ts

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

client/cypress/e2e/excel.cy.ts

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

client/cypress/e2e/filtering.cy.ts

@@ -159,20 +159,21 @@ context('filtering tests: ', function () {
     })
   })
 
-  it('7 | filter bestnum field BETWEEN', (done) => {
+  // TODO: fix
-    openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
+  // it('7 | filter bestnum field BETWEEN', (done) => {
+  //   openTableFromTree(libraryToOpenIncludes, 'mpe_x_test')
 
-    openFilterPopup(() => {
+  //   openFilterPopup(() => {
-      setFilterWithValue('SOME_BESTNUM', '0-10', 'between', () => {
+  //     setFilterWithValue('SOME_BESTNUM', '0-10', 'between', () => {
-        checkInfoBarIncludes(
+  //       checkInfoBarIncludes(
-          `AND,AND,0,SOME_BESTNUM,BETWEEN,0 AND 10`,
+  //         `AND,AND,0,SOME_BESTNUM,BETWEEN,0 AND 10`,
-          (includes: boolean) => {
+  //         (includes: boolean) => {
-            if (includes) done()
+  //           if (includes) done()
-          }
+  //         }
-        )
+  //       )
-      })
+  //     })
-    })
+  //   })
-  })
+  // })
 
   this.afterEach(() => {
     // cy.visit(`${hostUrl}/SASLogon/logout`)

client/cypress/e2e/licensing.cy.ts

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

client/cypress/e2e/liveness.cy.ts

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

client/cypress/integration/editor.tests.ts

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

client/cypress/integration/excel.tests.ts

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

client/cypress/integration/licensing.tests.ts

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

client/cypress/integration/liveness.tests.ts

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

client/karma.conf.js

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

client/licenseChecker.js

@@ -10,7 +10,7 @@ const check = (cwd) => {
         onlyAllow:
           'AFLv2.1;Apache 2.0;Apache-2.0;Apache*;Artistic-2.0;0BSD;BSD*;BSD-2-Clause;BSD-3-Clause;CC0-1.0;CC-BY-3.0;CC-BY-4.0;ISC;MIT;MPL-2.0;ODC-By-1.0;Python-2.0;Unlicense;',
         excludePackages:
-          '@cds/city@1.1.0;@handsontable/angular@13.0.0;handsontable@13.0.0;hyperformula@2.5.0;jackspeak@2.2.0;path-scurry@1.7.0'
+          '@cds/city@1.1.0;@handsontable/angular@14.3.0;handsontable@14.3.0;hyperformula@2.7.0;jackspeak@2.2.0;path-scurry@1.7.0'
       },
       (error, json) => {
         if (error) {

client/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "dc-client",
+  "name": "data_controller-client",
-  "description": "dc-client",
+  "description": "DataController Client",
   "angular-cli": {},
   "scripts": {
     "start": "node --max_old_space_size=4096 node_modules/@angular/cli/bin/ng serve",
@@ -18,8 +18,8 @@
     "deploy_sasjs": "rsync -avhe ssh ./dist/* --delete root@${npm_config_account}.4gl.io:/var/www/html/dc/dev",
     "viyabuild": "cd build; ./viyabuild.sh",
     "lint": "cd .. && npm run lint",
-    "test": "ng test",
+    "test": "npx ng test",
-    "test:headless": "ng test --browsers ChromeHeadless",
+    "test:headless": "npx ng test --no-watch --no-progress --browsers ChromeHeadlessCI",
     "watch": "ng test watch=true",
     "pree2e": "webdriver-manager update",
     "e2e": "protractor protractor.config.js",
@@ -29,36 +29,39 @@
     "cy:run": "cypress run",
     "audit:prod": "npm audit --omit=dev",
     "sasdocs": "sasjs doc && ./sasjs/utils/deploydocs.sh",
-    "typedoc": "typedoc --options typedoc.json && cd ../tsdoc"
+    "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'"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^16.1.2",
+    "@angular/animations": "^17.3.3",
-    "@angular/cdk": "^15.2.0",
+    "@angular/cdk": "^17.3.3",
-    "@angular/common": "^16.1.2",
+    "@angular/common": "^17.3.3",
-    "@angular/compiler": "^16.1.2",
+    "@angular/compiler": "^17.3.3",
-    "@angular/core": "^16.1.2",
+    "@angular/core": "^17.3.3",
-    "@angular/forms": "^16.1.2",
+    "@angular/forms": "^17.3.3",
-    "@angular/platform-browser": "^16.1.2",
+    "@angular/platform-browser": "^17.3.3",
-    "@angular/platform-browser-dynamic": "^16.1.2",
+    "@angular/platform-browser-dynamic": "^17.3.3",
-    "@angular/router": "^16.1.2",
+    "@angular/router": "^17.3.3",
-    "@cds/core": "^6.4.2",
+    "@cds/core": "^6.10.0",
-    "@clr/angular": "^13.17.0",
+    "@clr/angular": "^17.0.1",
     "@clr/icons": "^13.0.2",
-    "@clr/ui": "^13.17.0",
+    "@clr/ui": "^17.0.1",
-    "@handsontable/angular": "^13.0.0",
+    "@handsontable/angular": "^14.3.0",
-    "@sasjs/adapter": "4.3.6",
+    "@sasjs/adapter": "4.10.2",
-    "@sasjs/utils": "^3.3.0",
+    "@sasjs/utils": "^3.4.0",
-    "@sheet/crypto": "1.20211122.1",
+    "@sheet/crypto": "file:libraries/sheet-crypto.tgz",
     "@types/d3-graphviz": "^2.6.7",
+    "@sheet/crypto": "file:libraries/sheet-crypto.tgz",
     "@types/text-encoding": "0.0.35",
     "base64-arraybuffer": "^0.2.0",
     "buffer": "^5.4.3",
     "crypto-browserify": "3.12.0",
-    "crypto-js": "^3.3.0",
+    "crypto-js": "^4.2.0",
     "d3-graphviz": "^5.0.2",
     "fs-extra": "^7.0.1",
-    "handsontable": "^13.0.0",
+    "handsontable": "^14.3.0",
     "https-browserify": "1.0.0",
     "hyperformula": "^2.5.0",
     "iconv-lite": "^0.5.0",
@@ -76,22 +79,26 @@
     "stream-http": "3.2.0",
     "text-encoding": "^0.7.0",
     "tslib": "^2.3.0",
-    "zone.js": "~0.13.0"
+    "vm": "^0.1.0",
+    "webpack": "^5.91.0",
+    "zone.js": "~0.14.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^16.1.0",
+    "@angular-devkit/build-angular": "^17.3.3",
-    "@angular-eslint/builder": "16.0.3",
+    "@angular-eslint/builder": "17.3.0",
-    "@angular-eslint/eslint-plugin": "16.0.3",
+    "@angular-eslint/eslint-plugin": "17.3.0",
-    "@angular-eslint/eslint-plugin-template": "16.0.3",
+    "@angular-eslint/eslint-plugin-template": "17.3.0",
-    "@angular-eslint/schematics": "16.0.3",
+    "@angular-eslint/schematics": "17.3.0",
-    "@angular-eslint/template-parser": "16.0.3",
+    "@angular-eslint/template-parser": "17.3.0",
-    "@angular/cli": "^16.1.0",
+    "@angular/cli": "^17.3.3",
-    "@angular/compiler-cli": "^16.1.2",
+    "@angular/compiler-cli": "^17.3.3",
+    "@babel/plugin-proposal-private-methods": "^7.18.6",
+    "@compodoc/compodoc": "^1.1.21",
     "@cypress/webpack-preprocessor": "^5.17.1",
     "@types/core-js": "^2.5.5",
-    "@types/crypto-js": "^4.0.1",
+    "@types/crypto-js": "^4.2.1",
     "@types/es6-shim": "^0.31.39",
-    "@types/jasmine": "~3.6.0",
+    "@types/jasmine": "~5.1.4",
     "@types/lodash-es": "^4.17.3",
     "@types/marked": "^4.3.0",
     "@types/node": "12.20.50",
@@ -105,12 +112,12 @@
     "es6-shim": "^0.35.5",
     "eslint": "^8.33.0",
     "git-describe": "^4.0.4",
-    "jasmine-core": "~3.6.0",
+    "jasmine-core": "~5.1.2",
-    "karma": "~6.3.0",
+    "karma": "~6.4.3",
-    "karma-chrome-launcher": "~3.1.0",
+    "karma-chrome-launcher": "~3.2.0",
-    "karma-coverage": "~2.1.0",
+    "karma-coverage": "~2.2.1",
-    "karma-jasmine": "~4.0.0",
+    "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~1.7.0",
+    "karma-jasmine-html-reporter": "~2.1.0",
     "license-checker": "25.0.1",
     "lodash-es": "^4.17.21",
     "mochawesome": "^7.1.3",
@@ -119,9 +126,8 @@
     "rimraf": "3.0.2",
     "ts-loader": "^9.2.8",
     "ts-node": "^3.3.0",
-    "typedoc": "^0.23.24",
+    "typescript": "~5.4.4",
-    "typescript": "~4.9.4",
     "wait-on": "^6.0.1",
     "watch": "^1.0.2"
   }
-}
+}

client/src/app/_globals.ts

@@ -1,5 +1,8 @@
 import { QueryClause } from './models/TableData'
 
+/**
+ * Filtering cache info, to be reused when filtering modal is re-open
+ */
 interface FilterCache {
   cols: any[]
   vals: any[]
@@ -10,12 +13,18 @@ interface FilterCache {
   query: QueryClause[]
 }
 
+/**
+ * Filtering cache info in the open viewboxes, to be reused when filtering modal is re-open
+ */
 interface ViewboxCache {
   [key: number]: {
     filter: FilterCache
   }
 }
 
+/**
+ * Initial values when no cached values stored
+ */
 export const initFilter: { filter: FilterCache } = {
   filter: {
     cols: <any[]>[],
@@ -28,8 +37,23 @@ export const initFilter: { filter: FilterCache } = {
   }
 }
 
+export interface XLMapListItem {
+  id: string
+  description: string
+  targetDS: string
+}
+
+/**
+ * Cached filtering values across whole app (editor, viewer, viewboxes)
+ * Cached lineage libraries, tables
+ * Cached metadata tree
+ * Cached usernav tree
+ * Cached viyaApi collections, search and selected endpoint
+ */
 export const globals: {
   rootParam: string
+  dcLib: string
+  xlmaps: XLMapListItem[]
   editor: any
   viewer: any
   viewboxes: ViewboxCache
@@ -41,11 +65,13 @@ export const globals: {
   [key: string]: any
 } = {
   rootParam: <string>'',
+  dcLib: '',
+  xlmaps: [],
   editor: {
     startupSet: <boolean>false,
     treeNodeLibraries: <any[] | null>[],
     libsAndTables: <any[]>[],
-    libraries: <String[] | undefined>[],
+    libraries: <string[] | undefined>[],
     library: <string>'',
     table: <string>'',
     filter: <FilterCache>{

client/src/app/actions/actions.component.html

@@ -1,40 +0,0 @@
-<div class="content-area">
-  <div class="card">
-    <div class="card-header d-flex flex-column justify-content-center">
-      <h3 class="text-center">
-        You succesfully edited table
-        <span class="color-blue font-weight-700">{{ libds }}</span>
-      </h3>
-      <p class="text-center">
-        <b>Please choose from the following actions</b>
-      </p>
-      <div class="row d-flex justify-content-center mt-20">
-        <button
-          class="btn btn-sm btn-outline text-center"
-          (click)="submittedTableScreen()"
-        >
-          Go to submitted table screen
-        </button>
-        <button
-          class="btn btn-sm btn-outline text-center"
-          (click)="viewerTableScreen()"
-        >
-          Go to base table screen
-        </button>
-        <button
-          id="approvalBtn"
-          class="btn btn-sm btn-success-outline text-center"
-          (click)="approveTableScreen()"
-        >
-          Go to approvals screen
-        </button>
-        <button
-          class="btn btn-sm btn-info-outline text-center"
-          (click)="goBack()"
-        >
-          Go back to editor
-        </button>
-      </div>
-    </div>
-  </div>
-</div>

client/src/app/actions/actions.component.ts

@@ -1,50 +0,0 @@
-import { AfterViewInit, Component, OnInit } from '@angular/core'
-import { ActivatedRoute, Router } from '@angular/router'
-
-@Component({
-  selector: 'app-actions',
-  templateUrl: './actions.component.html',
-  styleUrls: ['./actions.component.scss'],
-  host: {
-    class: 'content-container'
-  }
-})
-export class ActionsComponent implements OnInit, AfterViewInit {
-  public dsid: any
-  public libds: string | undefined
-
-  constructor(
-    private route: ActivatedRoute,
-    private router: Router
-  ) {}
-
-  public submittedTableScreen() {
-    this.router.navigateByUrl('/stage/' + this.dsid)
-  }
-
-  public approveTableScreen() {
-    this.router.navigateByUrl('/approve/approveDet/' + this.dsid)
-  }
-
-  public viewerTableScreen() {
-    this.router.navigateByUrl('/view/data/' + this.libds)
-  }
-
-  public goBack() {
-    this.router.navigateByUrl('/editor/' + this.libds)
-  }
-
-  async ngOnInit() {
-    this.dsid = this.route.snapshot.params['dsid']
-    this.libds = this.route.snapshot.params['libds']
-  }
-
-  ngAfterViewInit() {
-    setTimeout(() => {
-      let approvalBtn: any = window.document.getElementById('approvalBtn')
-      if (!!approvalBtn) {
-        approvalBtn.focus()
-      }
-    }, 700)
-  }
-}

client/src/app/app.component.html

@@ -12,7 +12,7 @@
         <div class="alert-items">
           <div class="alert-item static">
             <div class="alert-icon-wrapper">
-              <clr-icon class="mt-2" shape="warning-standard"></clr-icon>
+              <cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
             </div>
             <div class="alert-text">
               Data Controller (FREE Tier) - to upgrade contact
@@ -30,7 +30,7 @@
         <div class="alert-items">
           <div class="alert-item static">
             <div class="alert-icon-wrapper">
-              <clr-icon class="mt-2" shape="warning-standard"></clr-icon>
+              <cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
             </div>
             <div class="alert-text">
               Data Controller (FREE Tier) - Problem with licence
@@ -55,7 +55,7 @@
       <div class="alert-items">
         <div class="alert-item static">
           <div class="alert-icon-wrapper">
-            <clr-icon class="mt-2" shape="warning-standard"></clr-icon>
+            <cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
           </div>
 
           <div class="alert-text">
@@ -85,7 +85,7 @@
       <div class="alert-items">
         <div class="alert-item static">
           <div class="alert-icon-wrapper">
-            <clr-icon class="mt-2" shape="warning-standard"></clr-icon>
+            <cds-icon class="alert-icon" shape="warning-standard"></cds-icon>
           </div>
 
           <div class="alert-text">
@@ -168,8 +168,8 @@
           </button>
           <clr-dropdown-menu *clrIfOpen clrPosition="bottom-left">
             <a [routerLink]="['/view']" clrDropdownItem>VIEW</a>
-            <a [routerLink]="['/home']" clrDropdownItem>EDIT</a>
+            <a [routerLink]="['/home']" clrDropdownItem>LOAD</a>
-            <a [routerLink]="['/submitted']" clrDropdownItem>REVIEW</a>
+            <a [routerLink]="['/review/submitted']" clrDropdownItem>REVIEW</a>
           </clr-dropdown-menu>
         </clr-dropdown>
       </div>
@@ -189,10 +189,10 @@
             router.url.includes('edit-record') ||
             router.url.includes('home')
           "
-          >EDIT</a
+          >LOAD</a
         >
         <a
-          [routerLink]="['/submitted']"
+          [routerLink]="['/review/submitted']"
           [class.active]="
             router.url.includes('submitted') ||
             router.url.includes('approve') ||
@@ -204,14 +204,7 @@
       </div>
     </ng-container>
 
-    <div class="header-actions">
+    <app-header-actions></app-header-actions>
-      <div class="nav-text">
-        <app-loading-indicator></app-loading-indicator>
-      </div>
-      <div class="dropdown">
-        <app-user-nav-dropdown></app-user-nav-dropdown>
-      </div>
-    </div>
   </header>
   <nav
     *ngIf="
@@ -224,7 +217,7 @@
     <ul class="nav">
       <li class="nav-item">
         <a
-          [routerLink]="['/submitted']"
+          [routerLink]="['/review/submitted']"
           class="nav-link nav-text"
           routerLinkActive="active"
           >SUBMIT</a
@@ -232,15 +225,16 @@
       </li>
       <li class="nav-item">
         <a
-          [routerLink]="['/approve']"
+          [routerLink]="['/review/approve']"
           class="nav-link nav-text"
+          [class.active]="router.url.includes('approve')"
           routerLinkActive="active"
           >APPROVE</a
         >
       </li>
       <li class="nav-item">
         <a
-          [routerLink]="['/history']"
+          [routerLink]="['/review/history']"
           class="nav-link nav-text"
           routerLinkActive="active"
           >HISTORY</a

client/src/app/app.component.scss

@@ -1,3 +1,5 @@
+@import '../colors.scss';
+
 // Copyright (c) 2016 VMware, Inc. All Rights Reserved.
 // This software is released under MIT license.
 // The full license information can be found in LICENSE in the root directory of this project.
@@ -6,7 +8,7 @@ app-requests-modal {
 }
 
 header.app-header {
-  background: #314351 !important;
+  background: $headerBackground !important;
   color: #fff;
 }
 
@@ -42,7 +44,7 @@ header.app-header {
     align-items: center;
     padding: 30px;
     z-index: 110;
-    background: #314351;
+    background: $headerBackground;
 
     .expired-notice {
       color: #e0e0e0;
@@ -91,33 +93,12 @@ header {
     }
   }
 
-  .nav
+  .nav-link:hover {
-  .nav-link {
-    color: #fafafa;
-    opacity: .9;
-    line-height: 1.45rem;
-  }
-
-  .nav .nav-link:hover {
-      box-shadow: inset 0 -3px 0 transparent;
-      transition: box-shadow .2s ease-in;
-  }
-
-  .nav
-    .nav-link:hover {
       color: #fafafa;
-      opacity: 1;
   }
 
-  .nav .nav-link.active {
+  .nav-link.active {
-     background: #61717D;
+    background: #61717D;
-      opacity: 1;
-      box-shadow: inset 0 -3px transparent;
-      // padding: 0 1rem 0 1rem;
-  }
-
-  .nav .nav-item {
-      margin-right: 1rem;
   }
 }
 
@@ -127,15 +108,6 @@ header {
   font-size: 12px;
 }
 
-.btn.btn-success {
-  border-color: #62a420;
-  background-color: #16a57a!important;
-  color: #fff;
-}
-.btn.btn-success:hover {
-  background-color: #2add39;
-  color: #fff;
-}
 
 .toggle-switch input[type=checkbox]:checked+label:before {
   border-color: #61717D;
@@ -163,59 +135,44 @@ header {
   color: #fff;
 }
 
-@media screen and (max-width: 768px) {
-  .navBarResp {
-    display: flex;
-    justify-content: flex-start;
-    background: #495A67;
-    color: #fff;
-  }
-
-  .main-container .sub-nav.clr-nav-level-1 .nav .nav-link, .main-container .sub-nav.clr-nav-level-2 .nav .nav-link, .main-container .subnav.clr-nav-level-1 .nav .nav-link, .main-container .subnav.clr-nav-level-2 .nav .nav-link {
-      padding: 0 .5rem 0 1rem;
-      width: 100%;
-      max-width: 100%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      border-radius: .125rem 0 0 .125rem;
-      color: #95c84b;
-  }
-
-
-
-  .card-block, .card-footer {
-    padding: 10px 0px 0px 0px;
-  }
-
-  .main-container[_ngcontent-c0] .content-container[_ngcontent-c0] .content-area[_ngcontent-c0] {
-    padding: 0rem 0rem 0rem 0rem;
-  }
-
-}
 ::ng-deep {
   .htInvalid {
-  background: black!important;
+    background: black!important;
-}
+  }
 
   @media screen and (max-width:480px) {
-  h2 {
+    h2 {
-    font-size: .7rem!important;
+      font-size: .7rem!important;
-
+    }
+    h3 {
+      font-size: .7rem;
+    }
   }
-  h3 {
-    font-size: .7rem;
-  }
-}
 
   .nav-link {
     padding: 0rem 1rem 0rem 1rem;
   }
 
-  .btn-primary .btn, .btn.btn-primary {
+  body[cds-theme="light"] {
-    border-color: #314351;
+    .btn-primary .btn, .btn.btn-primary {
-    background-color: #314351;
+      border-color: $headerBackground;
-    color: #fff;
+      background-color: $headerBackground;
+      color: #fff;
+    }
   }
+
+  body[cds-theme="dark"] {
+    .btn-primary .btn, .btn.btn-primary {
+      border-color: #5e7382;
+      background-color: #5e7382;
+      color: #fff;
+
+      clr-icon, cds-icon {
+        color: #fff
+      }
+    }
+  }
+
   .btn {
     cursor: pointer;
     display: inline-block;
@@ -236,36 +193,32 @@ header {
     font-weight: 500;
     height: 1.5rem;
     padding: 0 .5rem;
-    border-color: #314351;
-    background-color: transparent;
-    color: #314351;
-  }
-
-  .btn.btn-outline {
-    border-color: #314351;
-    background-color: transparent;
-    color: #314351;
   }
 
   .btn.btn-outline:hover {
-    border-color: #314351;
+    border-color: $headerBackground;
     background-color: #495A67;
     color: #fff;
   }
 
-  .btn.btn-success-outline:hover {
-    background-color: #5ea71f;
-    color: #fff7f7;
-    border-color: #9a9696;
-}
-// .btn.btn-success-outline {
-//     border-color: #266900;
-//     background-color: transparent;
-//     color: #318700;
-// }
-  // .wtSpreader {
 
-  // }
+  body[cds-theme="dark"] {
+    .btn.btn-icon.btn-dimmed {
+      color: #7295ae;
+    }
+  }
+
+  body[cds-theme="light"] {
+    .btn.btn-icon.btn-dimmed {
+      color: $headerBackground;
+    }
+
+    .btn.btn-outline {
+      border-color: $headerBackground;
+      background-color: transparent;
+      color: $headerBackground;
+    }
+  }
 
   .htMobileEditorContainer .inputs textarea {
     font-size: 13pt;
@@ -298,65 +251,68 @@ header {
     width: 350px;
 }
 
-  .handsontable  {
-  background-color: #ffffff;
-  // border: 1px solid #ccc;
-  border-radius: 3px;
-  }
-  .handsontable th {
-  background-color: #fafafa;
-  }
 
   /* Left and right */
-  .ht_clone_left th {
-    border-right: 1px solid #ccc;
-    border-left: 1px solid #ccc;
-  }
 
   /* Column headers */
-  .ht_clone_top th {
+
-    border-top: 1px solid #ccc;
+  body[cds-theme="light"] {
-    border-right: 1px solid #ccc;
+    .wtBorder {
-    border-bottom: 1px solid #ccc;
+      background-color: #495A67!important;
+    }
+
+    .ht_master tr:nth-of-type(odd) > td {
+      filter: brightness(0.95);
+    }
   }
 
-  .ht_clone_top_left_corner th {
+  $darkBorderColor: #697c85;
-    border-right: 1px solid #ccc;
-  }
 
-  .ht_master tr:nth-of-type(odd) > td {
+  body[cds-theme="dark"] {
-    background-color: #f3f3f3;
+    .ht_master tr:nth-of-type(odd) > td {
-    border: 1px solid rgb(197, 197, 197);
+      filter: brightness(1.2);
-    border-bottom: 1px solid rgb(236, 235, 235);
+    }
-    // padding: 1px 1px;
-  }
 
-  .ht_master tr:nth-of-type(even) > td {
+    .ht_master:not(.emptyColumns) ~ .handsontable tbody tr th, .ht_master:not(.emptyColumns) ~ .handsontable:not(.ht_clone_top) thead tr th:first-child {
-    background-color: white;
+      background-color: #2d4048;
-    border: 1px solid rgb(197, 197, 197);
+      border-color: $darkBorderColor;
-    border-bottom: 1px solid rgb(236, 235, 235);
+    }
-    // padding: 1px 1px;
-  }
 
-  .wtBorder {
+    .handsontable td {
-    background-color: #495A67!important;
+      // border-right: 1px solid #697c85;
+      // border-bottom: 1px solid #697c85;
+      border-color: $darkBorderColor;
+    }
+
+    .handsontable tr:first-child th, .handsontable tr:first-child td {
+      border-color: $darkBorderColor;
+    }
+
+    .handsontable .handsontable.ht_clone_top .wtHider {
+      border-color: $darkBorderColor;
+    }
+
+    .handsontable .changeType {
+      background-color: #3c5662;
+      border-color: $darkBorderColor;
+    }
+
+    .handsontableInput {
+      background-color: #708b98;
+    }
   }
 
   .handsontable .handsontable.ht_clone_top .wtHider {
     padding: 0 0 0px 0!important;
     margin: 0px;
     border-bottom: 3px solid #d6d3d3;
-}
-
-  .content-container {
-    background: #F5F6FF;
   }
 
-  .card {
+  body[cds-theme="light"] {
-    box-shadow: 0 0.125rem 0 0 #d7d7d7;
+    .content-container {
-    border-radius: .0rem;
+      // background: red;
-    border: 1px solid transparent;
+      background: #F5F6FF;
-    // min-height: calc(100vh - 150px);
+    }
   }
 
   .datagrid-compact, .datagrid-history{
@@ -364,8 +320,6 @@ header {
       border-collapse: separate;
       border: 1px solid transparent;
       border-radius: .125rem;
-      background-color: #fff;
-      color: #565656;
       margin: 0;
       margin-top: 1rem;
       max-width: 100%;
@@ -387,8 +341,8 @@ header {
     }
     .datagrid-footer {
       position: absolute;
-      right: 15px;
+      right: 30px;
-      top: 2px;
+      top: 1px;
     }
     .datagrid .datagrid-head {
       background-color: #fff;
@@ -408,7 +362,6 @@ header {
     -webkit-box-direction: normal;
     -ms-flex-direction: column;
     flex-direction: column;
-    background: #f5f6ff;
     padding: .5rem 0;
     border: 1px solid #ccc;
     box-shadow: 0 1px 0.125rem hsla(0,0%,45%,.25);
@@ -423,8 +376,6 @@ header {
     border-collapse: separate;
     border: 1px solid transparent;
     border-radius: 0px;
-    background-color: #fff;
-    color: #565656;
     margin: 0;
     margin-top: 1rem;
     max-width: 100%;
@@ -435,7 +386,6 @@ header {
     font-size: .45833rem;
     font-weight: 600;
     letter-spacing: .03em;
-    background-color: #fff;
     vertical-align: bottom;
     border-bottom: 1px solid #ccc;
     text-transform: uppercase;
@@ -458,4 +408,34 @@ header {
     max-width: 400px;
     width: 100%;
   }
+}
+
+@media screen and (max-width: 768px) {
+  .navBarResp {
+    display: flex;
+    justify-content: flex-start;
+    background: #495A67;
+    color: #fff;
+  }
+
+  .main-container .sub-nav.clr-nav-level-1 .nav .nav-link, .main-container .sub-nav.clr-nav-level-2 .nav .nav-link, .main-container .subnav.clr-nav-level-1 .nav .nav-link, .main-container .subnav.clr-nav-level-2 .nav .nav-link {
+      padding: 0 .5rem 0 1rem;
+      width: 100%;
+      max-width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      border-radius: .125rem 0 0 .125rem;
+      color: #95c84b;
+  }
+
+
+
+  .card-block, .card-footer {
+    padding: 10px 0px 0px 0px;
+  }
+
+  .main-container[_ngcontent-c0] .content-container[_ngcontent-c0] .content-area[_ngcontent-c0] {
+    padding: 0rem 0rem 0rem 0rem;
+  }
+
 }

client/src/app/app.component.ts

@@ -13,6 +13,15 @@ import { InfoModal } from './models/InfoModal'
 import { DcAdapterSettings } from './models/DcAdapterSettings'
 import { AppStoreService } from './services/app-store.service'
 import { LicenceService } from './services/licence.service'
+import '@cds/core/icon/register.js'
+import {
+  ClarityIcons,
+  exclamationTriangleIcon,
+  moonIcon,
+  sunIcon
+} from '@cds/core/icon'
+
+ClarityIcons.addIcons(moonIcon, sunIcon, exclamationTriangleIcon)
 
 @Component({
   selector: 'my-app',
@@ -57,24 +66,15 @@ export class AppComponent {
     private elementRef: ElementRef
   ) {
     this.parseDcAdapterSettings()
+
+    /**
+     * Prints app info in the console such as:
+     * - Adapter versions
+     * - App version
+     * - Build timestamp
+     *
+     */
     ;(window as any).appinfo = () => {
-      const licenseKeyData = this.licenceService.getLicenseKeyData()
-
-      if (licenseKeyData) {
-        const expiry_date = moment(
-          licenseKeyData.valid_until,
-          'YYYY-MM-DD'
-        ).startOf('day')
-        const current_date = moment().startOf('day')
-        const daysToExpiry = expiry_date.diff(current_date, 'days')
-
-        licenseKeyData.valid_until += ` (${daysToExpiry} ${
-          daysToExpiry === 1 ? 'day' : 'days'
-        } remaining)`
-
-        if (isNaN(daysToExpiry)) licenseKeyData.valid_until = 'Unlimited'
-      }
-
       console.table({
         'Adapter version': VERSION.adapterVersion || 'n/a',
         'App version': (VERSION.tag || '').replace('v', ''),
@@ -87,7 +87,12 @@ export class AppComponent {
 
     this.subscribeToLicenseEvents()
 
+    /**
+     * Fetches git tag ang git hash from `version.ts` file
+     * It's placed in the user drop down.
+     */
     this.commitVer = (VERSION.tag || '').replace('v', '') + '.' + VERSION.hash
+
     router.events.subscribe((val) => {
       this.routeUrl = this.router.url
 
@@ -127,8 +132,10 @@ export class AppComponent {
     this.subscribeToAppActive()
     this.subscribeToDemoLimitModal()
 
-    /* In Viya streaming apps, content is served within an iframe.  This code
+    /**
-      makes that iframe "full screen" so it looks like a regular window. */
+     * In Viya streaming apps, content is served within an iframe.  This code
+     * makes that iframe "full screen" so it looks like a regular window.
+     */
     if (window.frameElement) {
       window.frameElement.setAttribute(
         'style',
@@ -143,6 +150,9 @@ export class AppComponent {
     }
   }
 
+  /**
+   * Parses adapter settings that are found in the <sasjs> tag inside index.html
+   */
   private parseDcAdapterSettings() {
     const sasjsElement = document.querySelector('sasjs')
 
@@ -180,9 +190,14 @@ export class AppComponent {
     this.appService.sasServiceInit()
   }
 
+  /**
+   * Opens licence page with the active licence problem
+   * Problem details are encoded in the url
+   */
   public licenceProblemDetails(url: string) {
     this.router.navigateByUrl(url)
   }
+
   /**
    * Based on string provided we return true, false or null
    * True -> Compute API
@@ -199,6 +214,12 @@ export class AppComponent {
     return value === 'true' || false
   }
 
+  /**
+   * Listens for an `demo limit` event that will show the `Feature locked modal`
+   * For exmaple when in editor upload feature is not enabled
+   * When user tries to upload the excel, editor component will trgger this event
+   * And stop the execution of file upload code.
+   */
   public subscribeToDemoLimitModal() {
     this.eventService.onDemoLimitModalShow.subscribe((featureName: string) => {
       this.demoLimitNotice = {
@@ -208,6 +229,10 @@ export class AppComponent {
     })
   }
 
+  /**
+   * Listens for licence events so banner can be displayed.
+   * App is free tier, licence will expire, is expired or is invalid
+   */
   public subscribeToLicenseEvents() {
     this.licenceService.isAppFreeTier.subscribe((isAppFreeTier: boolean) => {
       this.freeTierBanner = isAppFreeTier
@@ -227,6 +252,10 @@ export class AppComponent {
     )
   }
 
+  /**
+   * Listens for an event that will activate od deactivate full application.
+   * Based on licence key prcoessing result
+   */
   public subscribeToAppActive() {
     this.licenceService.isAppActivated.subscribe((value: any) => {
       this.appActive = value
@@ -248,31 +277,51 @@ export class AppComponent {
     })
   }
 
+  /**
+   * When startupservice request is finished with valid response, this event will
+   * make sure loading screen is gone.
+   */
   public subscribeToStartupData() {
     this.eventService.onStartupDataLoaded.subscribe(() => {
       this.startupDataLoaded = true
     })
   }
 
+  /**
+   * Opens requests modal when requested from event service
+   */
   public subscribeToRequestsModal() {
     this.eventService.onRequestsModalOpen.subscribe((value: boolean) => {
       this.requestsModal = true
     })
   }
 
+  /**
+   * Closes abort modal with matching ID (there could be multiple abort modals open)
+   */
   public closeAbortModal(abortId: number) {
     let abortIndex = this.sasjsAborts.findIndex((abort) => abort.id === abortId)
     this.sasjsAborts.splice(abortIndex, 1)
   }
 
+  /**
+   * Toggles sidebar when requested from event service
+   */
   public toggleSidebar() {
     this.eventService.toggleSidebar()
   }
 
+  /**
+   * Whether or not current route includes the route from param
+   * @param route route to check
+   */
   public isMainRoute(route: string): boolean {
     return this.router.url.includes(route)
   }
 
+  /**
+   * Opens a page for updating the licence.
+   */
   public openLicencingPage() {
     this.router.navigateByUrl('/licensing/update')
   }

client/src/app/app.module.ts

@@ -11,62 +11,29 @@ import { NotFoundComponent } from './not-found/not-found.component'
 
 import { SasStoreService } from './services/sas-store.service'
 import { SharedModule } from './shared/shared.module'
-// import { EditorComponent } from './editor/editor.component'
+
-import { ActionsComponent } from './actions/actions.component'
 import { AppSharedModule } from './app-shared.module'
-import { ApproveDetailsComponent } from './approve-details/approve-details.component'
-import { ApproveComponent } from './approve/approve.component'
-import { DeployComponent } from './deploy/deploy.component'
-import { AutomaticComponent } from './deploy/sections/automatic/automatic.component'
-import { ManualComponent } from './deploy/sections/manual/manual.component'
-import { SasjsConfiguratorComponent } from './deploy/sections/sasjs-configurator/sasjs-configurator.component'
-import { GroupComponent } from './group/group.component'
-import { HistoryComponent } from './history/history.component'
-import { LicensingComponent } from './licensing/licensing.component'
-import { LineageComponent } from './lineage/lineage.component'
-import { MetadataComponent } from './metadata/metadata.component'
 import { PipesModule } from './pipes/pipes.module'
-import { RoleComponent } from './role/role.component'
+import { ReviewRouteComponent } from './routes/review-route/review-route.component'
-import { ApproveRouteComponent } from './routes/approve-route/approve-route.component'
-import { HistoryRouteComponent } from './routes/history-route/history-route.component'
 import { LicensingGuard } from './routes/licensing.guard'
 import { UsernavRouteComponent } from './routes/usernav-route/usernav-route.component'
 import { AppService } from './services/app.service'
 import { InfoModalComponent } from './shared/abort-modal/info-modal.component'
 import { RequestsModalComponent } from './shared/requests-modal/requests-modal.component'
-import { SubmitterComponent } from './submitter/submitter.component'
-import { UserComponent } from './user/user.component'
-import { HomeModule } from './home/home.module'
-import { SystemComponent } from './system/system.component'
 import { DirectivesModule } from './directives/directives.module'
 import { ViyaApiExplorerComponent } from './viya-api-explorer/viya-api-explorer.component'
 import { NgxJsonViewerModule } from 'ngx-json-viewer'
+import { AppSettingsService } from './services/app-settings.service'
 
 @NgModule({
   declarations: [
     AppComponent,
     NotFoundComponent,
-    ApproveComponent,
+    ReviewRouteComponent,
-    ApproveDetailsComponent,
+    ReviewRouteComponent,
-    ActionsComponent,
-    HistoryComponent,
-    LineageComponent,
-    SubmitterComponent,
-    ApproveRouteComponent,
-    HistoryRouteComponent,
-    MetadataComponent,
     UsernavRouteComponent,
-    UserComponent,
-    GroupComponent,
-    RoleComponent,
     RequestsModalComponent,
-    DeployComponent,
     InfoModalComponent,
-    LicensingComponent,
-    ManualComponent,
-    AutomaticComponent,
-    SasjsConfiguratorComponent,
-    SystemComponent,
     ViyaApiExplorerComponent
   ],
   imports: [
@@ -79,12 +46,11 @@ import { NgxJsonViewerModule } from 'ngx-json-viewer'
     SharedModule,
     ClarityModule,
     AppSharedModule,
-    HomeModule,
     PipesModule,
     DirectivesModule,
     NgxJsonViewerModule
   ],
-  providers: [AppService, SasStoreService, ApproveComponent, LicensingGuard],
+  providers: [AppService, SasStoreService, LicensingGuard, AppSettingsService],
   bootstrap: [AppComponent]
 })
 export class AppModule {}

client/src/app/app.routing.ts

@@ -4,25 +4,23 @@
  * The full license information can be found in LICENSE in the root directory of this project.
  */
 import { ModuleWithProviders } from '@angular/core'
-import { Routes, RouterModule } from '@angular/router'
+import { RouterModule, Routes } from '@angular/router'
 
-import { HomeComponent } from './home/home.component'
-import { ApproveComponent } from './approve/approve.component'
-import { ApproveDetailsComponent } from './approve-details/approve-details.component'
-import { ActionsComponent } from './actions/actions.component'
-import { HistoryComponent } from './history/history.component'
 import { NotFoundComponent } from './not-found/not-found.component'
-import { SubmitterComponent } from './submitter/submitter.component'
 
-import { ApproveRouteComponent } from './routes/approve-route/approve-route.component'
+import { DeployModule } from './deploy/deploy.module'
-import { DeployComponent } from './deploy/deploy.component'
-import { LicensingComponent } from './licensing/licensing.component'
-import { LicensingGuard } from './routes/licensing.guard'
-import { StageModule } from './stage/stage.module'
 import { EditorModule } from './editor/editor.module'
+import { HomeModule } from './home/home.module'
+import { LicensingModule } from './licensing/licensing.module'
+import { ReviewModule } from './review/review.module'
+import { ReviewRouteComponent } from './routes/review-route/review-route.component'
+import { StageModule } from './stage/stage.module'
+import { SystemModule } from './system/system.module'
 import { ViewerModule } from './viewer/viewer.module'
-import { SystemComponent } from './system/system.component'
 
+/**
+ * Defining routes
+ */
 export const ROUTES: Routes = [
   { path: '', redirectTo: 'home', pathMatch: 'full' },
   {
@@ -30,23 +28,31 @@ export const ROUTES: Routes = [
     loadChildren: () => ViewerModule
   },
   {
-    path: 'approve',
+    /**
-    component: ApproveRouteComponent,
+     * Load review module (approve, history, submitted)
+     */
+    path: 'review',
+    component: ReviewRouteComponent,
     children: [
       { path: '', pathMatch: 'full', redirectTo: 'toapprove' },
-      { path: 'toapprove', component: ApproveComponent },
+      {
-      { path: 'approveDet/:tableId', component: ApproveDetailsComponent },
+        path: '',
-      { path: 'submitted', component: SubmitterComponent }
+        loadChildren: () => ReviewModule
+      }
     ]
   },
   {
-    path: 'licensing/:action',
+    path: 'licensing',
-    component: LicensingComponent,
+    loadChildren: () => LicensingModule
-    canActivate: [LicensingGuard],
-    canDeactivate: [LicensingGuard]
   },
-  { path: 'home', component: HomeComponent },
   {
+    path: 'home',
+    loadChildren: () => HomeModule
+  },
+  {
+    /**
+     * Load editor module with subroutes
+     */
     path: 'editor',
     loadChildren: () => EditorModule
   },
@@ -54,16 +60,20 @@ export const ROUTES: Routes = [
     path: 'stage',
     loadChildren: () => StageModule
   },
-  { path: 'system', component: SystemComponent },
+  {
-  { path: 'actions/:libds/:dsid', component: ActionsComponent },
+    path: 'system',
-  { path: 'history', component: HistoryComponent },
+    loadChildren: () => SystemModule
-  { path: 'submitted', component: SubmitterComponent },
+  },
-  { path: 'submitted/:tableId', component: SubmitterComponent },
+  {
-  { path: 'deploy', component: DeployComponent },
+    path: 'deploy',
-  { path: 'deploy/manualdeploy', component: DeployComponent },
+    loadChildren: () => DeployModule
+  },
   { path: '**', component: NotFoundComponent }
 ]
 
+/**
+ * Exporting routes
+ */
 export const ROUTING: ModuleWithProviders<RouterModule> = RouterModule.forRoot(
   ROUTES,
   { useHash: true }

client/src/app/deploy/deploy-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { DeployComponent } from './deploy.component'
+
+const routes: Routes = [
+  { path: '', component: DeployComponent },
+  { path: 'manualdeploy', component: DeployComponent }
+]
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DeployRoutingModule {}

client/src/app/deploy/deploy.component.ts

@@ -78,6 +78,9 @@ export class DeployComponent implements OnInit {
     this.setDeployDefaults()
   }
 
+  /**
+   * Setting default values used for deploy request
+   */
   public setDeployDefaults() {
     this.dcPath = this.dcAdapterSettings?.dcPath || ''
     this.selectedAdminGroup = this.dcAdapterSettings?.adminGroup || ''
@@ -86,6 +89,9 @@ export class DeployComponent implements OnInit {
     }
   }
 
+  /**
+   * Accepting terms of service shows next screen
+   */
   public termsAgreeChange() {
     if (!this.autodeploy) {
       this.getAdminGroups()
@@ -94,6 +100,9 @@ export class DeployComponent implements OnInit {
     this.step++
   }
 
+  /**
+   * Fetches admin groups from VIYA to be selected for a backend deploy
+   */
   public getAdminGroups() {
     fetch(
       this.sasJsConfig.serverUrl + '/identities/groups?sortBy=name&limit=5000',

client/src/app/deploy/deploy.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { DeployComponent } from './deploy.component'
+import { AutomaticComponent } from './sections/automatic/automatic.component'
+import { ManualComponent } from './sections/manual/manual.component'
+import { SasjsConfiguratorComponent } from './sections/sasjs-configurator/sasjs-configurator.component'
+import { ClarityModule } from '@clr/angular'
+import { FormsModule } from '@angular/forms'
+import { DeployRoutingModule } from './deploy-routing.module'
+
+@NgModule({
+  declarations: [
+    DeployComponent,
+    AutomaticComponent,
+    ManualComponent,
+    SasjsConfiguratorComponent
+  ],
+  imports: [CommonModule, FormsModule, ClarityModule, DeployRoutingModule]
+})
+export class DeployModule {}

client/src/app/deploy/sections/automatic/automatic.component.ts

@@ -55,6 +55,13 @@ export class AutomaticComponent implements OnInit {
 
   ngOnInit(): void {}
 
+  /**
+   * Executes sas.json file to deploy the backend
+   * Method will first try to run the `auto deploy`
+   * If that fails the rest of the code is ignored.
+   * If request is successfull, method will continue to try
+   * to create database if checkbox is toggled on
+   */
   public async executeJson() {
     this.autodeploying = true
     this.isSubmittingJson = true
@@ -99,6 +106,9 @@ export class AutomaticComponent implements OnInit {
     }
   }
 
+  /**
+   * Runs the `makedata` request sending the ADMIN and DCPATH values
+   */
   public createDatabase() {
     let data = {
       fromjs: [

client/src/app/deploy/sections/manual/manual.component.ts

@@ -52,6 +52,9 @@ export class ManualComponent implements OnInit {
 
   ngOnInit(): void {}
 
+  /**
+   * FIXME: Remove
+   */
   public async executableContext() {
     // getExecutableContexts now need AuthConfig parameter which we don't have on web
     // this.contextsLoading = true
@@ -65,10 +68,16 @@ export class ManualComponent implements OnInit {
     // this.contextsLoading = false
   }
 
+  /**
+   * Removes sas.json file attached to the input
+   */
   public clearUploadInput(event: Event) {
     this.deployService.clearUploadInput(event)
   }
 
+  /**
+   * Reads attached SAS file to be sent to sas for execution (backend deploy)
+   */
   public onSasFileChange(event: any) {
     this.preloadedFile = false
 
@@ -93,12 +102,18 @@ export class ManualComponent implements OnInit {
     fileReader.readAsText(file)
   }
 
+  /**
+   * Reads attached JSON file to be sent to sas for execution (backend deploy)
+   */
   public async onJsonFileChange(event: any) {
     let file = event.target.files[0]
 
     this.jsonFile = await this.deployService.readFile(file)
   }
 
+  /**
+   * Appending precode lines to the attached sas or json file for backend deploy
+   */
   public addPrecodeLines() {
     let headerLines = [
       `%let context=${this.selectedContext};`,
@@ -110,6 +125,9 @@ export class ManualComponent implements OnInit {
     this.linesOfCode.unshift(...headerLines)
   }
 
+  /**
+   * Downloadng file with precode included
+   */
   public downloadSasPrecodeFile() {
     let linesAsText = this.linesOfCode.join('\n')
     let filename = this.fileName.split('.')[0]
@@ -117,6 +135,9 @@ export class ManualComponent implements OnInit {
     this.downloadFile(linesAsText, filename, 'sas')
   }
 
+  /**
+   * Used for downloading log and repsonse as a file
+   */
   public downloadFile(
     content: any,
     filename: string,
@@ -125,10 +146,17 @@ export class ManualComponent implements OnInit {
     this.deployService.downloadFile(content, filename, extension)
   }
 
+  /**
+   * Saving dcpath to localstorage
+   * FIXME: maybe it'snot necessary
+   */
   public saveDcPath() {
     localStorage.setItem('deploy_dc_loc', this.dcPath)
   }
 
+  /**
+   * Send sas.json to be executed (deploying backend)
+   */
   public async executeJson() {
     this.isSubmittingJson = true
 
@@ -162,6 +190,9 @@ export class ManualComponent implements OnInit {
     this.isSubmittingJson = false
   }
 
+  /**
+   * Send sas file to be executed (deploying backend)
+   */
   public async executeSAS() {
     this.executingScript = true
     this.jobLog = ''
@@ -194,6 +225,10 @@ export class ManualComponent implements OnInit {
     }
   }
 
+  /**
+   * Running makedata service
+   * @param newTab open and run in new tab
+   */
   public createDatabase(newTab: boolean = true) {
     if (newTab) {
       let url =

client/src/app/deploy/sections/sasjs-configurator/sasjs-configurator.component.ts

@@ -5,7 +5,6 @@ import { ServerType } from '@sasjs/utils/types/serverType'
 import { DcAdapterSettings } from 'src/app/models/DcAdapterSettings'
 import { SASGroup } from 'src/app/models/sas/public-getgroups.model'
 import { SASjsApiServerInfo } from 'src/app/models/sasjs-api/SASjsApiServerInfo.model'
-import { HelperService } from 'src/app/services/helper.service'
 import { SasService } from 'src/app/services/sas.service'
 import { SasjsService } from 'src/app/services/sasjs.service'
 
@@ -51,6 +50,9 @@ export class SasjsConfiguratorComponent implements OnInit {
     this.getServerInfo()
   }
 
+  /**
+   * Fethes the sasjs server instance info
+   */
   getServerInfo() {
     this.sasjsService
       .getServerInfo()
@@ -59,6 +61,9 @@ export class SasjsConfiguratorComponent implements OnInit {
       })
   }
 
+  /**
+   * Fetches user groups from the `usernav/usergroupsbymember` service
+   */
   getUserGroups() {
     this.loading = true
 
@@ -99,6 +104,9 @@ export class SasjsConfiguratorComponent implements OnInit {
     )
   }
 
+  /**
+   * Creating database
+   */
   makeData() {
     // const _debug = "&_debug=131"; //debug on
     const _debug = ' ' //debug off

client/src/app/directives/directives.module.ts

@@ -4,20 +4,23 @@ import { NgVarDirective } from './ng-var.directive'
 import { DragNdropDirective } from './drag-ndrop.directive'
 import { FileDropDirective } from './file-drop.directive'
 import { FileSelectDirective } from './file-select.directive'
+import { StealFocusDirective } from './steal-focus.directive'
 
 @NgModule({
   declarations: [
     NgVarDirective,
     DragNdropDirective,
     FileDropDirective,
-    FileSelectDirective
+    FileSelectDirective,
+    StealFocusDirective
   ],
   imports: [CommonModule],
   exports: [
     NgVarDirective,
     DragNdropDirective,
     FileDropDirective,
-    FileSelectDirective
+    FileSelectDirective,
+    StealFocusDirective
   ]
 })
 export class DirectivesModule {}

client/src/app/directives/drag-ndrop.directive.ts

@@ -14,7 +14,9 @@ export class DragNdropDirective {
   @Output() fileDropped = new EventEmitter<any>()
   @Output() fileDraggedOver = new EventEmitter<any>()
 
-  // Dragover listener
+  /**
+   * Dragover listener
+   */
   @HostListener('dragover', ['$event'])
   onDragOver(event: any) {
     event.preventDefault()
@@ -26,7 +28,9 @@ export class DragNdropDirective {
     }
   }
 
-  // Dragleave listener
+  /**
+   * Dragleave listener
+   */
   @HostListener('dragleave', ['$event'])
   public onDragLeave(event: any) {
     event.preventDefault()
@@ -34,7 +38,9 @@ export class DragNdropDirective {
     this.fileOver = false
   }
 
-  // Drop listener
+  /**
+   * Drop listener
+   */
   @HostListener('drop', ['$event'])
   public ondrop(event: any) {
     event.preventDefault()
@@ -48,6 +54,9 @@ export class DragNdropDirective {
     }
   }
 
+  /**
+   * Checks wether dragging element contain files
+   */
   private containsFiles(event: any) {
     if (event && event.dataTransfer && event.dataTransfer.types) {
       for (let i = 0; i < event.dataTransfer.types.length; i++) {

client/src/app/directives/file-drop.directive.ts

@@ -22,6 +22,9 @@ export class FileDropDirective {
     this.element = element
   }
 
+  /**
+   * Dragging element drop event
+   */
   @HostListener('drop', ['$event'])
   onDrop(event: DragEvent): void {
     this._preventAndStop(event)
@@ -39,6 +42,9 @@ export class FileDropDirective {
     this.fileDrop.emit(fileList)
   }
 
+  /**
+   * Dragging element drag over event
+   */
   @HostListener('dragover', ['$event'])
   onDragOver(event: DragEvent): void {
     this._preventAndStop(event)
@@ -59,6 +65,10 @@ export class FileDropDirective {
     this.fileOver.emit(false)
   }
 
+  /**
+   * Prevent propagation trough elements and stop default behavior
+   * For particular event
+   */
   protected _preventAndStop(event: MouseEvent): void {
     event.preventDefault()
     event.stopPropagation()

client/src/app/directives/file-select.directive.ts

@@ -21,6 +21,9 @@ export class FileSelectDirective {
     this.element = element
   }
 
+  /**
+   * Checks if files exist in the input after input change
+   */
   isEmptyAfterSelection(): boolean {
     return !!this.element.nativeElement.attributes.multiple
   }

client/src/app/directives/steal-focus.directive.ts

@@ -0,0 +1,17 @@
+import { Directive, HostListener } from '@angular/core'
+
+@Directive({
+  selector: '[appStealFocus]'
+})
+export class StealFocusDirective {
+  constructor() {}
+
+  /**
+   * For some reason newest version of Clarity v17.0.1 is stealing focus when
+   * clicking on the input inside of the clr-tree-view
+   * This is workaround
+   */
+  @HostListener('click', ['$event']) onClick(event: any) {
+    event.target.focus()
+  }
+}

client/src/app/editor/RowValidation.ts

@@ -1,7 +0,0 @@
-export interface RowValidation {
-  valid: boolean
-  invalidError: string
-  rowNumber?: number
-  colName?: string
-  value?: string
-}

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

@@ -24,8 +24,8 @@
           generatedRecordUrl
             ? 'copy to clipboard'
             : generateEditRecordUrlLoading
-            ? 'Generating url...'
+              ? 'Generating url...'
-            : 'Link to this record'
+              : 'Link to this record'
         }}
       </button>
     </ng-container>
@@ -112,7 +112,7 @@
 
                 <div
                   *ngIf="
-                    ['autocomplete'].includes(
+                    ['autocomplete', 'autocomplete.custom'].includes(
                       $any(currentRecordValidator?.getRule(col.key)?.editor)
                     )
                   "
@@ -163,7 +163,7 @@
 
                 <div
                   *ngIf="
-                    ['autocomplete'].includes(
+                    ['autocomplete', 'autocomplete.custom'].includes(
                       $any(currentRecordValidator?.getRule(col.key)?.editor)
                     )
                   "
@@ -277,7 +277,7 @@
     <div>
       <button
         type="button"
-        class="btn btn-outline focusable"
+        class="btn btn-outline focusable mr-5i"
         (click)="currentRecord!.noLinkOption = false; closeRecordEdit()"
       >
         Cancel

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

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

client/src/app/editor/components/edit-record/edit-record.component.ts

@@ -59,6 +59,12 @@ export class EditRecordComponent implements OnInit {
 
   ngOnInit(): void {}
 
+  /**
+   * Runs native HOT validator against cell value
+   * @param cellValidation column rules
+   * @param cellValue value in the cell that is beign validated
+   * @returns Promise boolean - wether valid or invalid
+   */
   async validateRecordCol(
     cellValidation: any,
     cellValue: any
@@ -74,6 +80,12 @@ export class EditRecordComponent implements OnInit {
     })
   }
 
+  /**
+   * Fired when date field in the record change
+   * Function will parse date and format to string
+   * @param date picker value
+   * @param colKey column name (key)
+   */
   recordDateChange(date: Date, colKey: string) {
     let cellValidation = this.currentRecordValidator?.getRule(colKey)
     let format = cellValidation ? cellValidation.dateFormat : ''
@@ -82,24 +94,38 @@ export class EditRecordComponent implements OnInit {
       this.currentRecord[colKey] = moment(date).format(format)
   }
 
-  isRecordModalInvalid(): boolean {
+  /**
-    return this.currentRecordInvalidCols.length > 0
+   * Close edit record modal and apply changes by emitting output event
-  }
+   */
-
   confirmRecordEdit() {
     if (this.currentRecordInvalidCols.length < 1) {
       this.onRecordChange.emit(this.currentRecord)
     }
   }
 
+  /**
+   * Close edit record modal without applying the changes
+   */
   closeRecordEdit() {
     this.onRecordEditClose.emit()
   }
 
+  /**
+   * Emitting output event when dropdown (autocomplete) input in any col change
+   * @param colName column name (key)
+   * @param col column index
+   */
   onRecordDropdownChange(colName: string, col: number) {
     this.onRecordDropdownChanged.emit({ colName, col })
   }
 
+  /**
+   * Emitting output event when input is focused (clicked on) so we can run a `dynamic cell validation`
+   * Since that bit must be run from the parent component (editor.component)
+   * Result is then applied in the `cellValidation` variable and automatically updated in this component.
+   * @param event input event
+   * @param colName column name (key)
+   */
   onRecordInputFocus(event: any, colName: number) {
     this.onRecordInputFocused.emit({ event, colName })
   }

client/src/app/editor/editor.component.html

@@ -164,19 +164,28 @@
       <div
         class="card-header clr-row buttonBar headerBar clr-flex-md-row clr-justify-content-center clr-justify-content-lg-end"
       >
-        <div *ngIf="tableTrue" class="clr-col-12 clr-col-lg-4 backBtn">
+        <div
-          <span class="btn btn-sm" [routerLink]="['/home']">
+          *ngIf="tableTrue"
-            <clr-icon shape="caret" dir="left" size="20"></clr-icon>Back to
+          class="clr-col-12 clr-col-md-3 clr-col-lg-4 backBtn"
-            table selection
+        >
+          <span
+            class="btn icon-collapse btn-sm btn-icon btn-dimmed"
+            [routerLink]="['/home']"
+          >
+            <clr-icon shape="caret" dir="left" size="20"></clr-icon>
+            <span class="text">Back to table selection</span>
           </span>
-          <span (click)="viewboxManager()" class="btn btn-sm viewbox-open">
+          <span
+            (click)="viewboxManager()"
+            class="btn icon-collapse btn-sm btn-icon btn-dimmed viewbox-open"
+          >
             <clr-icon shape="view-cards" size="20"></clr-icon>
-            Viewboxes
+            <span class="text">Viewboxes</span>
           </span>
         </div>
 
         <div
-          class="clr-col-12 clr-col-lg-4 d-flex flex-column align-items-center"
+          class="clr-col-12 clr-col-md-5 clr-col-lg-4 d-flex flex-column align-items-center"
           [class.clr-col-lg-12]="!tableTrue"
         >
           <h4
@@ -186,24 +195,40 @@
             } as libdsParsed"
             class="editor-title text-center mt-0-i"
           >
-            <clr-icon
+            <clr-tooltip>
-              (click)="datasetInfo = true"
+              <clr-icon
-              shape="info-circle"
+                clrTooltipTrigger
-              class="is-highlight cursor-pointer"
+                (click)="datasetInfo = true"
-              size="24"
+                shape="info-circle"
-            ></clr-icon>
+                class="is-highlight cursor-pointer"
+                size="24"
+              ></clr-icon>
 
-            <clr-icon
+              <clr-icon
-              *ngIf="libdsParsed.tableName.includes('-FC')"
+                *ngIf="libdsParsed.tableName.includes('-FC')"
-              shape="bolt"
+                shape="bolt"
-              class="color-yellow"
+                class="color-yellow"
-            ></clr-icon>
+              ></clr-icon>
+
+              <span clrTooltipTrigger>
+                {{ libdsParsed.libName }}.<a
+                  class="mr-10 view-table"
+                  [routerLink]="'/view/data/' + libds!"
+                  >{{ libdsParsed.tableName.replace('-FC', '') }}</a
+                >
+              </span>
+
+              <ng-container *ngIf="this.dsNote && this.dsNote.length > 0">
+                <clr-tooltip-content
+                  clrPosition="bottom-left"
+                  clrSize="lg"
+                  *clrIfOpen
+                >
+                  {{ this.dsNote }}
+                </clr-tooltip-content>
+              </ng-container>
+            </clr-tooltip>
 
-            {{ libdsParsed.libName }}.<a
-              class="mr-10"
-              [routerLink]="'/view/data/' + libds!"
-              >{{ libdsParsed.tableName.replace('-FC', '') }}</a
-            >
             <ng-container *ngIf="dataSource">
               <ng-container *ngIf="!zeroFilterRows">
                 ({{ dataSource.length | thousandSeparator: ',' }}
@@ -215,34 +240,37 @@
             </ng-container>
           </h4>
         </div>
-        <div *ngIf="tableTrue" class="clr-col-12 clr-col-lg-4 btnCtrl">
+        <div
+          *ngIf="tableTrue"
+          class="clr-col-12 clr-col-md-4 clr-col-lg-4 btnCtrl"
+        >
           <ng-container *ngIf="hotTable.readOnly && !uploadPreview">
             <button
               type="button"
-              class="btnView btn btn-sm btn-icon btn-block"
+              class="btnView btn icon-collapse btn-sm btn-icon btn-block btn-dimmed"
               (click)="openQb()"
             >
               <clr-icon shape="filter"></clr-icon>
-              <span>Filter</span>
+              <span class="text">Filter</span>
             </button>
 
             <button
               type="button"
-              class="btn btn-sm btn-primary btn-block"
+              class="btn icon-collapse btn-sm btn-primary btn-block"
               (click)="editTable()"
             >
               <clr-icon shape="note"></clr-icon>
-              <span>Edit</span>
+              <span class="text">Edit</span>
             </button>
 
             <button
               *ngIf="!columnLevelSecurityFlag"
               (click)="onShowUploadModal()"
               type="button"
-              class="btn btn-sm btn-success btn-block mr-0"
+              class="btn icon-collapse btn-sm btn-success btn-block mr-0"
             >
               <clr-icon shape="upload"></clr-icon>
-              <span>Upload</span>
+              <span class="text">Upload</span>
             </button>
           </ng-container>
 
@@ -280,7 +308,7 @@
                     licenceState.value.editor_rows_allowed === 1
                       ? 'row'
                       : 'rows'
-                  }}, contact support@datacontroller.io</span
+                  }}, contact support&#64;datacontroller.io</span
                 >
               </clr-tooltip-content>
             </clr-tooltip>
@@ -346,8 +374,8 @@
             <ng-container *ngIf="!getdataError">
               <span class="spinner"> Loading... </span>
 
-              <div>
+              <div class="mt-10">
-                <h3>Loading table</h3>
+                <p cds-text="section">Loading table</p>
               </div>
             </ng-container>
 
@@ -356,8 +384,8 @@
                 <clr-icon shape="error-standard" class="error-icon"></clr-icon>
               </span>
 
-              <div>
+              <div class="mt-10">
-                <h3>Loading table error</h3>
+                <p cds-text="section">Loading table error</p>
               </div>
             </ng-container>
           </div>
@@ -382,6 +410,7 @@
               hotId="hotInstance"
               id="hotTable"
               class="edit-hot"
+              className="htDark"
               [class.hidden]="hotTable.hidden"
               [licenseKey]="hotTable.licenseKey"
             >
@@ -417,7 +446,7 @@
                     licenceState.value.editor_rows_allowed === 1
                       ? 'row'
                       : 'rows'
-                  }}, contact support@datacontroller.io</span
+                  }}, contact support&#64;datacontroller.io</span
                 >
               </clr-tooltip-content>
             </clr-tooltip>
@@ -467,14 +496,18 @@
                         : 'rows'
                     }}
                     will be submitted. To remove the restriction, contact
-                    support@datacontroller.io</span
+                    support&#64;datacontroller.io</span
                   >
                   <div *ngIf="tableTrue" class="clr-offset-md-2 clr-col-md-8">
-                    <div class="form-group">
+                    <div class="text-area-full-width">
-                      <label for="formFields_8">Message</label>
+                      <label for="formFields_8" class="mb-5 d-block"
+                        >Message</label
+                      >
                       <textarea
+                        clrTextarea
                         [(ngModel)]="message"
                         [disabled]="!validationDone"
+                        tabindex="0"
                         [value]="
                           !validationDone
                             ? 'Please wait while we validate ' +
@@ -482,10 +515,9 @@
                               ' cells.'
                             : ''
                         "
-                        class="w-100"
+                        class="submit-reason"
                         type="text"
                         id="formFields_8"
-                        rows="5"
                       ></textarea>
                     </div>
                     <!-- TODO:approvers list -->
@@ -504,6 +536,7 @@
                     [disabled]="!validationDone"
                     type="submit"
                     class="btn btn-sm btn-success-outline m-0"
+                    tabindex="0"
                     (click)="saveTable(hotTable.data)"
                   >
                     Submit
@@ -512,6 +545,7 @@
                     id="cancelSubmitBtn"
                     type="button"
                     class="btn btn-sm btn-outline"
+                    tabindex="0"
                     (click)="cancelSubmit(); submit = false; validationDone = 0"
                   >
                     Cancel
@@ -528,7 +562,7 @@
                 Due to current licence, only
                 {{ licenceState.value.submit_rows_limit }} rows in a file will
                 be submitted. To remove the restriction, contact
-                support@datacontroller.io
+                support&#64;datacontroller.io
               </p>
             </div>
             <div class="modal-footer">
@@ -830,6 +864,12 @@
   </div>
 </clr-modal>
 
-<app-dataset-info [(open)]="datasetInfo" [dsmeta]="dsmeta"></app-dataset-info>
+<app-dataset-info
+  [(open)]="datasetInfo"
+  [dsmeta]="dsmeta"
+  [versions]="versions"
+  (rowClicked)="datasetInfoModalRowClicked($event)"
+>
+</app-dataset-info>
 
 <app-viewboxes [(viewboxModal)]="viewboxes"></app-viewboxes>

client/src/app/editor/editor.component.scss

@@ -21,12 +21,12 @@ hot-table {
 
     .handsontable tbody th.ht__highlight, .handsontable thead th.ht__highlight {
       &.primaryKeyHeaderStyle {
-        background: #306b00b0;
+        background-color: #306b00b0 !important;
       }
     }
 
     .primaryKeyHeaderStyle {
-      background: #306b006e;
+      background-color: #306b006e !important;
     }
 
     th.readonlyCell {
@@ -41,6 +41,12 @@ hot-table {
   }
 }
 
+.submit-reason {
+  min-height: 120px;
+  max-height: 120px;
+  height: 120px;
+}
+
 .infoBar {
   margin-top:14px;
   background: #495967;
@@ -80,8 +86,7 @@ hot-table {
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  background: #ffffff;
+  background: var(--clr-vertical-nav-bg-color);
-  background: #f5f6fe;
 }
 
 .error-icon {
@@ -214,6 +219,20 @@ hot-table {
   width: 150px;
 }
 
+.view-table {
+  font-size: inherit !important;
+}
+
+// When width is smaller remove the text from the buttons
+// keep only the icons
+@media (max-width: 992px) {
+  .icon-collapse {
+    .text {
+      display: none;
+    }
+  }
+}
+
 // FIXME
 // Let's leave it here for a reference if there
 // is an issue with viewboxes/filter modal overlaying

client/src/app/editor/editor.component.ts

@@ -15,7 +15,15 @@ import { Subject, Subscription } from 'rxjs'
 import { SasStoreService } from '../services/sas-store.service'
 
 import * as XLSX from '@sheet/crypto'
+
+/**
+ * Used in combination with buffer
+ */
 const iconv = require('iconv-lite')
+/**
+ * In combination with `iconv` is used for encoding json data captured with sheet js from excel file into a file again
+ * Which will be send to backend
+ */
 const Buffer = require('buffer/').Buffer
 type AOA = any[][]
 
@@ -30,7 +38,8 @@ import { HotTableInterface } from '../models/HotTable.interface'
 import {
   $DataFormats,
   DSMeta,
-  EditorsGetdataServiceResponse
+  EditorsGetDataServiceResponse,
+  Version
 } from '../models/sas/editors-getdata.model'
 import { DataFormat } from '../models/sas/common/DateFormat'
 import SheetInfo from '../models/SheetInfo'
@@ -113,6 +122,8 @@ export class EditorComponent implements OnInit, AfterViewInit {
 
   datasetInfo: boolean = false
   dsmeta: DSMeta[] = []
+  versions: Version[] = []
+  dsNote = ''
 
   viewboxes: boolean = false
 
@@ -374,6 +385,9 @@ export class EditorComponent implements OnInit, AfterViewInit {
     this.setRestrictions()
   }
 
+  /**
+   * Prepare feature restrictions based on licence key
+   */
   private parseRestrictions() {
     this.restrictions.restrictAddRecord =
       this.licenceState.value.addRecord === false
@@ -383,6 +397,10 @@ export class EditorComponent implements OnInit, AfterViewInit {
       this.licenceState.value.fileUpload === false
   }
 
+  /**
+   * Applying prepared restrictions
+   * @param overrideRestrictions can be used to apply and override specific restrictions
+   */
   private setRestrictions(overrideRestrictions?: EditorRestrictions) {
     if (overrideRestrictions) {
       this.restrictions = {
@@ -402,6 +420,9 @@ export class EditorComponent implements OnInit, AfterViewInit {
     }
   }
 
+  /**
+   * Disabling add row button based on wether rows limit is present
+   */
   private checkRowLimit() {
     if (this.columnLevelSecurityFlag) return
 
@@ -416,12 +437,19 @@ export class EditorComponent implements OnInit, AfterViewInit {
     }
   }
 
+  /**
+   * Resetting filter variables
+   */
   public resetFilter() {
     if (this.queryFilterCompList.first) {
       this.queryFilterCompList.first.resetFilter()
     }
   }
 
+  /**
+   * Openning file upload modal
+   * If feature is locked, `feature locked` modal will be shown
+   */
   public onShowUploadModal() {
     if (this.restrictions.restrictFileUpload) {
       this.eventService.showDemoLimitModal('File Upload')
@@ -439,6 +467,10 @@ export class EditorComponent implements OnInit, AfterViewInit {
     if (!this.uploadPreview) this.showUploadModal = true
   }
 
+  /**
+   * Called by FileDropDirective
+   * @param e true if file is dragged over the drop zone
+   */
   public fileOverBase(e: boolean): void {
     this.hasBaseDropZoneOver = e
   }
@@ -620,6 +652,10 @@ export class EditorComponent implements OnInit, AfterViewInit {
     return returnObj
   }
 
+  /**
+   * When excel is password protected we will display the password promppt for user to type password in.
+   * @returns Password user input or undefined if discarded by user
+   */
   public promptExcelPassword(): Promise<string | undefined> {
     return new Promise((resolve, reject) => {
       this.filePasswordModal = true
@@ -645,6 +681,13 @@ export class EditorComponent implements OnInit, AfterViewInit {
     })
   }
 
+  /**
+   * Parses attached file, to be uploaded
+   * If attached file is CSV it will be send to backend straight away
+   * If attached file is EXCEL it will be displayed in the table, in preview mode
+   * @param event file drop event
+   * @param dropped whether it's dropped or added by browse button
+   */
   public getFileDesc(event: any, dropped: boolean = false) {
     this.excelUploadState = 'Loading'
     this.excelFileParsing = true
@@ -899,13 +942,30 @@ export class EditorComponent implements OnInit, AfterViewInit {
             return row.map((col: any, index: number) => {
               if (!col && col !== 0) col = ''
 
-              if (isNaN(col)) {
+              /**
-                col = col.replace(/"/g, '""')
+               * Keeping this for the reference
+               * Code below used to convert JSON to CSV
+               * now the XLSX is converting to CSV
+               */
+              // if (isNaN(col)) {
+              //   // Match and replace the double quotes, ignore the first and last char
+              //   // in case they are double quotes already
+              //   col = col.replace(/(?<!^)"(?!$)/g, '""')
 
-                if (col.search(/,/g) > -1) {
+              //   if (col.search(/,/g) > -1 ||
-                  col = '"' + col + '"'
+              //       col.search(/\r|\n/g) > -1
-                }
+              //   ) {
-              }
+              //     // Missing quotes at the end
+              //     if (col.search(/"$/g) < 0) {
+              //       col = col + '"' // So we add them
+              //     }
+
+              //     // Missing quotes at the start
+              //     if (col.search(/^"/g) < 0) {
+              //       col = '"' + col // So we add them
+              //     }
+              //   }
+              // }
 
               const colName = this.headerShow[index]
               const colRule = this.dcValidator?.getRule(colName)
@@ -920,20 +980,30 @@ export class EditorComponent implements OnInit, AfterViewInit {
 
           this.data = csvArrayData
 
-          let csvContent = csvArrayHeaders.join(',') + '\n'
+          // Apply licence rows limitation if exists, it is only affecting data
-          // Apply licence rows limitation if exists
+          // which will be send to SAS
-          csvContent += csvArrayData
+          const strippedCsvArrayData = csvArrayData.slice(
-            .slice(0, this.licenceState.value.submit_rows_limit)
+            0,
-            .map((e) => e.join(','))
+            this.licenceState.value.submit_rows_limit
-            .join('\n')
+          )
+          // To submit to sas service, we need clean version of CSV of file
+          // attached. XLSX will do the parsing and heavy lifting
+          // First we create worksheet of json (data we extracted)
+          let ws = XLSX.utils.json_to_sheet(strippedCsvArrayData, {
+            skipHeader: true
+          })
+          // create CSV to be uploaded from worksheet
+          let csvContentClean = XLSX.utils.sheet_to_csv(ws)
+          // Prepend headers
+          csvContentClean = csvArrayHeaders.join(',') + '\n' + csvContentClean
 
           if (this.encoding === 'WLATIN1') {
-            let encoded = iconv.decode(Buffer.from(csvContent), 'CP-1252')
+            let encoded = iconv.decode(Buffer.from(csvContentClean), 'CP-1252')
             let blob = new Blob([encoded], { type: 'application/csv' })
             let newCSVFile: File = this.blobToFile(blob, this.filename + '.csv')
             this.uploader.addToQueue([newCSVFile])
           } else {
-            let blob = new Blob([csvContent], { type: 'application/csv' })
+            let blob = new Blob([csvContentClean], { type: 'application/csv' })
             let newCSVFile: File = this.blobToFile(blob, this.filename + '.csv')
             this.uploader.addToQueue([newCSVFile])
           }
@@ -1010,6 +1080,9 @@ export class EditorComponent implements OnInit, AfterViewInit {
     }
   }
 
+  /**
+   * Submits attached excel file that is in preview mode
+   */
   public submitExcel() {
     if (this.licenceState.value.submit_rows_limit !== Infinity) {
       this.submitLimitNotice = true
@@ -1019,6 +1092,9 @@ export class EditorComponent implements OnInit, AfterViewInit {
     this.getFile()
   }
 
+  /**
+   * This method will run validations and upload all of the pending files that are in the uploader queue
+   */
   public getFile() {
     if (this.checkInvalid()) {
       this.eventService.showAbortModal(null, 'Invalid values are present.')
@@ -1091,6 +1167,9 @@ export class EditorComponent implements OnInit, AfterViewInit {
       )
   }
 
+  /**
+   * After excel file is attached and parsed, this function will display it's content in the HOT table in read only mode
+   */
   public getPendingExcelPreview() {
     this.queryTextSaved = this.queryText
     this.queryText = ''
@@ -1142,46 +1221,12 @@ export class EditorComponent implements OnInit, AfterViewInit {
       this.excelFileParsing = false
       this.excelUploadState = null
     })
-
-    /**
-     * This is half validation feature to speed up file upload
-     * Currently disabled but will leave it here in case it needs to be re-enabled
-     */
-    // this.excelUploadState = 'Validating-DQ'
-
-    // this.validateRowsOnPendingExcel(
-    //   async (rowValidation: RowValidation | undefined) => {
-    //     if (rowValidation) {
-    //       this.eventService.showAbortModal(
-    //         'Excel validation',
-    //         `Please fix the data and re-submit the file. Invalid data details: <br><br> Row: ${rowValidation.rowNumber} <br> Column: ${rowValidation.colName} <br> Reason: <strong>${rowValidation.invalidError}</strong> <br> Invalid value: ${rowValidation.value}`
-    //       )
-
-    //       this.excelFileParsing = false
-    //       this.excelUploadState = null
-    //     } else {
-    //       this.excelUploadState = 'Validating-HOT'
-
-    //       hot.updateSettings(
-    //         {
-    //           data: this.dataSource
-    //         },
-    //         false
-    //       )
-    //       hot.render()
-
-    //       hot.validateCells(() => {
-    //         this.showUploadModal = false
-    //         this.uploadPreview = true
-
-    //         this.excelFileParsing = false
-    //         this.excelUploadState = null
-    //       })
-    //     }
-    //   }
-    // )
   }
 
+  /**
+   * Drops the attached excel file
+   * @param discardData wheter to discard data parsed from the file or to keep it in the table after dropping a attached excel file
+   */
   public discardPendingExcel(discardData?: boolean) {
     this.hotInstance.updateSettings({
       maxRows: this.licenceState.value.editor_rows_allowed
@@ -1205,6 +1250,10 @@ export class EditorComponent implements OnInit, AfterViewInit {
     }
   }
 
+  /**
+   * Drops attached excel file, keeps it's data in the DC table
+   * User can now edit the table and submit. Witout the file present.
+   */
   public previewTableEditConfirm() {
     this.discardPendingExcel()
     this.convertToCorrectTypes(this.dataSource)
@@ -1909,13 +1958,13 @@ export class EditorComponent implements OnInit, AfterViewInit {
 
         if (entry.values.length > 0) {
           hot.setCellMeta(entry.row, entry.col, 'renderer', 'autocomplete')
-          hot.setCellMeta(entry.row, entry.col, 'editor', 'autocomplete')
+          hot.setCellMeta(entry.row, entry.col, 'editor', 'autocomplete.custom')
           hot.setCellMeta(entry.row, entry.col, 'strict', entry.strict)
           hot.setCellMeta(entry.row, entry.col, 'filter', false)
 
           this.currentEditRecordValidator?.updateRule(entry.col, {
             renderer: 'autocomplete',
-            editor: 'autocomplete',
+            editor: 'autocomplete.custom',
             strict: entry.strict,
             filter: false
           })
@@ -1995,7 +2044,7 @@ export class EditorComponent implements OnInit, AfterViewInit {
         (el: DynamicExtendedCellValidation) =>
           el.DISPLAY_TYPE === 'C' ? el.RAW_VALUE_CHAR : el.RAW_VALUE_NUM
       )
-      const cellCol = hot.propToCol(cell)
+      const cellCol = hot.propToCol(cell) as number
       const dynamicValidationEl =
         this.disabledBasicDynamicCellValidationMap.find(
           (x) => x.row === row && x.col === cellCol
@@ -2010,13 +2059,13 @@ export class EditorComponent implements OnInit, AfterViewInit {
       }
 
       hot.setCellMeta(row, cellCol, 'renderer', 'autocomplete')
-      hot.setCellMeta(row, cellCol, 'editor', 'autocomplete')
+      hot.setCellMeta(row, cellCol, 'editor', 'autocomplete.custom')
       hot.setCellMeta(row, cellCol, 'strict', cellValidationEntry.strict)
       hot.setCellMeta(row, cellCol, 'filter', false)
 
       this.currentEditRecordValidator?.updateRule(cellCol, {
         renderer: 'autocomplete',
-        editor: 'autocomplete',
+        editor: 'autocomplete.custom',
         strict: cellValidationEntry.strict,
         filter: false
       })
@@ -2214,8 +2263,8 @@ export class EditorComponent implements OnInit, AfterViewInit {
 
       setTimeout(() => {
         let txt: any = document.getElementById('formFields_8')
-        txt.focus()
+        if (txt) txt.focus()
-      })
+      }, 200)
     })
 
     // let cnt = 0;
@@ -2659,13 +2708,13 @@ export class EditorComponent implements OnInit, AfterViewInit {
           const strict = this.cellValidationSource[validationSourceIndex].strict
 
           hot.setCellMeta(row, column, 'renderer', 'autocomplete')
-          hot.setCellMeta(row, column, 'editor', 'autocomplete')
+          hot.setCellMeta(row, column, 'editor', 'autocomplete.custom')
           hot.setCellMeta(row, column, 'strict', strict)
           hot.setCellMeta(row, column, 'filter', false)
 
           this.currentEditRecordValidator?.updateRule(column, {
             renderer: 'autocomplete',
-            editor: 'autocomplete',
+            editor: 'autocomplete.custom',
             strict: strict,
             filter: false
           })
@@ -2717,6 +2766,7 @@ export class EditorComponent implements OnInit, AfterViewInit {
         })
 
         hot.setCellMeta(row, column, 'renderer', spinnerRenderer)
+
         this.currentEditRecordLoadings.push(column)
         hot.render()
 
@@ -2887,6 +2937,16 @@ export class EditorComponent implements OnInit, AfterViewInit {
     }
   }
 
+  datasetInfoModalRowClicked(value: Version | DSMeta) {
+    if ((<Version>value).LOAD_REF !== undefined) {
+      // Type is Version
+      const row = value as Version
+      const url = `/stage/${row.LOAD_REF}`
+
+      this.router.navigate([url])
+    }
+  }
+
   viewboxManager() {
     this.viewboxes = true
   }
@@ -2899,6 +2959,37 @@ export class EditorComponent implements OnInit, AfterViewInit {
     )
   }
 
+  /**
+   * Function checks if selected hot cell is solo cell selected
+   * and if it is, set the `filter` property based on filter param.
+   *
+   * @param filter
+   */
+  private setCellFilter(filter: boolean) {
+    const hotSelected = this.hotInstance.getSelected()
+    const selection = hotSelected ? hotSelected[0] : hotSelected
+
+    // When we open a dropdown we want filter disabled so value in cell
+    // don't filter out items, since we want to see them all.
+    // But when we start typing we want to be able to start filtering values
+    // again
+    if (selection) {
+      const startRow = selection[0]
+      const endRow = selection[2]
+      const startCell = selection[1]
+      const endCell = selection[3]
+
+      if (startRow === endRow && startCell === endCell) {
+        const cellMeta = this.hotInstance.getCellMeta(startRow, startCell)
+
+        // If filter is not already set at the value in the param, set it
+        if (cellMeta && cellMeta.filter === !filter) {
+          this.hotInstance.setCellMeta(startRow, startCell, 'filter', filter)
+        }
+      }
+    }
+  }
+
   async ngOnInit() {
     this.licenceService.hot_license_key.subscribe(
       (hot_license_key: string | undefined) => {
@@ -2945,7 +3036,7 @@ export class EditorComponent implements OnInit, AfterViewInit {
 
       await this.sasStoreService
         .callService(myParams, 'SASControlTable', 'editors/getdata', this.libds)
-        .then((res: EditorsGetdataServiceResponse) => {
+        .then((res: EditorsGetDataServiceResponse) => {
           this.initSetup(res)
         })
         .catch((err: any) => {
@@ -2957,7 +3048,7 @@ export class EditorComponent implements OnInit, AfterViewInit {
 
   ngAfterViewInit() {}
 
-  initSetup(response: EditorsGetdataServiceResponse) {
+  initSetup(response: EditorsGetDataServiceResponse) {
     this.hotInstance = this.hotRegisterer.getInstance('hotInstance')
 
     if (this.getdataError) return
@@ -2966,6 +3057,21 @@ export class EditorComponent implements OnInit, AfterViewInit {
 
     this.cols = response.data.cols
     this.dsmeta = response.data.dsmeta
+    this.versions = response.data.versions || []
+
+    const notes = this.dsmeta.find((item) => item.NAME === 'NOTES')
+    const longDesc = this.dsmeta.find((item) => item.NAME === 'DD_LONGDESC')
+    const shortDesc = this.dsmeta.find((item) => item.NAME === 'DD_SHORTDESC')
+
+    if (notes && notes.VALUE) {
+      this.dsNote = notes.VALUE
+    } else if (longDesc && longDesc.VALUE) {
+      this.dsNote = longDesc.VALUE
+    } else if (shortDesc && shortDesc.VALUE) {
+      this.dsNote = shortDesc.VALUE
+    } else {
+      this.dsNote = ''
+    }
 
     const hot: Handsontable = this.hotInstance
 
@@ -3152,6 +3258,9 @@ export class EditorComponent implements OnInit, AfterViewInit {
           if (col === 0) {
             th.classList.add('firstColumnHeaderStyle')
           }
+
+          // Dark mode
+          th.classList.add('darkTH')
         },
         afterGetCellMeta: (
           row: number,
@@ -3240,28 +3349,16 @@ export class EditorComponent implements OnInit, AfterViewInit {
       }
     )
 
-    hot.addHook('beforeKeyDown', (e: any) => {
+    hot.addHook('afterBeginEditing', () => {
-      const hotSelected = this.hotInstance.getSelected()
-      const selection = hotSelected ? hotSelected[0] : hotSelected
-
       // When we open a dropdown we want filter disabled so value in cell
       // don't filter out items, since we want to see them all.
+      this.setCellFilter(false)
+    })
+
+    hot.addHook('beforeKeyDown', () => {
       // When we start typing, we are enabling the filter since we want to find
       // values faster.
-      if (selection) {
+      this.setCellFilter(true)
-        const startRow = selection[0]
-        const endRow = selection[2]
-        const startCell = selection[1]
-        const endCell = selection[3]
-
-        if (startRow === endRow && startCell === endCell) {
-          const cellMeta = this.hotInstance.getCellMeta(startRow, startCell)
-
-          if (cellMeta && cellMeta.filter === false) {
-            this.hotInstance.setCellMeta(startRow, startCell, 'filter', true)
-          }
-        }
-      }
     })
 
     hot.addHook('afterChange', (source: any, change: any) => {
@@ -3270,7 +3367,7 @@ export class EditorComponent implements OnInit, AfterViewInit {
 
         const row = source[0][0]
         const colProp = source[0][1]
-        const col = hot.propToCol(colProp)
+        const col = hot.propToCol(colProp) as number
 
         // On edit we enabled filter for this cell, now when editing is finished
         // We want filter to be disabled again, to be ready for next dropdown opening.

client/src/app/editor/editor.module.ts

@@ -12,7 +12,6 @@ import { EditRecordComponent } from './components/edit-record/edit-record.compon
 import { UploadStaterComponent } from './components/upload-stater/upload-stater.component'
 import { EditorRoutingModule } from './editor-routing.module'
 import { EditorComponent } from './editor.component'
-import { HomeModule } from '../home/home.module'
 import { DcTreeModule } from '../shared/dc-tree/dc-tree.module'
 import { DragDropModule } from '@angular/cdk/drag-drop'
 import { ViewboxesModule } from '../shared/viewboxes/viewboxes.module'
@@ -33,7 +32,6 @@ registerAllModules()
     AppSharedModule,
     DirectivesModule,
     SharedModule,
-    HomeModule,
     PipesModule,
     DcTreeModule,
     DragDropModule,

client/src/app/editor/models/EditRecordModal.ts

@@ -1,5 +1,10 @@
 import { DcValidation } from 'src/app/shared/dc-validator/models/dc-validation.model'
 
+/**
+ * Wrapper for DC Validation because we need `noLinkOption` property
+ * to be used as a flag to show/hide button that generates link for the
+ * edit record modal
+ */
 export interface EditRecordModal extends DcValidation {
   noLinkOption: boolean
   [key: string]: any

client/src/app/editor/models/cellValidation.ts

@@ -1,19 +0,0 @@
-export interface CellValidation {
-  data: string
-  length: number
-  type?: string
-  source: string[]
-  format?: number
-  validator?: any
-  valid?: boolean
-  renderer?: any
-  dateFormat?: string
-  readOnly?: boolean
-  desc?: string
-  correctFormat?: boolean
-  /**
-   * Key for accessing object fields, any type because it can be
-   * any of the types interface have
-   */
-  [key: string]: any
-}

client/src/app/editor/models/column.ts

@@ -1,36 +0,0 @@
-export enum ColumnType {
-  string = 'string',
-  number = 'number'
-}
-
-export interface ColumnInterface {
-  id: number | undefined
-  name: string | undefined
-  type: ColumnType | undefined
-  length: number | undefined
-}
-
-export class Column implements ColumnInterface {
-  public id: number | undefined
-  public name: string | undefined
-  public type: ColumnType | undefined
-  public length: number | undefined
-  public static fromPlainObject(obj: object) {
-    return Object.assign(new Column(), obj)
-  }
-
-  constructor(id?: number, name?: string, type?: ColumnType, length?: number) {
-    this.id = id
-    this.name = name
-    this.type = type
-    this.length = length
-  }
-
-  get hsType() {
-    return (
-      (this.type === ColumnType.string && 'text') ||
-      (this.type === ColumnType.number && 'numeric') ||
-      null
-    )
-  }
-}

client/src/app/editor/models/dynamicExtendedCellValidation.ts

@@ -1,3 +1,7 @@
+/**
+ * Model for the dynamic cell validation in the editor
+ * (sending whole row to the backend service and recieving data for the cell dropdown)
+ */
 export interface DynamicExtendedCellValidation {
   DISPLAY_INDEX: number
   DISPLAY_TYPE: string

client/src/app/editor/models/edit-record/edit-record-events.ts

@@ -1,8 +1,14 @@
+/**
+ * Edit record modal - input has been focused event
+ */
 export interface EditRecordInputFocusedEvent {
   event: any
   colName: number
 }
 
+/**
+ * Edit record modal - dropdown has been changed event
+ */
 export interface EditRecordDropdownChangeEvent {
   colName: string
   col: number

client/src/app/editor/models/editor-restrictions.model.ts

@@ -1,3 +1,6 @@
+/**
+ * Editor restrictions model (based on the licencing)
+ */
 export interface EditorRestrictions {
   restrictEditRecord?: boolean // Feature is locked but edit/add record buttons are visible so when user clicks he gets the `locked feature modal`
   restrictAddRecord?: boolean // Same as editRecord, but for addRecord

client/src/app/editor/table.ts

@@ -1,71 +0,0 @@
-import { Column, ColumnType } from './models/column'
-
-export enum TableType {
-  INPUT = 'In',
-  OUTPUT = 'Out'
-}
-
-export interface TableInterface {
-  id: number | undefined
-  name: string | undefined
-  data: Array<Object>
-  columns: Array<Column>
-  type: TableType | undefined
-}
-
-export class Table implements TableInterface {
-  public id: number | undefined
-  public name: string | undefined
-  public data: Array<any>
-  public columns: Array<Column> = []
-  public type: TableType | undefined
-
-  public static fromPlainObject(obj: any) {
-    obj.columns = obj.columns.map((column: object) => {
-      return Column.fromPlainObject(column)
-    })
-
-    return Object.assign(new Table(), obj)
-  }
-
-  constructor(
-    id?: number,
-    name?: string,
-    type?: TableType,
-    data?: Array<Object>,
-    columns?: Array<Column>
-  ) {
-    this.id = id
-    this.name = name
-    this.type = type
-
-    this.data = data || [{}]
-    this.columns = columns || []
-  }
-
-  public getNextColumnId(): number {
-    let highestIdColumn: any = this.columns.sort(
-      (cA: any, cB: any) => cA.id - cB.id
-    )[this.columns.length - 1]
-    return (highestIdColumn && highestIdColumn.id + 1) || 0
-  }
-
-  public addColumn(column: Column) {
-    this.columns.push(column)
-
-    this.data.forEach((row: any) => {
-      if (column.name) {
-        row[column.name] = column.type === ColumnType.string ? '' : null
-      }
-    })
-
-    return column
-  }
-
-  public removeColumn(colInd: any) {
-    this.data.forEach((row) => {
-      delete row[this.columns[colInd].name!]
-    })
-    this.columns.splice(colInd, 1)
-  }
-}

client/src/app/editor/utils/date.utils.ts

@@ -1,3 +1,6 @@
+/**
+ * Converting date object to the UTC time string
+ */
 export const dateToUtcTime = (date: Date) => {
   let timeStr = ('0' + date.getUTCHours()).slice(-2) + ':'
   timeStr = timeStr + ('0' + date.getUTCMinutes()).slice(-2) + ':'
@@ -5,6 +8,9 @@ export const dateToUtcTime = (date: Date) => {
   return timeStr
 }
 
+/**
+ * Converts date object to the time string
+ */
 export const dateToTime = (date: Date) => {
   let timeStr = ('0' + date.getHours()).slice(-2) + ':'
   timeStr = timeStr + ('0' + date.getMinutes()).slice(-2) + ':'
@@ -12,6 +18,9 @@ export const dateToTime = (date: Date) => {
   return timeStr
 }
 
+/**
+ * Converts date object to the YYYY-MM-DD
+ */
 export const dateFormat = (date: Date) => {
   return (
     date.getFullYear() +

client/src/app/editor/utils/grid.utils.ts

@@ -1,9 +1,17 @@
 import { Col } from 'src/app/shared/dc-validator/models/col.model'
 
+/**
+ * Converts excel date serial number to JS date
+ */
 export const excelDateToJSDate = (serial: number) => {
   return new Date(Math.round((serial - 25569) * 86400 * 1000))
 }
 
+/**
+ * Parsing table columns for the HOT in editor
+ * Converts array of objects into array of strings, every string is column name (key)
+ * @param data array of objects (columns data)
+ */
 export const parseTableColumns = (data: Col[]): string[] => {
   const columns: string[] = []
 
@@ -16,6 +24,12 @@ export const parseTableColumns = (data: Col[]): string[] => {
   return columns
 }
 
+/**
+ * Captures headers that are not found in the current table but is found in the uploaded file data
+ * @param data
+ * @param headers
+ * @returns string array of missing headers
+ */
 export const getMissingHeaders = (data: any, headers: any) => {
   const missingHeaders: string[] = []
   const remainingHeaders: string[] = []

client/src/app/editor/utils/renderers.utils.ts

@@ -1,3 +1,7 @@
+/**
+ * Custom renderer for HOT cell
+ * Used to show error icon
+ */
 export const errorRenderer = (
   instance: any,
   td: any,
@@ -7,13 +11,19 @@ export const errorRenderer = (
   value: any,
   cellProperties: any
 ) => {
+  addDarkClass(td)
+
   td.innerHTML = `${
     value ? value.toString() : ''
-  } <clr-icon shape="exclamation-circle" status="warning"></clr-icon>`
+  } <cds-icon shape="exclamation-triangle" status="warning"></cds-icon>`
 
   return td
 }
 
+/**
+ * Custom renderer for HOT cell
+ * Used to revert cell back to original state (no spinner, no error)
+ */
 export const noSpinnerRenderer = (
   instance: any,
   td: any,
@@ -23,12 +33,18 @@ export const noSpinnerRenderer = (
   value: any,
   cellProperties: any
 ) => {
+  addDarkClass(td)
+
   td.innerHTML = value ? value : ''
 
   return td
 }
 
-// Spinner shown whilst waiting for SAS to respond
+/**
+ * Custom renderer for HOT cell
+ * Used to show loading spinner in the cell
+ * (Spinner shown whilst waiting for SAS to respond)
+ */
 export const spinnerRenderer = (
   instance: any,
   td: any,
@@ -38,9 +54,20 @@ export const spinnerRenderer = (
   value: any,
   cellProperties: any
 ) => {
+  addDarkClass(td)
+
   td.innerHTML = `${
     value ? value.toString() : ''
   } <span class="spinner spinner-sm vertical-align-middle"></span>`
 
   return td
 }
+
+/**
+ * Adds a htDark class to a TD element if not existing
+ */
+const addDarkClass = (td: any) => {
+  if (!td.classList.contains('htDark')) {
+    td.classList.add('htDark')
+  }
+}

client/src/app/group/group.component.html

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

client/src/app/group/group.component.scss

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

client/src/app/home/home-routing.module.ts

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { HomeRouteComponent } from '../routes/home-route/home-route.component'
+import { HomeComponent } from './home.component'
+import { XLMapModule } from '../xlmap/xlmap.module'
+
+const routes: Routes = [
+  {
+    path: '',
+    component: HomeRouteComponent,
+    children: [
+      { path: '', pathMatch: 'full', redirectTo: 'tables' },
+      { path: 'tables', component: HomeComponent },
+      { path: 'files', loadChildren: () => XLMapModule }
+    ]
+  }
+]
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class HomeRoutingModule {}

client/src/app/home/home.component.html

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

client/src/app/home/home.module.ts

@@ -1,15 +1,18 @@
-import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { HomeComponent } from './home.component'
+import { NgModule } from '@angular/core'
-import { ClarityModule } from '@clr/angular'
 import { FormsModule } from '@angular/forms'
+import { ClarityModule } from '@clr/angular'
 import { AppSharedModule } from '../app-shared.module'
-import { DcTreeModule } from '../shared/dc-tree/dc-tree.module'
 import { DirectivesModule } from '../directives/directives.module'
+import { HomeRouteComponent } from '../routes/home-route/home-route.component'
+import { DcTreeModule } from '../shared/dc-tree/dc-tree.module'
+import { HomeRoutingModule } from './home-routing.module'
+import { HomeComponent } from './home.component'
 
 @NgModule({
-  declarations: [HomeComponent],
+  declarations: [HomeComponent, HomeRouteComponent],
   imports: [
+    HomeRoutingModule,
     FormsModule,
     ClarityModule,
     AppSharedModule,

client/src/app/licensing/licensing-routing.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { LicensingGuard } from '../routes/licensing.guard'
+import { LicensingComponent } from './licensing.component'
+
+const routes: Routes = [
+  {
+    path: ':action',
+    component: LicensingComponent,
+    canActivate: [LicensingGuard],
+    canDeactivate: [LicensingGuard]
+  }
+]
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class LicensingRoutingModule {}

client/src/app/licensing/licensing.component.html

@@ -2,147 +2,152 @@
   <div class="card-header">Licencing</div>
 
   <div [ngSwitch]="action" class="card-block">
-    <ng-container *ngSwitchCase="'key'">
+    <div class="card-text">
-      <p class="key-error" *ngIf="!keyError">
+      <ng-container *ngSwitchCase="'key'">
-        Licence key is invalid. We can't provide you more details at the moment
+        <p class="key-error" *ngIf="!keyError">
+          Licence key is invalid. We can't provide you more details at the
+          moment
+        </p>
+
+        <p
+          class="key-error"
+          *ngIf="keyError"
+          [innerHTML]="licenseErrors[keyError]"
+        ></p>
+
+        <p *ngIf="errorDetails"><strong>Details:</strong> {{ errorDetails }}</p>
+      </ng-container>
+
+      <ng-container *ngSwitchCase="'limit'">
+        <p class="key-error">
+          The registered number of users reached the limit specified for your
+          licence. Please contact
+          <contact-link classes="color-green" />
+          or your reseller to arrange additional licences for this product.
+        </p>
+      </ng-container>
+
+      <ng-container *ngSwitchCase="'update'">
+        <p class="key-error">
+          Update the license key by uploading the licence file or by pasting a
+          license key and activation key in the inputs below.
+        </p>
+      </ng-container>
+
+      <p>
+        <strong>SYSSITE:</strong>
+        <span
+          *ngFor="let id of syssite.value; let i = index"
+          [class.misskey]="missmatchedKey && missmatchedKey === id"
+        >
+          {{ id }}{{ i === syssite.value?.length! - 1 ? '' : ',' }}
+        </span>
+
+        <a
+          class="tooltip tooltip-md tooltip-top-right"
+          (click)="copySyssite(copyIcon, copyTooltip, syssite.value || [])"
+        >
+          <clr-icon
+            #copyIcon
+            class="cursor-pointer"
+            shape="copy"
+            size="15"
+          ></clr-icon>
+          <span #copyTooltip class="tooltip-content">Copy to clipboard</span>
+        </a>
       </p>
 
-      <p
+      <p *ngIf="licenseKeyData && userCountLimitation" class="m-0">
-        class="key-error"
+        <strong>Allowed users:</strong>
-        *ngIf="keyError"
+        {{ licenseKeyData.users_allowed }}
-        [innerHTML]="licenseErrors[keyError]"
-      ></p>
-
-      <p *ngIf="errorDetails"><strong>Details:</strong> {{ errorDetails }}</p>
-    </ng-container>
-
-    <ng-container *ngSwitchCase="'limit'">
-      <p class="key-error">
-        The registered number of users reached the limit specified for your
-        licence. Please contact
-        <contact-link classes="color-green" />
-        or your reseller to arrange additional licences for this product.
       </p>
-    </ng-container>
 
-    <ng-container *ngSwitchCase="'update'">
+      <clr-tabs>
-      <p class="key-error">
+        <clr-tab>
-        Update the license key by uploading the licence file or by pasting a
+          <button clrTabLink>Upload licence</button>
-        license key and activation key in the inputs below.
+          <clr-tab-content>
-      </p>
+            <input
-    </ng-container>
+              #licenceFile
-
+              (change)="onFileCapture($event)"
-    <p>
+              type="file"
-      <strong>SYSSITE:</strong>
+              hidden
-      <span
+            />
-        *ngFor="let id of syssite.value; let i = index"
+            <div
-        [class.misskey]="missmatchedKey && missmatchedKey === id"
+              (click)="licenceFile.click()"
-      >
+              appFileDrop
-        {{ id }}{{ i === syssite.value?.length! - 1 ? '' : ',' }}
+              (fileDrop)="onFileCapture($event, true)"
-      </span>
+              class="drop-area"
-
+            >
-      <a
+              <clr-spinner
-        class="tooltip tooltip-md tooltip-top-right"
+                class="spinner-sm"
-        (click)="copySyssite(copyIcon, copyTooltip, syssite.value || [])"
+                *ngIf="licenceFileLoading"
-      >
+              ></clr-spinner>
-        <clr-icon
+              <ng-container *ngIf="!licenceFileLoading">
-          #copyIcon
+                <div *ngIf="licencefile.filename === ''">
-          class="cursor-pointer"
+                  Drop / Browse licence file
-          shape="copy"
+                </div>
-          size="15"
+                <div *ngIf="licencefile.filename !== ''">
-        ></clr-icon>
+                  Selected file: <strong>{{ licencefile.filename }}</strong>
-        <span #copyTooltip class="tooltip-content">Copy to clipboard</span>
+                </div>
-      </a>
+                <div *ngIf="licenceFileError">
-    </p>
+                  <strong>{{ licenceFileError }}</strong>
-
+                </div>
-    <p *ngIf="licenseKeyData && userCountLimitation" class="m-0">
+              </ng-container>
-      <strong>Allowed users:</strong>
-      {{ licenseKeyData.users_allowed }}
-    </p>
-
-    <clr-tabs>
-      <clr-tab>
-        <button clrTabLink>Upload licence</button>
-        <clr-tab-content>
-          <input
-            #licenceFile
-            (change)="onFileCapture($event)"
-            type="file"
-            hidden
-          />
-          <div
-            (click)="licenceFile.click()"
-            appFileDrop
-            (fileDrop)="onFileCapture($event, true)"
-            class="drop-area"
-          >
-            <clr-spinner
-              class="spinner-sm"
-              *ngIf="licenceFileLoading"
-            ></clr-spinner>
-            <ng-container *ngIf="!licenceFileLoading">
-              <div *ngIf="licencefile.filename === ''">
-                Drop / Browse licence file
-              </div>
-              <div *ngIf="licencefile.filename !== ''">
-                Selected file: <strong>{{ licencefile.filename }}</strong>
-              </div>
-              <div *ngIf="licenceFileError">
-                <strong>{{ licenceFileError }}</strong>
-              </div>
-            </ng-container>
-          </div>
-        </clr-tab-content>
-      </clr-tab>
-
-      <clr-tab>
-        <button clrTabLink>Paste licence</button>
-        <clr-tab-content>
-          <form class="clr-form license-key-form">
-            <p>Licence key:</p>
-            <div class="clr-control-container">
-              <textarea
-                [(ngModel)]="licenceKeyValue"
-                (mouseleave)="trimKeys()"
-                name="license-key-area"
-                placeholder="Paste licence key here"
-                class="clr-textarea"
-              ></textarea>
             </div>
-          </form>
+          </clr-tab-content>
+        </clr-tab>
 
-          <form class="clr-form activation-key-form">
+        <clr-tab>
-            <p>Activation key:</p>
+          <button clrTabLink>Paste licence</button>
-            <div class="clr-control-container">
+          <clr-tab-content>
-              <textarea
+            <form class="clr-form license-key-form">
-                [(ngModel)]="activationKeyValue"
+              <p>Licence key:</p>
-                (mouseleave)="trimKeys()"
+              <div class="clr-control-container">
-                name="activation-key-area"
+                <textarea
-                placeholder="Paste activation key here"
+                  [(ngModel)]="licenceKeyValue"
-                class="clr-textarea"
+                  (mouseleave)="trimKeys()"
-              ></textarea>
+                  name="license-key-area"
-            </div>
+                  placeholder="Paste licence key here"
-          </form>
+                  class="clr-textarea"
-        </clr-tab-content>
+                ></textarea>
-      </clr-tab>
+              </div>
-    </clr-tabs>
+            </form>
 
-    <button
+            <form class="clr-form activation-key-form">
-      (click)="applyKeys()"
+              <p>Activation key:</p>
-      class="btn btn-primary apply-keys"
+              <div class="clr-control-container">
-      [clrLoading]="applyingKeys"
+                <textarea
-      [disabled]="disableApplyButton"
+                  [(ngModel)]="activationKeyValue"
-    >
+                  (mouseleave)="trimKeys()"
-      Apply licence keys
+                  name="activation-key-area"
-    </button>
+                  placeholder="Paste activation key here"
+                  class="clr-textarea"
+                ></textarea>
+              </div>
+            </form>
+          </clr-tab-content>
+        </clr-tab>
+      </clr-tabs>
+    </div>
 
-    <button
+    <div class="card-footer d-flex clr-align-items-center">
-      *ngIf="isAppFreeTier.value"
+      <button
-      routerLink="/"
+        (click)="applyKeys()"
-      class="btn btn-sm btn-link"
+        class="btn btn-primary apply-keys"
-    >
+        [clrLoading]="applyingKeys"
-      Continue with free tier
+        [disabled]="disableApplyButton"
-    </button>
+      >
+        Apply licence keys
+      </button>
+
+      <button
+        *ngIf="isAppFreeTier.value"
+        routerLink="/"
+        class="btn btn-sm btn-link"
+      >
+        Continue with free tier
+      </button>
+    </div>
   </div>
 </div>
 

client/src/app/licensing/licensing.component.scss

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

client/src/app/licensing/licensing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core'
+import { CommonModule } from '@angular/common'
+
+import { LicensingRoutingModule } from './licensing-routing.module'
+import { ClarityModule } from '@clr/angular'
+import { SharedModule } from '../shared/shared.module'
+import { LicensingComponent } from './licensing.component'
+import { FormsModule } from '@angular/forms'
+
+@NgModule({
+  declarations: [LicensingComponent],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ClarityModule,
+    LicensingRoutingModule,
+    SharedModule
+  ]
+})
+export class LicensingModule {}

client/src/app/lineage/lineage.component.html

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

client/src/app/lineage/lineage.component.scss

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

client/src/app/lineage/lineage.component.ts

@@ -656,11 +656,10 @@ export class LineageComponent {
           this.flatdata = res.flatdata
 
           if (this.libraryList) {
-            let libraryToSelect = this.libraryList.find(
+            let libraryToSelect = this.libraryList.find((library: any) =>
-              (library: any) =>
+              res.info[0]?.LIBURI?.toUpperCase()?.includes(
-                res.info[0]?.LIBURI?.toUpperCase()?.includes(
+                library?.LIBRARYID?.toUpperCase()
-                  library?.LIBRARYID?.toUpperCase()
+              )
-                )
             )
 
             let tableToSelect: any

client/src/app/metadata/metadata.component.html

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

client/src/app/metadata/metadata.component.scss

@@ -1,14 +1,27 @@
+::ng-deep body[cds-theme="dark"] {
+  .object-header:hover {
+    background-color: #405560;
+  }
+}
+
+::ng-deep body[cds-theme="light"] {
+  .objects-col {
+    background: white;
+  }
+
+  .object-header:hover {
+    background-color: #d8e3e9;
+  }
+}
 
 .objects-col{
   height: 75vh;
   overflow: scroll;
   border: 1px solid #cccccc;
-  background: white;
   border-radius: 4px;
 }
 
 .cols-head {
-  background: #fafafa;
   border: 1px solid #cccccc;
   padding: 10px;
   display: flex;
@@ -40,11 +53,13 @@
   margin-top: 5px;
 }
 .object-header{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
   padding-left: 3px;
   padding-right: 3px;
 }
 .object-header:hover{
-  background-color: #d8e3e9;
   border-radius: 3px;
 }
 .datagrid-host{

client/src/app/models/AppSettings.ts

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

client/src/app/models/ErrorBody.ts

@@ -0,0 +1,5 @@
+export interface ErrorBody {
+  message: string
+  details: any
+  raw: any
+}

client/src/app/models/FilterQuery.ts

@@ -6,6 +6,7 @@ export interface FilterClause {
   operators: string[]
   type: string
   value: any
+  valueVariable: boolean
   values: { formatted: string; unformatted: any }[]
   variable: string
 }

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

@@ -4,12 +4,12 @@ import { DQData, SASParam } from '../TableData'
 import { BaseSASResponse } from './common/BaseSASResponse'
 import { DataFormat } from './common/DateFormat'
 
-export interface EditorsGetdataServiceResponse {
+export interface EditorsGetDataServiceResponse {
-  data: EditorsGetdataSASResponse
+  data: EditorsGetDataSASResponse
   libds: string
 }
 
-export interface EditorsGetdataSASResponse extends BaseSASResponse {
+export interface EditorsGetDataSASResponse extends BaseSASResponse {
   $sasdata: $DataFormats
   sasdata: Sasdata[]
   sasparams: SASParam[]
@@ -17,6 +17,7 @@ export interface EditorsGetdataSASResponse extends BaseSASResponse {
   dqrules: DQRule[]
   dsmeta: DSMeta[]
   dqdata: DQData[]
+  versions: Version[]
   cols: Col[]
   maxvarlengths: Maxvarlength[]
   xl_rules: any[]
@@ -27,6 +28,18 @@ export interface DSMeta {
   ODS_TABLE: string
   NAME: string
   VALUE: string
+  [key: string]: string
+}
+
+export interface Version {
+  LOAD_REF: string
+  USER_NM: string
+  VERSION_DTTM: string
+  VERSION_DESC: string
+  CHANGED_RECORDS: number
+  NEW_RECORDS: number
+  DELETED_RECORDS: number
+  [key: string]: string | number
 }
 
 export interface Sasdata {

client/src/app/models/sas/editors-restore.model.ts

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

client/src/app/query/query.component.html

@@ -143,7 +143,6 @@
                   (ngModelChange)="
                     setVariableOperator(queryIndex, query.operator, clauseIndex)
                   "
-                  class="mt-2"
                   clrSelect
                 >
                   <option *ngFor="let opr of query.operators">{{ opr }}</option>
@@ -413,7 +412,10 @@
 >
   <app-soft-select
     label="Value"
+    [secondLabel]="'Variable'"
+    [emitOnlySelected]="query.valueVariable"
     [inputId]="'vals_' + queryIndex + '_' + clauseIndex"
+    (selectedLabelChange)="selectedLabelChange($event, query)"
     [(value)]="query.value"
     [enableLoadMore]="query.nobs > query.values.length"
     (onInputEvent)="
@@ -423,9 +425,19 @@
       onAutocompleteLoadingMore($event, query.variable, queryIndex, clauseIndex)
     "
   >
-    <option [value]="column.unformatted" *ngFor="let column of query.values">
+    <div *ngIf="!query.valueVariable">
-      {{ column.formatted.trim() }}
+      <option [value]="column.unformatted" *ngFor="let column of query.values">
-    </option>
+        {{ column.formatted.trim() }}
+      </option>
+    </div>
+
+    <div *ngIf="query.valueVariable">
+      <ng-container *ngFor="let column of cols">
+        <option [value]="column.NAME" *ngIf="column.TYPE === query.type">
+          {{ column.NAME }}
+        </option>
+      </ng-container>
+    </div>
   </app-soft-select>
 </ng-template>
 

client/src/app/query/query.component.scss

@@ -1,3 +1,25 @@
+::ng-deep {
+    body[cds-theme="dark"] {
+        .clause-logic {
+            background: #192a30;
+        }
+
+        .clause-query {
+            background: #263e48;
+        }
+    }
+
+    body[cds-theme="light"] {
+        .clause-logic {
+            background: #e9e9e9;
+        }
+
+        .clause-query {
+            background: #fbf8f8;
+        }
+    }
+}
+
 .content {
     display: flex;
 
@@ -9,13 +31,12 @@
             display: flex;
             justify-content: center;
             flex-direction: column;
-            background: #e9e9e9;
+
             padding: 15px;
         }
 
         .clause-query {
             padding: 30px 0px 20px 20px;
-            background: #fbf8f8;
             display: flex;
             justify-content: center;
             flex-direction: column;
@@ -220,8 +241,11 @@
     vertical-align: middle;
     margin: 0;
 }
-:not(pre) > code[class*="language-"], pre[class*="language-"] {
+
-    background-color: #fbf8f8;
+::ng-deep body[cds-theme="dark"] {
+    .line-numbers {
+        border-color: #989797 !important;
+    }
 }
 
 pre[class*="language-"] {

client/src/app/query/query.component.ts

@@ -95,6 +95,7 @@ export class QueryComponent
         variable: null,
         operator: null,
         value: null,
+        valueVariable: false,
         startrow: 0,
         rows: 0,
         nobs: 0,
@@ -137,6 +138,11 @@ export class QueryComponent
   public whereClause: string | undefined
   public logicOperators: Array<string> = ['AND', 'OR']
 
+  /**
+   * Temporary values array used in pickers
+   * because they need particular format to work
+   * before sending values to backend, values are parsed
+   */
   public queryDateTime: QueryDateTime[] = []
 
   public currentClauseIndex: number = -1
@@ -158,6 +164,11 @@ export class QueryComponent
     }
   }
 
+  /**
+   * Gets and sets temporary values selected with DATETIME or TIME picker
+   * Those values are used for picker to work with format it lieks
+   * Later before sending values to backend, values are parsed
+   */
   getQueryDateTime(clauseIndex: number, queryIndex: number): QueryDateTime {
     let existingQueryDateTime = this.queryDateTime.find(
       (x) => x.clauseIndex === clauseIndex && x.queryIndex === queryIndex
@@ -178,10 +189,30 @@ export class QueryComponent
     return existingQueryDateTime
   }
 
+  /**
+   * When toggling pickers feature we reset the temp picker values array
+   */
   usePickersChange() {
     this.queryDateTime = []
+    if (this.usePickers) {
+      this.clauses.queryObj.forEach((queryObj: any) => {
+        queryObj.elements.forEach((element: any) => {
+          const isDateOrTime = ['DATETIME', 'TIME', 'DATE'].includes(
+            element.ddtype
+          )
+
+          if (isDateOrTime && element.valueVariable) {
+            element.value = ''
+            element.valueVariable = false
+          }
+        })
+      })
+    }
   }
 
+  /**
+   * Resets all variables used for filtering
+   */
   public resetFilter() {
     this.whereString = undefined
     this.whereClause = undefined
@@ -210,6 +241,10 @@ export class QueryComponent
     this.whereClauseFn(true)
   }
 
+  /**
+   * `Globals` are used to store filtering state (variables) as a caching feature
+   * until browser reloads
+   */
   public setToGlobals() {
     if (!this.caching) return
 
@@ -233,10 +268,12 @@ export class QueryComponent
       get(globals, objPath).filter.libds = this.libds
     }
     get(globals, objPath).filter.clauses = this.clauses
-
-    console.log('globals', globals)
   }
 
+  /**
+   * `Globals` are used to store filtering state (variables) as a caching feature
+   * until browser reloads
+   */
   public getFromGlobals() {
     if (!this.caching) return
 
@@ -269,6 +306,11 @@ export class QueryComponent
     }
   }
 
+  /**
+   * Sets filtering multiple caluses group logic (and / or)
+   *
+   * @param groupLogic to set
+   */
   public setGroupLogic(groupLogic: any) {
     this.groupLogic = groupLogic
     this.clauses.groupLogic = groupLogic
@@ -721,6 +763,12 @@ export class QueryComponent
     )
   }
 
+  public selectedLabelChange(label: string, query: any) {
+    query.valueVariable = label === 'Variable'
+    query.value = ''
+    this.whereClauseFn()
+  }
+
   public variableInputChange(
     queryVariable: any,
     index: number,
@@ -830,17 +878,25 @@ export class QueryComponent
    */
   public hasInvalidCluase(clauses: any): boolean {
     for (let clause of clauses) {
+      clause['invalidClause'] = false
+
       if (
-        clause.variable === null ||
+        clause.value === '' &&
-        clause.operator === null ||
+        !(clause.operator === 'NE' || clause.operator === 'CONTAINS')
-        clause.value === null ||
+      ) {
-        clause.value === ''
+        clause['invalidClause'] = true
+
+        return true
+      }
+
+      if (
+        clause.variable === null ||
+        clause.operator === null ||
+        clause.value === null
       ) {
         clause['invalidClause'] = true
 
         return true
-      } else {
-        clause['invalidClause'] = false
       }
     }
 

client/src/app/review/approve-details/approve-details.component.html

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

client/src/app/review/approve-details/approve-details.component.scss

@@ -1,3 +1,5 @@
+@import '../../../colors.scss';
+
 .loader {
   display:flex;
   justify-content: center;
@@ -10,19 +12,48 @@
 }
 
 .addedRow {
-  background:  rgb(146, 208, 154);
   border: 1px solid rgba(9, 77, 117, 0.2);
   border-radius: 5px;
 }
 
 .deletedRow {
-  background: rgb(230, 179, 179);
   border: 1px solid rgba(70, 71, 70, 0.2);
   border-radius: 5px;
 }
 
+::ng-deep body[cds-theme="dark"] {
+  table {
+    .updatedRow {
+      background: #93971e;
+    }
+
+    .addedRow {
+      background:  rgb(86 153 95);
+    }
+
+    .deletedRow {
+      background: rgb(138 90 90);
+    }
+  }
+}
+
+::ng-deep body[cds-theme="light"] {
+  table {
+    .updatedRow {
+      background: #fafda8;
+    }
+
+    .addedRow {
+      background:  rgb(146, 208, 154);
+    }
+
+    .deletedRow {
+      background: rgb(230, 179, 179);
+    }
+  }
+}
+
 .updatedRow {
-  background: #fafda8;
   border: 1px solid rgba(9, 117, 9, 0.2);
   border-radius: 5px;
 }
@@ -45,7 +76,7 @@ background: rgba(252, 135, 120, 0.4);
     font-size: .54167rem;
     font-weight: 400;
     letter-spacing: normal;
-    background: #314351;
+    background: $headerBackground;
     border-radius: .125rem;
     color: #f0f1ec;;
     line-height: .75rem;
@@ -68,8 +99,8 @@ background: rgba(252, 135, 120, 0.4);
     top: auto;
     right: auto;
     content: "";
-    border-left: .25rem solid #314351;
+    border-left: .25rem solid $headerBackground;
-    border-top: .20833rem solid #314351;
+    border-top: .20833rem solid $headerBackground;
     border-right: .25rem solid transparent;
     border-bottom: .20833rem solid transparent;
 }
@@ -79,8 +110,8 @@ border: 0px solid;
 }
 
 .toggle-switch input[type=checkbox]:checked+label:before {
-    border-color: #314351;
+    border-color: $headerBackground;
-    background-color: #314351!important;
+    background-color: $headerBackground !important;
     transition: .15s ease-in;
     transition-property: border-color,background-color;
 }
@@ -140,7 +171,7 @@ border: 0px solid;
 .tooll {
     position: absolute;
     background: #e6b3b3;
-    color: #314351;
+    color: $headerBackground;
     top: 0px;
     height: 36px;
     width: 100%;

client/src/app/review/approve-details/approve-details.component.ts

@@ -1,13 +1,13 @@
 import { ActivatedRoute } from '@angular/router'
-import { SasStoreService } from '../services/sas-store.service'
+import { SasStoreService } from '../../services/sas-store.service'
 import { Component, AfterViewInit, OnDestroy } from '@angular/core'
 import { Subscription } from 'rxjs'
 import { Router } from '@angular/router'
-import { EventService } from '../services/event.service'
+import { EventService } from '../../services/event.service'
 import {
   AuditorsPostdataSASResponse,
   Param
-} from '../models/sas/auditors-postdata.model'
+} from '../../models/sas/auditors-postdata.model'
 
 interface ChangesObj {
   ind: any
@@ -89,7 +89,7 @@ export class ApproveDetailsComponent implements AfterViewInit, OnDestroy {
   }
 
   public goToApprovalsList() {
-    this.route.navigateByUrl('/approve')
+    this.route.navigateByUrl('/review/approve')
   }
 
   public getTable(tableId: any) {
@@ -136,7 +136,7 @@ export class ApproveDetailsComponent implements AfterViewInit, OnDestroy {
     await this.sasStoreService
       .rejecting(rejParams, 'BrowserParams', 'approvers/rejection')
       .then((res: any) => {
-        this.route.navigateByUrl('/history')
+        this.route.navigateByUrl('/review/history')
       })
       .catch((err: any) => {
         this.acceptLoading = false
@@ -156,7 +156,7 @@ export class ApproveDetailsComponent implements AfterViewInit, OnDestroy {
     await this.sasStoreService
       .approveTable(approveParams, 'SASControlTable', 'auditors/postdata')
       .then((res: any) => {
-        this.route.navigateByUrl('/history')
+        this.route.navigateByUrl('/review/history')
       })
       .catch((err: any) => {
         this.acceptLoading = false
@@ -164,7 +164,7 @@ export class ApproveDetailsComponent implements AfterViewInit, OnDestroy {
   }
 
   public goToSubmitList() {
-    this.route.navigateByUrl('/submitted')
+    this.route.navigateByUrl('/review/submitted')
   }
 
   public async callChangesInfo(tableId: any) {

client/src/app/review/approve/approve.component.html

@@ -99,19 +99,11 @@
             </clr-dg-cell>
           </clr-dg-row>
 
-          <clr-dg-footer class="d-flex justify-content-start">
+          <clr-dg-footer>
-            <span>items per page</span>
+            <clr-dg-pagination #pagination [clrDgPageSize]="10">
-            <select [(ngModel)]="itemsNum">
+              <clr-dg-page-size [clrPageSizeOptions]="[3, 5, 10, 15]"
-              <option [ngValue]="3">3</option>
+                >Items per page</clr-dg-page-size
-              <option [ngValue]="5">5</option>
+              >
-              <option [ngValue]="10">10</option>
-              <option [ngValue]="15">15</option>
-            </select>
-            <clr-dg-pagination
-              #pagination
-              [clrDgPageSize]="itemsNum"
-              class="center"
-            >
               {{ pagination.firstItem + 1 }} - {{ pagination.lastItem + 1 }} of
               {{ pagination.totalItems }} approvals
             </clr-dg-pagination>

client/src/app/review/approve/approve.component.scss

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

client/src/app/review/approve/approve.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit, ChangeDetectorRef } from '@angular/core'
-import { SasStoreService } from '../services/sas-store.service'
+import { SasStoreService } from '../../services/sas-store.service'
 import { Router } from '@angular/router'
-import { SasService } from '../services/sas.service'
+import { SasService } from '../../services/sas.service'
-import { EventService } from '../services/event.service'
+import { EventService } from '../../services/event.service'
 
 interface ApproveData {
   tableId: string
@@ -45,7 +45,7 @@ export class ApproveComponent implements OnInit {
     if (this.approveList !== undefined) {
       this.tableId = this.approveList[ind].tableId
       this.route.navigateByUrl(
-        'approve/approveDet/' + this.approveList[ind].tableId
+        'review/approveDet/' + this.approveList[ind].tableId
       )
     }
   }

client/src/app/review/history/history.component.html

@@ -72,7 +72,7 @@
       >
         To unlock more than
         {{ licenceState.value.history_rows_allowed }} records, contact
-        support@datacontroller.io
+        support@datacontroller.io
       </p>
     </div>
 

client/src/app/review/history/history.component.ts

@@ -1,11 +1,13 @@
 import { Component, OnInit } from '@angular/core'
 
-import { SasStoreService } from '../services/sas-store.service'
 import { Router } from '@angular/router'
-import { SasService } from '../services/sas.service'
-import { EventService } from '../services/event.service'
 import { SASjsConfig } from '@sasjs/adapter'
-import { LicenceService } from '../services/licence.service'
+import {
+  LicenceService,
+  SasStoreService,
+  EventService,
+  SasService
+} from 'src/app/services'
 
 @Component({
   selector: 'app-history',

client/src/app/review/review-routing.module.ts

@@ -0,0 +1,22 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { RouterModule, Routes } from '@angular/router'
+import { ApproveDetailsComponent } from './approve-details/approve-details.component'
+import { ApproveComponent } from './approve/approve.component'
+import { SubmitterComponent } from './submitter/submitter.component'
+import { HistoryComponent } from './history/history.component'
+
+const ROUTES: Routes = [
+  { path: 'approve', component: ApproveComponent },
+  { path: 'approveDet/:tableId', component: ApproveDetailsComponent },
+  { path: 'submitted', component: SubmitterComponent },
+  { path: 'submitted/:tableId', component: SubmitterComponent },
+  { path: 'history', component: HistoryComponent }
+]
+
+@NgModule({
+  declarations: [],
+  imports: [CommonModule, RouterModule.forChild(ROUTES)],
+  exports: [RouterModule]
+})
+export class ReviewRoutingModule {}

client/src/app/review/review.module.ts

@@ -0,0 +1,31 @@
+import { CommonModule } from '@angular/common'
+import { NgModule } from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { ClarityModule } from '@clr/angular'
+import { HotTableModule } from '@handsontable/angular'
+import { DirectivesModule } from '../directives/directives.module'
+import { SharedModule } from '../shared/shared.module'
+import { ApproveDetailsComponent } from './approve-details/approve-details.component'
+import { ApproveComponent } from './approve/approve.component'
+import { ReviewRoutingModule } from './review-routing.module'
+import { SubmitterComponent } from './submitter/submitter.component'
+import { HistoryComponent } from './history/history.component'
+
+@NgModule({
+  declarations: [
+    ApproveComponent,
+    ApproveDetailsComponent,
+    SubmitterComponent,
+    HistoryComponent
+  ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReviewRoutingModule,
+    ClarityModule,
+    HotTableModule.forRoot(),
+    DirectivesModule,
+    SharedModule
+  ]
+})
+export class ReviewModule {}

client/src/app/review/submitter/submitter.component.html

@@ -86,19 +86,11 @@
               </clr-dg-cell>
             </clr-dg-row>
 
-            <clr-dg-footer class="d-flex justify-content-start">
+            <clr-dg-footer>
-              <span>items per page</span>
+              <clr-dg-pagination #pagination [clrDgPageSize]="10">
-              <select [(ngModel)]="itemsNum">
+                <clr-dg-page-size [clrPageSizeOptions]="[3, 5, 10, 15]"
-                <option [ngValue]="3">3</option>
+                  >Items per page</clr-dg-page-size
-                <option [ngValue]="5">5</option>
+                >
-                <option [ngValue]="10">10</option>
-                <option [ngValue]="15">15</option>
-              </select>
-              <clr-dg-pagination
-                #pagination
-                [clrDgPageSize]="itemsNum"
-                class="center"
-              >
                 {{ pagination.firstItem + 1 }} -
                 {{ pagination.lastItem + 1 }} of
                 {{ pagination.totalItems }} submissions

client/src/app/review/submitter/submitter.component.scss

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

client/src/app/review/submitter/submitter.component.ts

@@ -1,9 +1,7 @@
 import { Component, AfterViewInit, OnInit } from '@angular/core'
 import { Subscription } from 'rxjs'
-import { SasStoreService } from '../services/sas-store.service'
 import { ActivatedRoute, Router } from '@angular/router'
-import { SasService } from '../services/sas.service'
+import { SasStoreService, EventService, SasService } from '../../services'
-import { EventService } from '../services/event.service'
 
 interface SubmitterData {
   tableId: string
@@ -46,7 +44,7 @@ export class SubmitterComponent implements OnInit, AfterViewInit {
   }
 
   public goToDetails(table_id: any) {
-    this.router.navigateByUrl('/submitted/' + table_id)
+    this.router.navigateByUrl('/review/submitted/' + table_id)
   }
 
   public getDetails(sub: any, index: any) {

client/src/app/role/role.component.html

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