fix: validate pasted values

## [7.8.2](https://git.datacontroller.io/dc/dc/compare/v7.8.1...v7.8.2) (2026-05-20)

### Bug Fixes

* bumping ws package ([2382a55](2382a559a5))
* enabling version restore for non admin users ([5d889d8](5d889d824c))

.gitea/workflows/build.yaml

@@ -3,7 +3,7 @@ run-name: Running Lint Check and Licence checker on Pull Request
 on: [pull_request]
 
 env:
-  NODE_VERSION: '24.5.0'
+  NODE_VERSION: '24.15.0'
 
 jobs:
   Build-and-ng-test:
@@ -31,7 +31,10 @@ jobs:
         run: |
           cd client
           # Decrypt and Install sheet
-          echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
+          echo "${{ secrets.SHEET_PWD }}" | \
+            gpg --batch --yes --passphrase-fd 0 \
+            --output ./libraries/sheet-crypto.tgz \
+            --decrypt ./libraries/sheet-crypto.tgz.gpg
           npm ci
 
       - name: Check audit
@@ -139,6 +142,7 @@ jobs:
       - name: Zip Cypress videos
         if: always()
         run: |
+          mkdir -p ./client/cypress/videos
           zip -r cypress-videos ./client/cypress/videos
 
       - name: Add cypress videos artifacts

.gitea/workflows/lighthouse.yaml

@@ -3,7 +3,7 @@ run-name: Running Lighthouse Performance and Accessibility Checks on Pull Reques
 on: [pull_request]
 
 env:
-  NODE_VERSION: '24.5.0'
+  NODE_VERSION: '24.15.0'
 
 jobs:
   lighthouse:
@@ -48,7 +48,10 @@ jobs:
         run: |
           cd client
           # Decrypt and Install sheet
-          echo ${{ secrets.SHEET_PWD }} | gpg --batch --yes --passphrase-fd 0 ./libraries/sheet-crypto.tgz.gpg
+          echo "${{ secrets.SHEET_PWD }}" | \
+            gpg --batch --yes --passphrase-fd 0 \
+            --output ./libraries/sheet-crypto.tgz \
+            --decrypt ./libraries/sheet-crypto.tgz.gpg
           npm ci
           npm install -g replace-in-files-cli
 

.gitea/workflows/release.yaml

@@ -142,6 +142,7 @@ jobs:
       - name: Zip Cypress videos
         if: always()
         run: |
+          mkdir -p ./client/cypress/videos
           zip -r cypress-videos ./client/cypress/videos
 
       - name: Add cypress videos artifacts

.npmrc

@@ -1,3 +1,4 @@
 legacy-peer-deps=true
 ignore-scripts=true
 save-exact=true
+fund=false

CHANGELOG.md

@@ -1,3 +1,75 @@
+## [7.8.2](https://git.datacontroller.io/dc/dc/compare/v7.8.1...v7.8.2) (2026-05-20)
+
+
+### Bug Fixes
+
+* bumping ws package ([2382a55](https://git.datacontroller.io/dc/dc/commit/2382a559a5ac32b0f815776a90207650d5809ba6))
+* enabling version restore for non admin users ([5d889d8](https://git.datacontroller.io/dc/dc/commit/5d889d824cc2f8e4ea089cbb578453125dc4ba6c))
+
+## [7.8.1](https://git.datacontroller.io/dc/dc/compare/v7.8.0...v7.8.1) (2026-05-15)
+
+
+### Bug Fixes
+
+* **sasjs:** enable runAsTask ([f1a26e1](https://git.datacontroller.io/dc/dc/commit/f1a26e132eba7fa2ac64754940b52ea46c6619b3))
+
+# [7.8.0](https://git.datacontroller.io/dc/dc/compare/v7.7.3...v7.8.0) (2026-05-15)
+
+
+### Bug Fixes
+
+* enabling DSN=*ALL* in MPE_SECURITY ([7d94cb2](https://git.datacontroller.io/dc/dc/commit/7d94cb2ae4a3f6c1fa1011ae0fced7083a2f2793))
+* providing default values for RULE_ACTIVE on MPE_VALIDATIONS ([f031b4e](https://git.datacontroller.io/dc/dc/commit/f031b4eb8925397e60dcc739a721cfbbb6da8dff))
+* switch away from api usage for CASLIB metadata ([ce921a0](https://git.datacontroller.io/dc/dc/commit/ce921a032a8970b8078a463a41da884e1fa71bc3))
+* use correct debug param for runAsTask ([bb80476](https://git.datacontroller.io/dc/dc/commit/bb8047676749814d3b86eea666726dbe4bf5f270))
+
+
+### Features
+
+* add runAsTask config attribute parser ([1635bc9](https://git.datacontroller.io/dc/dc/commit/1635bc9c451bc221f386241007f594096f114b4f))
+* enabling *ALL* option by default in MPE_SECURITY (DSN col) ([93d4ab6](https://git.datacontroller.io/dc/dc/commit/93d4ab65acce7b5b35e448146f9893964ad2cca3))
+
+## [7.7.3](https://git.datacontroller.io/dc/dc/compare/v7.7.2...v7.7.3) (2026-05-12)
+
+
+### Bug Fixes
+
+* move cas session assign to settings.sas and abort when lib is unassigned ([65f0b97](https://git.datacontroller.io/dc/dc/commit/65f0b979a401277b3e070d409659ae3fae2ff8c0))
+
+## [7.7.2](https://git.datacontroller.io/dc/dc/compare/v7.7.1...v7.7.2) (2026-05-07)
+
+
+### Bug Fixes
+
+* **client:** bundle Metropolis font locally to satisfy CSP ([9546fcd](https://git.datacontroller.io/dc/dc/commit/9546fcd6312f3e81f746ef6e32ef398810ed434a))
+* **client:** clear angular build cache on font strip to avoid stale dist ([503cb08](https://git.datacontroller.io/dc/dc/commit/503cb08b2fa40397434189f9c20eff3358eb7010))
+* **client:** postinstall removal of Metropolis [@font-face](https://git.datacontroller.io/font-face) from @clr/ui ([e6397ce](https://git.datacontroller.io/dc/dc/commit/e6397cecc13afe2a9238bdfb2b4b9b81f38d055c))
+* **client:** serve text-security-disc font locally ([80ce80e](https://git.datacontroller.io/dc/dc/commit/80ce80ece40012e59c7cd0340b4aa9a9aca46443))
+* **editor:** preserve numeric type for SAS num cols with static SOFTSELECT/HARDSELECT ([05a3289](https://git.datacontroller.io/dc/dc/commit/05a328976ea3d1d6ef7559850369aa580f0d067f))
+
+## [7.7.1](https://git.datacontroller.io/dc/dc/compare/v7.7.0...v7.7.1) (2026-05-05)
+
+
+### Bug Fixes
+
+* **client:** bump adapter ([d26f7d2](https://git.datacontroller.io/dc/dc/commit/d26f7d2511008634124c7d6fde115abb43db9c43))
+* **sas:** bump cli ([d60029d](https://git.datacontroller.io/dc/dc/commit/d60029deae0ec21f3b8570461e2a4ca041d58f72))
+
+# [7.7.0](https://git.datacontroller.io/dc/dc/compare/v7.6.0...v7.7.0) (2026-05-04)
+
+
+### Bug Fixes
+
+* bump adapter to 4.16.6 ([1707f38](https://git.datacontroller.io/dc/dc/commit/1707f3802a97de8c659f1a88c92fc917e8a30615))
+* remove data:image/svg+xml CSP violation, use class instead changing style directly ([d66eb5d](https://git.datacontroller.io/dc/dc/commit/d66eb5dfc2dbb01f1e6c0c7d15fc2ad2a39dd829))
+* remove WORK, SASUSER and CASUSER as library options.  [#224](https://git.datacontroller.io/dc/dc/issues/224) ([ec66631](https://git.datacontroller.io/dc/dc/commit/ec66631a33aabb8ab2f92fe22c15440127085782))
+
+
+### Features
+
+* auto-save CAS tables [#224](https://git.datacontroller.io/dc/dc/issues/224) ([40d04a5](https://git.datacontroller.io/dc/dc/commit/40d04a53c4c00183116bdbd08397e0f2ffb1f578))
+* autoload CAS tables. [#224](https://git.datacontroller.io/dc/dc/issues/224) ([d5ebb01](https://git.datacontroller.io/dc/dc/commit/d5ebb01ce381f5f4ec06de041f3ab9e632c02e43))
+
 # [7.6.0](https://git.datacontroller.io/dc/dc/compare/v7.5.0...v7.6.0) (2026-04-03)
 
 

client/angular.json

@@ -62,7 +62,8 @@
               {
                 "glob": "**/*",
                 "input": "src/images",
-                "output": "images"
+                "output": "images",
+                "ignore": ["spinner.svg", "caret.svg"]
               }
             ],
             "styles": ["src/styles.scss"],

client/cypress.config.ts

@@ -1,13 +1,13 @@
-import { defineConfig } from "cypress";
+import { defineConfig } from 'cypress'
 
 export default defineConfig({
-  reporter: "mochawesome",
+  reporter: 'mochawesome',
 
   reporterOptions: {
-    reportDir: "cypress/results",
+    reportDir: 'cypress/results',
     overwrite: false,
     html: true,
-    json: false,
+    json: false
   },
   viewportHeight: 900,
   viewportWidth: 1600,
@@ -16,24 +16,25 @@ export default defineConfig({
   defaultCommandTimeout: 30000,
 
   env: {
-    hosturl: "http://localhost:4200",
-    appLocation: "",
-    site_id_SAS9: "70221618",
-    site_id_SASVIYA: "70253615",
-    site_id_SASJS: "123",
-    serverType: "SASJS",
-    libraryToOpenIncludes_SASVIYA: "viya",
-    libraryToOpenIncludes_SAS9: "dc",
-    libraryToOpenIncludes_SASJS: "dc",
+    hosturl: 'http://localhost:4200',
+    appLocation: '',
+    site_id_SAS9: '70221618',
+    site_id_SASVIYA: '70253615',
+    site_id_SASJS: '123',
+    serverType: 'SASJS',
+    libraryToOpenIncludes_SASVIYA: 'viya',
+    libraryToOpenIncludes_SAS9: 'dc',
+    libraryToOpenIncludes_SASJS: 'dc',
     debug: false,
     screenshotOnRunFailure: false,
     longerCommandTimeout: 50000,
-    testLicenceUserLimits: false,
+    testLicenceUserLimits: false
   },
 
   e2e: {
+    video: true,
     setupNodeEvents(on, config) {
       // implement node event listeners here
-    },
-  },
-});
+    }
+  }
+})

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-wrapper@16.0.1;handsontable@^16.0.1;handsontable@16.2.0;hyperformula@2.7.1;hyperformula@3.0.0;hyperformula@3.1.0;jackspeak@3.4.3;path-scurry@1.11.1;package-json-from-dist@1.0.1'
+          '@cds/city@1.1.0;@handsontable/angular-wrapper@16.0.1;handsontable@^16.0.1;handsontable@16.2.0;hyperformula@2.7.1;hyperformula@3.0.0;hyperformula@3.1.0;hyperformula@3.2.0;jackspeak@3.4.3;path-scurry@1.11.1;package-json-from-dist@1.0.1'
       },
       (error, json) => {
         if (error) {

client/package.json

@@ -23,7 +23,7 @@
     "watch": "ng test watch=true",
     "pree2e": "webdriver-manager update",
     "e2e": "protractor protractor.config.js",
-    "postinstall": "node ./src/version.ts && npm run add-githook",
+    "postinstall": "node ./src/version.ts && npm run add-githook && node ./scripts/strip-clr-base64-fonts.mjs",
     "add-githook": "[ -d ../.git ] && git config core.hooksPath ./.git-hooks || true",
     "cypress": "cypress open",
     "cy:run": "cypress run",
@@ -37,21 +37,21 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^19.2.18",
+    "@angular/animations": "^19.2.20",
     "@angular/cdk": "^19.2.19",
-    "@angular/common": "^19.2.18",
-    "@angular/compiler": "^19.2.18",
-    "@angular/core": "^19.2.18",
-    "@angular/forms": "^19.2.18",
-    "@angular/platform-browser": "^19.2.18",
-    "@angular/platform-browser-dynamic": "^19.2.18",
-    "@angular/router": "^19.2.18",
+    "@angular/common": "^19.2.20",
+    "@angular/compiler": "^19.2.20",
+    "@angular/core": "^19.2.20",
+    "@angular/forms": "^19.2.20",
+    "@angular/platform-browser": "^19.2.20",
+    "@angular/platform-browser-dynamic": "^19.2.20",
+    "@angular/router": "^19.2.20",
     "@cds/core": "^6.15.1",
     "@clr/angular": "file:libraries/clr-angular-17.9.0.tgz",
     "@clr/icons": "^13.0.2",
     "@clr/ui": "file:libraries/clr-ui-17.9.0.tgz",
     "@handsontable/angular-wrapper": "16.0.1",
-    "@sasjs/adapter": "^4.16.3",
+    "@sasjs/adapter": "^4.17.0",
     "@sasjs/utils": "^3.5.3",
     "@sheet/crypto": "file:libraries/sheet-crypto.tgz",
     "@types/d3-graphviz": "^2.6.7",
@@ -86,18 +86,18 @@
     "zone.js": "~0.15.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^19.2.19",
+    "@angular-devkit/build-angular": "^19.2.24",
     "@angular-eslint/builder": "19.8.1",
     "@angular-eslint/eslint-plugin": "19.8.1",
     "@angular-eslint/eslint-plugin-template": "19.8.1",
     "@angular-eslint/schematics": "19.8.1",
     "@angular-eslint/template-parser": "19.8.1",
-    "@angular/cli": "^19.2.19",
-    "@angular/compiler-cli": "^19.2.18",
+    "@angular/cli": "^19.2.24",
+    "@angular/compiler-cli": "^19.2.20",
     "@babel/plugin-proposal-private-methods": "^7.18.6",
-    "@compodoc/compodoc": "^1.1.21",
+    "@compodoc/compodoc": "^1.2.1",
     "@cypress/webpack-preprocessor": "^5.17.1",
-    "@lhci/cli": "^0.12.0",
+    "@lhci/cli": "^0.15.1",
     "@types/core-js": "^2.5.5",
     "@types/crypto-js": "^4.2.1",
     "@types/es6-shim": "^0.31.39",
@@ -105,15 +105,15 @@
     "@types/lodash-es": "^4.17.3",
     "@types/marked": "^4.3.0",
     "@types/node": "12.20.50",
-    "@typescript-eslint/eslint-plugin": "^5.29.0",
-    "@typescript-eslint/parser": "^5.29.0",
+    "@typescript-eslint/eslint-plugin": "8.31.1",
+    "@typescript-eslint/parser": "8.31.1",
     "core-js": "^2.5.4",
-    "cypress": "12.17.1",
+    "cypress": "^15.14.2",
     "cypress-file-upload": "^5.0.8",
     "cypress-plugin-tab": "^1.0.5",
     "cypress-real-events": "^1.8.1",
     "es6-shim": "^0.35.5",
-    "eslint": "^8.33.0",
+    "eslint": "8.57.1",
     "git-describe": "^4.0.4",
     "jasmine-core": "~5.1.2",
     "karma": "~6.4.3",
@@ -132,5 +132,8 @@
     "typescript": "~5.8.3",
     "wait-on": "^6.0.1",
     "watch": "^1.0.2"
+  },
+  "overrides": {
+    "ajv": "8.18.0"
   }
 }

client/scripts/strip-clr-base64-fonts.mjs

@@ -0,0 +1,59 @@
+import { readFileSync, writeFileSync, statSync, rmSync, existsSync } from 'fs'
+import { resolve } from 'path'
+
+/**
+ * Remove Clarity's Metropolis @font-face blocks from clr-ui.min.css.
+ *
+ * Why: Clarity ships Metropolis as base64 data: URLs. The deployed app
+ * runs under CSP `default-src 'self'` (no data: font-src), so every page
+ * logs a font-load failure for each weight. Firefox preemptively
+ * validates every parsed src against CSP even when a later @font-face
+ * supersedes the rule at render time, so the only way to silence the
+ * console is to remove the offending blocks from the parsed CSS.
+ *
+ * Our styles.scss declares the same family/weight/style with same-origin
+ * .woff files, so removing Clarity's blocks entirely is safe and leaves
+ * Metropolis fully functional.
+ *
+ * Idempotent: matches by font-family, so works on a fresh install or a
+ * file that's already been stripped on a previous run.
+ */
+const target = resolve('node_modules/@clr/ui/clr-ui.min.css')
+
+let css
+try {
+  css = readFileSync(target, 'utf8')
+} catch (err) {
+  if (err.code === 'ENOENT') {
+    console.log(`skip: ${target} not found (likely pre-install run)`)
+    process.exit(0)
+  }
+  throw err
+}
+
+const sizeBefore = statSync(target).size
+const blockRe = /@font-face\{[^}]*Metropolis[^}]*\}/g
+const matches = css.match(blockRe) ?? []
+
+if (matches.length === 0) {
+  console.log(`already stripped: ${target}`)
+  process.exit(0)
+}
+
+const stripped = css.replace(blockRe, '')
+writeFileSync(target, stripped)
+const sizeAfter = Buffer.byteLength(stripped)
+console.log(
+  `removed ${matches.length} Metropolis @font-face block(s) from clr-ui.min.css ` +
+    `(${sizeBefore} -> ${sizeAfter} bytes, saved ${sizeBefore - sizeAfter})`
+)
+
+// Webpack 5's persistent cache treats node_modules as immutable
+// (snapshot.module.managedPaths default), so in-place edits don't
+// invalidate cached entries. Drop the Angular build cache so the next
+// build re-reads our stripped clr-ui.min.css.
+const cacheDir = resolve('.angular/cache')
+if (existsSync(cacheDir)) {
+  rmSync(cacheDir, { recursive: true, force: true })
+  console.log(`cleared ${cacheDir} (webpack persistent cache)`)
+}

client/src/app/app.component.ts

@@ -209,6 +209,7 @@ export class AppComponent {
       dcPath: getAppAttribute('dcPath') || '',
       debug: getAppAttribute('debug') === 'true' || false,
       useComputeApi: this.parseComputeApi(getAppAttribute('useComputeApi')),
+      runAsTask: getAppAttribute('runAsTask') === 'true' || false,
       contextName: getAppAttribute('contextName') || '',
       hotLicenceKey: getAppAttribute('hotLicenceKey') || ''
     }

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

@@ -373,7 +373,7 @@ export class AutomaticComponent implements OnInit {
     let contextname = `&_contextname=${params.contextName}`
     let admin = `&admin=${params.admin}`
     let dcPath = `&dcpath=${params.dcPath}`
-    let debug = `&_debug=131`
+    let debug = this.sasService.getDebugUrlParam()
 
     let programUrl =
       serverUrl +

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

@@ -251,7 +251,7 @@ export class ManualComponent implements OnInit {
           this.selectedAdminGroup +
           '&DCPATH=' +
           this.dcPath +
-          '&_debug=131'
+          this.sasService.getDebugUrlParam()
 
       window.open(url, '_blank')
 

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

@@ -2956,6 +2956,21 @@ export class EditorComponent implements OnInit, AfterViewInit, OnDestroy {
       }
     })
 
+    hot.addHook('afterPaste', (_data: any, coords: any) => {
+      // Trigger dynamic-source load + validation for pasted cells so HARDSELECT_HOOK
+      // rejects out-of-dropdown values (otherwise paste skips dynamicCellValidation).
+      const rows = new Set<number>()
+      for (const range of coords) {
+        for (let r = range.startRow; r <= range.endRow; r++) {
+          for (let c = range.startCol; c <= range.endCol; c++) {
+            this.dynamicCellValidation(r, c)
+            rows.add(r)
+          }
+        }
+      }
+      hot.validateRows([...rows])
+    })
+
     hot.addHook('afterRender', (isForced: boolean) => {
       this.eventService.dispatchEvent('resize')
 

client/src/app/services/sas-store.service.ts

@@ -155,13 +155,23 @@ export class SasStoreService {
       .adapterResponse
   }
 
+  private libsPromise: Promise<any> | null = null
+
   /**
    *
    * @returns All libraries
    */
-  public async viewLibs() {
-    return (await this.sasService.request('public/viewlibs', null))
-      .adapterResponse
+  public viewLibs() {
+    if (!this.libsPromise) {
+      this.libsPromise = this.sasService
+        .request('public/viewlibs', null)
+        .then((res: any) => res.adapterResponse)
+        .catch((err: any) => {
+          this.libsPromise = null
+          throw err
+        })
+    }
+    return this.libsPromise
   }
 
   public async refreshLibInfo(libref: string) {

client/src/app/services/sas.service.ts

@@ -641,6 +641,23 @@ export class SasService {
     this.sasjsAdapter.setDebugState(state)
   }
 
+  /**
+   * Returns the `&_debug=...` URL segment honoring the live adapter
+   * config. Empty string when debug is off. `128` on the Viya WEB JES path
+   * with `runAsTask` enabled, `131` otherwise.
+   */
+  public getDebugUrlParam(): string {
+    const config = this.sasjsAdapter.getSasjsConfig()
+    if (!config.debug) return ''
+    const value =
+      config.serverType === ServerType.SasViya &&
+      config.useComputeApi === null &&
+      config.runAsTask === true
+        ? 128
+        : 131
+    return `&_debug=${value}`
+  }
+
   public getSasjsInstance() {
     return this.sasjsAdapter
   }

client/src/app/shared/dc-validator/dc-validator.ts

@@ -284,10 +284,18 @@ export class DcValidator {
         )
 
         if (source.length > 0) {
+          // For SAS num cols keep type='numeric' so HOT's numericEditor /
+          // numericRenderer + numbro coercion stay alive — same per-column
+          // model as the per-cell pattern in
+          // editor.component.ts:reSetCellValidationValues().
           this.rules[i].source = source
-          this.rules[i].type = 'autocomplete'
           this.rules[i].editor = 'autocomplete.custom'
+          this.rules[i].renderer = 'autocomplete'
           this.rules[i].filter = false
+
+          if (this.rules[i].sasType !== 'num') {
+            this.rules[i].type = 'autocomplete'
+          }
         }
 
         if (this.hasDqRules(ruleColName, ['SOFTSELECT'])) {

client/src/app/shared/dc-validator/models/dc-validation.model.ts

@@ -10,6 +10,9 @@ export interface DcColumnSettings {
   valid?: boolean
   desc?: string
   clsRule?: string
+  // SAS-side column type from $dataFormats (e.g. 'num', 'char') — distinct
+  // from Handsontable's `type` which drives renderer/editor selection
+  sasType?: string
 }
 
 export interface DcValidation extends HotColumnSettings, DcColumnSettings {}

client/src/app/shared/dc-validator/tests/mergeSpecRules.spec.ts

@@ -38,11 +38,52 @@ describe('DC Validator - merge spec rules', () => {
         data: 'test_col',
         desc: 'test_desc',
         clsRule: 'cls_rule',
-        length: 8
+        length: 8,
+        sasType: 'test_type'
       }
     ]
 
     expect(mergeColsRules(cols, rules, $dataFormats)).toEqual(expected)
     expect(cols[0].TYPE).toEqual('test_type')
   })
+
+  it('should populate sasType for num and char cols', () => {
+    const rules: DcValidation[] = [{ data: 'num_col' }, { data: 'char_col' }]
+    const cols: Col[] = [
+      {
+        NAME: 'num_col',
+        MEMLABEL: '',
+        DESC: '',
+        LONGDESC: '',
+        TYPE: '',
+        CLS_RULE: '',
+        VARNUM: 0,
+        LABEL: '',
+        FMTNAME: '',
+        DDTYPE: ''
+      },
+      {
+        NAME: 'char_col',
+        MEMLABEL: '',
+        DESC: '',
+        LONGDESC: '',
+        TYPE: '',
+        CLS_RULE: '',
+        VARNUM: 0,
+        LABEL: '',
+        FMTNAME: '',
+        DDTYPE: ''
+      }
+    ]
+    const $dataFormats: any = {
+      vars: {
+        num_col: { format: 'best.', label: '', length: '8', type: 'num' },
+        char_col: { format: '$32.', label: '', length: '32', type: 'char' }
+      }
+    }
+
+    const merged = mergeColsRules(cols, rules, $dataFormats)
+    expect(merged.find((r) => r.data === 'num_col')?.sasType).toEqual('num')
+    expect(merged.find((r) => r.data === 'char_col')?.sasType).toEqual('char')
+  })
 })

client/src/app/shared/dc-validator/utils/mergeColsRules.ts

@@ -29,6 +29,7 @@ export const mergeColsRules = (
     if (rule && col.DESC) rule.desc = col.DESC
     if (rule && colFormats.length) rule.length = parseInt(colFormats.length)
     if (rule && col.CLS_RULE) rule.clsRule = col.CLS_RULE
+    if (rule && colFormats?.type) rule.sasType = colFormats.type
   }
 
   return rules

client/src/app/shared/sidebar/sidebar.component.ts

@@ -80,15 +80,13 @@ export class SidebarComponent implements OnInit {
   public resizeStart() {
     this.resizing = true
 
-    let body = document.getElementsByTagName('body')[0]
-    body.style.cssText = 'user-select: none'
+    document.body.classList.add('select-none')
   }
 
   public resizeEnd() {
     this.resizing = false
 
-    let body = document.getElementsByTagName('body')[0]
-    body.style.cssText = ''
+    document.body.classList.remove('select-none')
   }
 
   @HostListener('document:mousemove', ['$event'])

client/src/app/viewer/viewer.component.ts

@@ -769,18 +769,14 @@ export class ViewerComponent
       let ds = []
       ds = this.libDataset.split('.')
 
-      if (globals.viewer.startupSet) {
-        this.libraries = globals.viewer.libraries
-      } else {
-        await this.sasStoreService
-          .viewLibs()
-          .then((res: any) => {
-            this.libraries = res.saslibs
-          })
-          .catch((err: any) => {
-            this.loggerService.error(err)
-          })
-      }
+      await this.sasStoreService
+        .viewLibs()
+        .then((res: any) => {
+          this.libraries = res.saslibs
+        })
+        .catch((err: any) => {
+          this.loggerService.error(err)
+        })
 
       this.lib = ds[0]
 
@@ -815,18 +811,14 @@ export class ViewerComponent
       libDataset = this.libDataset
       this.libTab = libDataset
     } else {
-      if (globals.viewer.startupSet) {
-        this.libraries = globals.viewer.libraries
-      } else {
-        await this.sasStoreService
-          .viewLibs()
-          .then((res: any) => {
-            this.libraries = res.saslibs
-          })
-          .catch((err: any) => {
-            this.loggerService.error(err)
-          })
-      }
+      await this.sasStoreService
+        .viewLibs()
+        .then((res: any) => {
+          this.libraries = res.saslibs
+        })
+        .catch((err: any) => {
+          this.loggerService.error(err)
+        })
 
       if (typeof this.table !== 'undefined') {
         if (globals.viewer.startupSet) {

client/src/index.html

@@ -49,7 +49,8 @@
     serverType="SASJS"
     loginMechanism="Redirected"
     debug="false"
-    useComputeApi="true"
+    useComputeApi="null"
+    runAsTask="true"
     contextName="SAS Job Execution compute context"
     adminGroup="SASAdministrators"
     dcPath="/tmp/dc"

client/src/styles.scss

@@ -9,9 +9,39 @@
 
 @import './colors.scss';
 
+/* CSP: replace Clarity's base64 Metropolis @font-face srcs with same-origin files. */
+@font-face {
+  font-family: 'Metropolis';
+  src: url('./assets/fonts/Metropolis-200.woff') format('woff');
+  font-weight: 200;
+  font-style: normal;
+  font-display: swap;
+}
+@font-face {
+  font-family: 'Metropolis';
+  src: url('./assets/fonts/Metropolis-400.woff') format('woff');
+  font-weight: 400;
+  font-style: normal;
+  font-display: swap;
+}
+@font-face {
+  font-family: 'Metropolis';
+  src: url('./assets/fonts/Metropolis-500.woff') format('woff');
+  font-weight: 500;
+  font-style: normal;
+  font-display: swap;
+}
+@font-face {
+  font-family: 'Metropolis';
+  src: url('./assets/fonts/Metropolis-600.woff') format('woff');
+  font-weight: 600;
+  font-style: normal;
+  font-display: swap;
+}
+
 @font-face {
   font-family: text-security-disc;
-  src: url('https://raw.githubusercontent.com/noppa/text-security/master/dist/text-security-disc.woff');
+  src: url('./assets/fonts/text-security-disc.woff') format('woff');
 }
 
 // TODO: IMPORTANT CSP WOKRAROUND
@@ -1882,19 +1912,6 @@ app-query {
       }
   }
 
-  .clause-row:after {
-      position: relative;
-      content: "";
-      height: .41667rem;
-      width: .41667rem;
-      top: .29167rem;
-      right: .25rem;
-      background-image: url(data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org…%2C9.84%2C3.24a0.68%2C0.68%2C0%2C1%2C1%2C1%2C1Z%22%2F%3E%0A%3C%2Fsvg%3E%0A);
-      background-repeat: no-repeat;
-      background-size: contain;
-      vertical-align: middle;
-      margin: 0;
-  }
 
   pre[class*="language-"] {
       padding: 8px;

package.json

@@ -1,17 +1,20 @@
 {
   "name": "dcfrontend",
-  "version": "7.6.0",
+  "version": "7.8.2",
   "description": "Data Controller",
   "devDependencies": {
     "@saithodev/semantic-release-gitea": "^2.1.0",
     "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/commit-analyzer": "^10.0.1",
+    "@semantic-release/commit-analyzer": "13.0.1",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/npm": "11.0.0",
-    "@semantic-release/release-notes-generator": "^11.0.4",
-    "commit-and-tag-version": "^11.2.2",
+    "@semantic-release/npm": "13.1.5",
+    "@semantic-release/release-notes-generator": "14.1.0",
+    "commit-and-tag-version": "12.7.1",
     "prettier": "^3.7.4"
   },
+  "overrides": {
+    "got": "11.8.6"
+  },
   "scripts": {
     "install": "cd client && npm i && cd ../sas && npm i",
     "build-frontend": "cd client && npm run build",

sas/deploy/makeDataServer.json

@@ -1,8 +1,8 @@
 {
   "fromjs": [
     {
-      "ADMIN": "DCDEFAULT",
+      "ADMIN": "AllUsers",
       "DCPATH": "/tmp/dcdata"
     }
   ]
-}
+}

sas/package-lock.json

@@ -6,8 +6,8 @@
     "": {
       "name": "dc-sas",
       "dependencies": {
-        "@sasjs/cli": "4.15.2",
-        "@sasjs/core": "4.63.0"
+        "@sasjs/cli": "4.17.4",
+        "@sasjs/core": "4.67.1"
       }
     },
     "node_modules/@asamuzakjp/css-color": {
@@ -124,7 +124,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -147,7 +146,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -202,13 +200,13 @@
       }
     },
     "node_modules/@sasjs/adapter": {
-      "version": "4.16.3",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.16.3.tgz",
-      "integrity": "sha512-xcoZT9qZhF6pXvXx4bHxbmauLdEHng8pSlTK4F6asUkHNR5uzeSvY6znA1yJqK+8FFtsVILyvMQyGyhWw6WsOA==",
+      "version": "4.16.7",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.16.7.tgz",
+      "integrity": "sha512-pOKAhOPijr663PFWGx+JEcWaMOGwICMA0w8LeXHPHQwvbHVGPCJKV5QroGqrjTO62HlhsHzow4Vb+DjIui1jgQ==",
       "license": "ISC",
       "dependencies": {
-        "@sasjs/utils": "3.5.6",
-        "axios": "^1.13.5",
+        "@sasjs/utils": "^3.5.6",
+        "axios": "1.16.0",
         "axios-cookiejar-support": "5.0.5",
         "form-data": "4.0.4",
         "https": "1.0.0",
@@ -216,9 +214,9 @@
       }
     },
     "node_modules/@sasjs/adapter/node_modules/@sasjs/utils": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.6.tgz",
-      "integrity": "sha512-jx8zWSOysDD66vTjA0BWiZ8bcFqmqh8F+56fUCgLmJhm89eDbKrGF3mDKMQx3UE7d2+gxp9xYhJCdaBWz0Dlxw==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.8.tgz",
+      "integrity": "sha512-rR2nCJG5AsuLj+nonpVO4PvA5OW8pUhDivY/25E4PCrQYLAmOaWQyIRne1gvSLL5ELzsOwRZWz6Zf6a02uNayA==",
       "license": "ISC",
       "dependencies": {
         "@fast-csv/format": "4.3.5",
@@ -251,15 +249,15 @@
       }
     },
     "node_modules/@sasjs/cli": {
-      "version": "4.15.2",
-      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.15.2.tgz",
-      "integrity": "sha512-lY9H+HIquLAPXuhk6ov/xyBooERvefT6oiwNRaQ6DHMMFE4cgPvrUH5s3RRkLI2+lET0M0hPPbuaZ4w9yFIDuA==",
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.17.4.tgz",
+      "integrity": "sha512-lNkIy6sojgT5mRQ/tkh8lyrIxNhrREw+CTkfEmy+mDiOh9COfGWMoSpBjRn2iqHX+dwOKaUlq6UwU2zHDLOmqQ==",
       "license": "ISC",
       "dependencies": {
-        "@sasjs/adapter": "4.16.3",
-        "@sasjs/core": "4.63.0",
+        "@sasjs/adapter": "4.16.7",
+        "@sasjs/core": "4.67.1",
         "@sasjs/lint": "2.4.3",
-        "@sasjs/utils": "3.5.6",
+        "@sasjs/utils": "3.5.8",
         "adm-zip": "0.5.10",
         "chalk": "4.1.2",
         "dotenv": "16.0.3",
@@ -282,9 +280,9 @@
       }
     },
     "node_modules/@sasjs/cli/node_modules/@sasjs/utils": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.6.tgz",
-      "integrity": "sha512-jx8zWSOysDD66vTjA0BWiZ8bcFqmqh8F+56fUCgLmJhm89eDbKrGF3mDKMQx3UE7d2+gxp9xYhJCdaBWz0Dlxw==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.8.tgz",
+      "integrity": "sha512-rR2nCJG5AsuLj+nonpVO4PvA5OW8pUhDivY/25E4PCrQYLAmOaWQyIRne1gvSLL5ELzsOwRZWz6Zf6a02uNayA==",
       "license": "ISC",
       "dependencies": {
         "@fast-csv/format": "4.3.5",
@@ -317,9 +315,9 @@
       }
     },
     "node_modules/@sasjs/core": {
-      "version": "4.63.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.63.0.tgz",
-      "integrity": "sha512-NlIihA4BbP+mveAbb7A/hgnrZEpJKKIkq0v4SSDdYXg8YYdKAdyTK8K+6FNPwp+U6hixQCKVX8oCA1DIUppLqA==",
+      "version": "4.67.1",
+      "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.67.1.tgz",
+      "integrity": "sha512-yb4xW8JxsWWY3ZTN4yj/mP8ZasPIHSQVjHESLui3xS0HNatBw96H9ZYGJO3LcrkDx+X5xJz45f6sdHAJYxVeSA==",
       "license": "MIT"
     },
     "node_modules/@sasjs/lint": {
@@ -462,14 +460,14 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.13.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
-      "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
+      "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.11",
+        "follow-redirects": "^1.16.0",
         "form-data": "^4.0.5",
-        "proxy-from-env": "^1.1.0"
+        "proxy-from-env": "^2.1.0"
       }
     },
     "node_modules/axios-cookiejar-support": {
@@ -1013,9 +1011,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
+      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
       "funding": [
         {
           "type": "individual",
@@ -1845,10 +1843,13 @@
       }
     },
     "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/psl": {
       "version": "1.15.0",
@@ -2168,7 +2169,6 @@
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
       "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "license": "BSD-3-Clause",
-      "peer": true,
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -2340,9 +2340,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.19.0.tgz",
-      "integrity": "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg==",
+      "version": "8.20.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.1.tgz",
+      "integrity": "sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"

sas/package.json

@@ -28,7 +28,7 @@
   },
   "private": true,
   "dependencies": {
-    "@sasjs/cli": "4.15.2",
-    "@sasjs/core": "4.63.0"
+    "@sasjs/cli": "4.17.4",
+    "@sasjs/core": "4.67.1"
   }
 }

sas/sasjs/macros/mpe_checkrestore.sas

@@ -45,6 +45,10 @@
     from &dc_libref..mpe_submit
     where TABLE_ID="&load_ref";
 
+  %local base_lib base_ds;
+  %let base_lib=%scan(&libds,1,.);
+  %let base_ds=%scan(&libds,2,.);
+
   /**
     * check if there is actually a version to restore
     */

sas/sasjs/macros/mpe_getpath2settings.sas

@@ -0,0 +1,36 @@
+/**
+  @file
+  @brief Returns the path to the settings file
+  @details The settings file location differs by platform:
+
+  @li SASJS - `<apploc>/services/public/settings.sas`
+  @li SASMETA - `<apploc>/services/public/Data_Controller_Settings`
+  @li SASVIYA - `<apploc>/services/settings.sas`
+
+  Usage:
+
+      %let settingspath=%mpe_getpath2settings();
+      %put &=settingspath;
+
+  <h4> SAS Macros </h4>
+  @li mf_getapploc.sas
+  @li mf_getplatform.sas
+
+**/
+
+%macro mpe_getpath2settings();
+%local root platform;
+%let root=%mf_getapploc();
+%let platform=%mf_getplatform();
+
+%if &platform=SASJS %then %do;
+  &root/services/public/settings
+%end;
+%else %if &platform=SASMETA %then %do;
+  &root/services/public/Data_Controller_Settings
+%end;
+%else %if &platform=SASVIYA %then %do;
+  &root/services/settings
+%end;
+
+%mend mpe_getpath2settings;

sas/sasjs/macros/mpe_makedata.sas

@@ -841,16 +841,16 @@ insert into &lib..mpe_selectbox set
       ,select_lib="&lib"
       ,select_ds="MPE_VALIDATIONS"
       ,base_column="RULE_TYPE"
-      ,selectbox_value="HARDSELECT"
+      ,selectbox_value="NOTNULL"
       ,selectbox_order=4
       ,ver_to_dttm='31DEC5999:23:59:59'dt;
-    insert into &lib..mpe_selectbox set
+  insert into &lib..mpe_selectbox set
       selectbox_rk=%mf_increment(rk)
       ,ver_from_dttm=0
       ,select_lib="&lib"
       ,select_ds="MPE_VALIDATIONS"
       ,base_column="RULE_TYPE"
-      ,selectbox_value="SOFTSELECT"
+      ,selectbox_value="HARDSELECT"
       ,selectbox_order=5
       ,ver_to_dttm='31DEC5999:23:59:59'dt;
   insert into &lib..mpe_selectbox set
@@ -859,26 +859,53 @@ insert into &lib..mpe_selectbox set
       ,select_lib="&lib"
       ,select_ds="MPE_VALIDATIONS"
       ,base_column="RULE_TYPE"
-      ,selectbox_value="NOTNULL"
+      ,selectbox_value="HARDSELECT_HOOK"
       ,selectbox_order=6
       ,ver_to_dttm='31DEC5999:23:59:59'dt;
+    insert into &lib..mpe_selectbox set
+      selectbox_rk=%mf_increment(rk)
+      ,ver_from_dttm=0
+      ,select_lib="&lib"
+      ,select_ds="MPE_VALIDATIONS"
+      ,base_column="RULE_TYPE"
+      ,selectbox_value="SOFTSELECT"
+      ,selectbox_order=7
+      ,ver_to_dttm='31DEC5999:23:59:59'dt;
   insert into &lib..mpe_selectbox set
       selectbox_rk=%mf_increment(rk)
       ,ver_from_dttm=0
       ,select_lib="&lib"
-      ,select_ds="MPE_SECURITY"
-      ,base_column="DSN"
-      ,selectbox_value="SOME_DATASET"
+      ,select_ds="MPE_VALIDATIONS"
+      ,base_column="RULE_TYPE"
+      ,selectbox_value="SOFTSELECT_HOOK"
+      ,selectbox_order=8
+      ,ver_to_dttm='31DEC5999:23:59:59'dt;
+  insert into &lib..mpe_selectbox set
+      selectbox_rk=%mf_increment(rk)
+      ,ver_from_dttm=0
+      ,select_lib="&lib"
+      ,select_ds="MPE_VALIDATIONS"
+      ,base_column="RULE_ACTIVE"
+      ,selectbox_value="1"
       ,selectbox_order=1
       ,ver_to_dttm='31DEC5999:23:59:59'dt;
+  insert into &lib..mpe_selectbox set
+      selectbox_rk=%mf_increment(rk)
+      ,ver_from_dttm=0
+      ,select_lib="&lib"
+      ,select_ds="MPE_VALIDATIONS"
+      ,base_column="RULE_ACTIVE"
+      ,selectbox_value="0"
+      ,selectbox_order=2
+      ,ver_to_dttm='31DEC5999:23:59:59'dt;
   insert into &lib..mpe_selectbox set
       selectbox_rk=%mf_increment(rk)
       ,ver_from_dttm=0
       ,select_lib="&lib"
       ,select_ds="MPE_SECURITY"
       ,base_column="DSN"
-      ,selectbox_value="EXAMPLE"
-      ,selectbox_order=2
+      ,selectbox_value="*ALL*"
+      ,selectbox_order=1
       ,ver_to_dttm='31DEC5999:23:59:59'dt;
   insert into &lib..mpe_selectbox set
       selectbox_rk=%mf_increment(rk)
@@ -943,24 +970,6 @@ insert into &lib..mpe_selectbox set
       ,selectbox_value='AUDIT'
       ,selectbox_order=4
       ,ver_to_dttm='31DEC5999:23:59:59'dt;
-  insert into &lib..mpe_selectbox set
-      selectbox_rk=%mf_increment(rk)
-      ,ver_from_dttm=0
-      ,select_lib="&lib"
-      ,select_ds="MPE_VALIDATIONS"
-      ,base_column="RULE_TYPE"
-      ,selectbox_value="HARDSELECT_HOOK"
-      ,selectbox_order=7
-      ,ver_to_dttm='31DEC5999:23:59:59'dt;
-  insert into &lib..mpe_selectbox set
-      selectbox_rk=%mf_increment(rk)
-      ,ver_from_dttm=0
-      ,select_lib="&lib"
-      ,select_ds="MPE_VALIDATIONS"
-      ,base_column="RULE_TYPE"
-      ,selectbox_value="SOFTSELECT_HOOK"
-      ,selectbox_order=7
-      ,ver_to_dttm='31DEC5999:23:59:59'dt;
   insert into &lib..mpe_selectbox set
       selectbox_rk=%mf_increment(rk)
       ,ver_from_dttm=0

sas/sasjs/sasjsconfig.json

@@ -143,17 +143,17 @@
     },
     {
       "name": "vtest",
-      "appLoc": "/30.SASApps/app/vtest",
+      "appLoc": "/Users/&sysuserid/dctest",
       "serverType": "SASVIYA",
       "serverUrl": "https://sas.4gl.io",
-      "contextName": "Datacontroller compute context",
+      "contextName": "Compute Reusable",
       "testConfig": {
         "testSetUp": "sasjs/tests/testsetup.sas"
       },
       "serviceConfig": {
         "initProgram": "sasjs/utils/serviceinitviya.sas",
         "serviceFolders": [
-          "sasjs/targets/viya/services_viya/usernav",
+          "sasjs/targets/viya/services_viya/viya_users",
           "sasjs/targets/viya/services_viya/admin",
           "sasjs/targets/viya/services_viya/public"
         ]
@@ -166,6 +166,9 @@
       ],
       "deployConfig": {
         "deployServicePack": true
+      },
+      "streamConfig": {
+        "streamWeb": false
       }
     },
     {

sas/sasjs/services/auditors/postdata.sas

@@ -19,6 +19,7 @@
   <h4> SAS Macros </h4>
   @li bitemporal_dataloader.sas
   @li dc_assignlib.sas
+  @li dc_cassave.sas
   @li mf_existds.sas
   @li mf_existvar.sas
   @li mf_getattrn.sas
@@ -669,6 +670,9 @@ run;
     ctl_ds=&mpelib..mpe_lockanytable
   )
 
+  /* save table to disk (if viya + cas) */
+  %dc_cassave(&libds)
+
   /* run post-approve hook */
   %mpe_runhook(POST_APPROVE_HOOK)
 

sas/sasjs/services/editors/getdata.sas

@@ -24,10 +24,10 @@
   <h5> cols </h5>
   Contains column level attributes.
   @li NAME - column name
-  @li VARNUM - variable position. Source: https://core.sasjs.io/mp__getcols_8sas.html
-  @li LABEL - variable label. Source: https://core.sasjs.io/mp__getcols_8sas.html
-  @li FMTNAME - derived format name. Source: https://core.sasjs.io/mp__getcols_8sas.html
-  @li DDTYPE - derived dropdown type.  Source: https://core.sasjs.io/mp__getcols_8sas.html
+  @li VARNUM - var position. https://core.sasjs.io/mp__getcols_8sas.html
+  @li LABEL - var label. https://core.sasjs.io/mp__getcols_8sas.html
+  @li FMTNAME - derived format. https://core.sasjs.io/mp__getcols_8sas.html
+  @li DDTYPE - derived dropdown. https://core.sasjs.io/mp__getcols_8sas.html
   @li CLS_RULE - values include:
     - EDIT - the column is editable
     - READ - the column should be readonly
@@ -47,6 +47,7 @@
 
   <h4> SAS Macros </h4>
   @li dc_assignlib.sas
+  @li dc_casload.sas
   @li dc_getgroupmembers.sas
   @li mf_existvar.sas
   @li mf_getattrn.sas
@@ -142,6 +143,7 @@ run;
 %let libref=%upcase(%scan(&libds,1,.));
 %let dsn=%upcase(%scan(&libds,2,.));
 %dc_assignlib(WRITE,&libref)
+%dc_casload(&libds)
 
 /**
   * First check user has access permission to edit the table

sas/sasjs/services/hooks/mpe_security_postedit.sas

@@ -19,6 +19,11 @@
 data work.staging_ds;
   set work.staging_ds;
   LIBREF=upcase(LIBREF);
+  if LIBREF in ('WORK','CASUSER','SASUSER') then do;
+    putlog "ERR" +(-1) "OR: invalid LIBREF - " LIBREF;
+    call symputx('errval',1);
+    call symputx('errmsg',"Invalid LIBREF: "!!LIBREF);
+  end;
   DSN=upcase(DSN);
   ACCESS_LEVEL=upcase(ACCESS_LEVEL);
   if ACCESS_LEVEL not in ('EDIT','APPROVE','VIEW','SIGNOFF','AUDIT') then do;

sas/sasjs/services/hooks/mpe_tables_postedit.sas

@@ -39,6 +39,13 @@ data work.staging_ds;
   audit_libds=upcase(audit_libds);
   rk_underlying=upcase(rk_underlying);
 
+  /* do not accept certain librefs */
+  if LIBREF in ('WORK','CASUSER','SASUSER')
+  then do;
+    call symputx('errmsg',"Invalid LIBREF: "!!LIBREF);
+    call symputx('errflag',1);
+  end;
+
   /* check for valid loadtype */
   if LOADTYPE not in ('UPDATE','TXTEMPORAL','FORMAT_CAT','BITEMPORAL','REPLACE')
   then do;

sas/sasjs/services/public/startupservice.sas

@@ -113,6 +113,16 @@ run;
         and &dc_dttmtfmt. lt b.tx_to
         and b.ACCESS_LEVEL in ('EDIT')
         and b.SAS_GROUP in (select groupname from groups)
+    union
+      select distinct a.libref,a.dsn
+      from &mpelib..mpe_tables a
+      left join &mpelib..mpe_security b
+      on a.libref=b.libref
+      where &dc_dttmtfmt. lt a.tx_to
+        and &dc_dttmtfmt. lt b.tx_to
+        and b.ACCESS_LEVEL in ('EDIT')
+        and b.DSN='*ALL*'
+        and b.SAS_GROUP in (select groupname from groups)
       order by 1;
   %end;
 %mend mstp_mpeditorstartup;

sas/sasjs/services/public/startupservice.test.sas

@@ -1,21 +1,24 @@
 /**
   @file
-  @brief testing gethistory service
+  @brief testing startupservice service
 
   <h4> SAS Macros </h4>
+  @li mf_getuniquefileref.sas
   @li mp_assertdsobs.sas
-  @li mp_testservice.sas
+  @li mpe_getpath2settings.sas
+  @li mx_append2pgm.sas
+  @li mx_testservice.sas
 
 **/
 
 %let _program=&appLoc/services/public/startupservice;
 
-%mp_testservice(&_program,
-  viyacontext=&defaultcontext,
-  outlib=webout
+%mx_testservice(&_program,
+  mdebug=&sasjs_mdebug,
+  outlib=webout,
+  viyacontext=&defaultcontext
 )
 
-
 data work.globvars;
   set webout.globvars;
   putlog (_all_)(=);
@@ -36,4 +39,92 @@ run;
   desc=xlmaps table returned,
   test=HASOBS,
   outds=work.test_results
-)
+)
+
+/* test mpe_security table */
+%let testlib=%upcase(%mf_getuniquefileref());
+
+/* remove the admin group */
+filename append temp;
+data _null_;
+  file append;
+  put '%let dc_admin_group=xxx;';
+  put " libname &testlib '%sysfunc(pathname(&dc_libref))';";
+run;
+%let settingspath=%mpe_getpath2settings();
+%mx_append2pgm(&settingspath, inref=append)
+
+/* insert single approved table in mpe_security */
+data work.append;
+  set &DC_LIBREF..mpe_security;
+  LIBREF="&testlib";
+  DSN='MPE_X_TEST';
+  ACCESS_LEVEL='EDIT';
+  SAS_GROUP="&dc_admin_group";
+  tx_from=0;
+  tx_to='31DEC9999:23:59:59'dt;
+  output;
+  stop;
+run;
+proc append base=&dc_libref..mpe_security data=work.append;
+run;
+/* add to MPE_TABLES also */
+data work.append2 ;
+  set  &dc_libref..MPE_TABLES;
+  where libref="&dc_libref" and %sysfunc(datetime()) < tx_to;
+  libref="&testlib";
+  tx_from=0;
+  tx_to='31DEC9999:23:59:59'dt;
+run;
+proc sort data=work.append2 nodupkey; by libref dsn;run;
+proc append base=&dc_libref..mpe_tables data=work.append2;run;
+
+
+%mx_testservice(&_program,
+  mdebug=&sasjs_mdebug,
+  outlib=webout2,
+  viyacontext=&defaultcontext
+)
+
+data work.sasdatasets2;
+  set webout2.sasdatasets;
+  putlog (_all_)(=);
+  if libref="&testlib";
+run;
+%mp_assertdsobs(work.sasdatasets2,
+  desc=Only 1 table shown,
+  test=EQUALS 1
+)
+
+/* now try all tables */
+data work.append3;
+  set &DC_LIBREF..mpe_security;
+  where libref="&testlib" and SAS_GROUP="&dc_admin_group";
+  DSN='*ALL*';
+run;
+proc append base=&dc_libref..mpe_security data=work.append3;
+run;
+%mx_testservice(&_program,
+  mdebug=&sasjs_mdebug,
+  outlib=webout3,
+  viyacontext=&defaultcontext
+)
+
+
+data work.sasdatasets3;
+  set webout3.sasdatasets;
+  putlog (_all_)(=);
+  if libref="&testlib";
+run;
+%mp_assertdsobs(work.sasdatasets3,
+  desc=Only 1 table shown,
+  test=ATLEAST 10
+)
+
+/* revert the admin group back */
+filename appback temp;
+data _null_;
+  file appback;
+  put '%let dc_admin_group=' "&dc_admin_group;";
+run;
+%mx_append2pgm(&settingspath, inref=appback)

sas/sasjs/services/public/viewdata.sas

@@ -39,6 +39,7 @@
 
   <h4> SAS Macros </h4>
   @li dc_assignlib.sas
+  @li dc_casload.sas
   @li dc_createdataset.sas
   @li dc_gettableid.sas
   @li mf_existds.sas
@@ -144,6 +145,7 @@ run;
   * assign the Library
   */
 %dc_assignlib(READ,%scan(&LIBDS,1,.))
+%dc_casload(&libds)
 
 /* abort if looking for a format and the catalog doesn't exist */
 %mp_abort(iftrue= (&fmt_ind=1 and %sysfunc(exist(&libds,CATALOG))=0)

sas/sasjs/targets/sas9/macros_meta/dc_casload.sas

@@ -0,0 +1,18 @@
+/**
+  @file
+  @brief Loads a CAS table into memory
+  @details There are three versions of this macro, one per build
+    target.  The interface is the same.  This version is META and
+    is a no-op as CAS is not available on this platform.
+
+  @param [in] libds   library.dataset of the CAS table to load
+  @param [in] mdebug= (0) Set to 1 to enable verbose logging
+
+  @author 4GL Apps Ltd
+  @copyright 4GL Apps Ltd.  This code may only be used within Data
+    Controller and may not be re-distributed or re-sold without the
+    express permission of 4GL Apps Ltd.
+**/
+
+%macro dc_casload(libds, mdebug=0);
+%mend dc_casload;

sas/sasjs/targets/sas9/macros_meta/dc_cassave.sas

@@ -0,0 +1,18 @@
+/**
+  @file
+  @brief Saves an in-memory CAS table back to persistent storage
+  @details There are three versions of this macro, one per build
+    target.  The interface is the same.  This version is META and
+    is a no-op as CAS is not available on this platform.
+
+  @param [in] libds   library.dataset of the CAS table to save
+  @param [in] mdebug= (0) Set to 1 to enable verbose logging
+
+  @author 4GL Apps Ltd
+  @copyright 4GL Apps Ltd.  This code may only be used within Data
+    Controller and may not be re-distributed or re-sold without the
+    express permission of 4GL Apps Ltd.
+**/
+
+%macro dc_cassave(libds, mdebug=0);
+%mend dc_cassave;

sas/sasjs/targets/server/macros_server/dc_casload.sas

@@ -0,0 +1,18 @@
+/**
+  @file
+  @brief Loads a CAS table into memory
+  @details There are three versions of this macro, one per build
+    target.  The interface is the same.  This version is SERVER and
+    is a no-op as CAS is not available on this platform.
+
+  @param [in] libds   library.dataset of the CAS table to load
+  @param [in] mdebug= (0) Set to 1 to enable verbose logging
+
+  @author 4GL Apps Ltd
+  @copyright 4GL Apps Ltd.  This code may only be used within Data
+    Controller and may not be re-distributed or re-sold without the
+    express permission of 4GL Apps Ltd.
+**/
+
+%macro dc_casload(libds, mdebug=0);
+%mend dc_casload;

sas/sasjs/targets/server/macros_server/dc_cassave.sas

@@ -0,0 +1,18 @@
+/**
+  @file
+  @brief Saves an in-memory CAS table back to persistent storage
+  @details There are three versions of this macro, one per build
+    target.  The interface is the same.  This version is SERVER and
+    is a no-op as CAS is not available on this platform.
+
+  @param [in] libds   library.dataset of the CAS table to save
+  @param [in] mdebug= (0) Set to 1 to enable verbose logging
+
+  @author 4GL Apps Ltd
+  @copyright 4GL Apps Ltd.  This code may only be used within Data
+    Controller and may not be re-distributed or re-sold without the
+    express permission of 4GL Apps Ltd.
+**/
+
+%macro dc_cassave(libds, mdebug=0);
+%mend dc_cassave;

sas/sasjs/targets/viya/macros_viya/dc_casload.sas

@@ -0,0 +1,83 @@
+/**
+  @file
+  @brief Loads a CAS table into memory
+  @details There are three versions of this macro, one per build
+    target.  The interface is the same.  The macro loads the source table
+    to memory (if not loaded) and promotes it.
+
+    Note that we cannot collect metadata from the APIs (like in
+    mv_castabload) because the server info may be inacessible to
+    the logged in user
+
+    Running SAS code under a system account (like proc util) DOES
+    work, so we just make the assumption that the source file and
+    library matches the libds.
+
+  @param [in] libds   library.dataset of the CAS table to load
+  @param [in] mdebug= (0) Set to 1 to enable verbose logging
+
+  <h4> SAS Macros </h4>
+  @li mf_getengine.sas
+  @li mfv_getcaslib.sas
+  @li mp_abort.sas
+
+  @author 4GL Apps Ltd
+  @copyright 4GL Apps Ltd.  This code may only be used within Data
+    Controller and may not be re-distributed or re-sold without the
+    express permission of 4GL Apps Ltd.
+**/
+
+%macro dc_casload(libds, mdebug=0);
+  %local lib eng caslib ds _exists;
+
+  %mp_abort(
+    iftrue=(&syscc ne 0),
+    msg=%str(syscc=&syscc on macro entry)
+  )
+
+  %let lib=%scan(&libds,1,.);
+  %let eng=%mf_getengine(&lib);
+  %mp_abort(iftrue= (X&eng.X=XX)
+    ,mac=&_program
+    ,msg=%str(Library &lib is not assigned)
+  )
+
+  %if &eng ne CAS %then %return;
+
+  %let caslib=%mfv_getcaslib(lib=&lib);
+  %let ds=%scan(&libds,2,.);
+  %if &mdebug=1 %then %put _local_;
+  /* ---- existence check ------------------------------------------------- */
+  proc cas;
+    table.tableExists result=r /
+        caslib="&caslib"
+        name="&ds";
+    %if &mdebug=1 %then %do;
+      print r;
+    %end;
+    if r.exists > 0 then call symputx('_exists', '1', 'L');
+    else call symputx('_exists', '0', 'L');
+  quit;
+
+  /* ---- already loaded: skip -------------------------------------------- */
+  %if &_exists=1 %then %do;
+    %put NOTE: Table &caslib..&ds already loaded - skipping;
+    %return;
+  %end;
+
+  proc casutil;
+    load casdata="&ds"
+        incaslib="&caslib"
+        casout="&ds"
+        outcaslib="&caslib"
+        promote;
+  quit;
+
+  %mp_abort(
+    iftrue=(&syscc ne 0),
+    msg=%str(Load failed for &caslib..&ds)
+  )
+
+  %put NOTE: Table &caslib..&ds loaded and promoted;
+
+%mend dc_casload;

sas/sasjs/targets/viya/macros_viya/dc_cassave.sas

@@ -0,0 +1,50 @@
+/**
+  @file
+  @brief Saves an in-memory CAS table back to persistent storage
+  @details There are three versions of this macro, one per build
+    target.  The interface is the same.  This version is VIYA and
+    saves the named table back to its original source file.
+    Note that we cannot collect metadata from the APIs (like in
+    mv_castabsave) because the server info may be inacessible to
+    the logged in user
+
+    Running SAS code under a system account (like proc util) DOES
+    work, so we just make the assumption that the source file and
+    library matches the libds.
+
+  @param [in] libds   library.dataset of the CAS table to save
+  @param [in] mdebug= (0) Set to 1 to enable verbose logging
+
+  <h4> SAS Macros </h4>
+  @li mf_getengine.sas
+  @li mfv_getcaslib.sas
+
+  @author 4GL Apps Ltd
+  @copyright 4GL Apps Ltd.  This code may only be used within Data
+    Controller and may not be re-distributed or re-sold without the
+    express permission of 4GL Apps Ltd.
+**/
+
+%macro dc_cassave(libds, mdebug=0);
+  %local lib eng caslib ds;
+  %let lib=%scan(&libds,1,.);
+  %let eng=%mf_getengine(&lib);
+
+  %if &eng ne CAS %then %return;
+
+  %let caslib=%mfv_getcaslib(lib=&lib);
+  %let ds=%scan(&libds,2,.);
+  %if &mdebug=1 %then %put _local_;
+
+
+  /* ---- save to disk -------------------------------------------------- */
+  proc casutil;
+    save casdata="&ds"
+        incaslib="&caslib"
+        casout="&ds"
+        outcaslib="&caslib"
+        replace;
+  quit;
+  %put NOTE: Table &caslib..&ds saved;
+
+%mend dc_cassave;

sas/sasjs/targets/viya/macros_viya/dc_getlibs.sas

@@ -21,7 +21,7 @@ create table &outds as
     ,engine
     ,'' as libraryid length=17
   from dictionary.libnames
-  where libname not in ('WORK','SASUSER');
+  where libname not in ('WORK','SASUSER','CASUSER');
 insert into &syslast values ("&DC_LIBREF", "&DC_LIBNAME",'','V9');
 
 %mend dc_getlibs;

sas/sasjs/targets/viya/services_viya/admin/makedata.sas

@@ -124,6 +124,9 @@ data _null_;
   put '/* This physical location is used for staging data and audit history */';
   put '%let dc_staging_area=' "&dcpath/dc_staging;";
   put ' ';
+  put 'cas dcsession sessopts=(caslib=casuser);';
+  put 'caslib _all_ assign;';
+  put ' ';
   if &syssite in (70221618,70253615) then do;
     put "libname dcdemo '&dcpath/dc_demo';";
   end;

sas/sasjs/tests/testsetup.sas

@@ -60,6 +60,10 @@ run;
 %let testloc=%sysfunc(pathname(&DC_LIBREF))/fmt%mf_getuniquefileref();
 %mf_mkdir(&testloc)
 libname dctest "&testloc";
+data dctest.mpe_x_test;
+  set &DC_LIBREF..mpe_x_test;
+run;
+
 /* test library with only one format catalog */
 %mf_mkdir(&testloc/fmtonly)
 libname fmtonly "&testloc/fmtonly";

sas/sasjs/utils/serviceinitviya.sas

@@ -12,12 +12,6 @@
 
 options noquotelenmax ps=max;
 
-cas dcsession sessopts=(caslib=casuser);
-caslib _all_ assign;
-
-libname casuser cas caslib=casuser;
-
-
 /*caslib casmusic path='/opt/sas/viya/cascache/tracks' libref=casmusic ;*/
 
 %let syscc=0;