mirror of
https://github.com/sasjs/adapter.git
synced 2026-06-11 19:20:22 +00:00
Compare commits
69 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3d99a9b1e4 | |||
| 2a71e34179 | |||
| ea5d60352d | |||
| ac0dfae9a8 | |||
| cd350e4e6d | |||
| 8f726c0ac9 | |||
| 4cae9b5472 | |||
| a691500910 | |||
| eb6b123dba | |||
| 3136e98477 | |||
| 2db1b9fc4b | |||
| 8be0fd94ad | |||
| 55db8f45ab | |||
| eb1186b4b9 | |||
| ef1e816b09 | |||
| 6552c768f9 | |||
| 31b3959e2c | |||
| a38548d8de | |||
| 7a130e129f | |||
| 27a69f2959 | |||
| 38d84e56d4 | |||
| 180e2ef425 | |||
| 9177dce3e1 | |||
| 9f4064b46e | |||
| 44c5eab638 | |||
| 0f9f16bef1 | |||
| 5c61ede51a | |||
| fccb3ab965 | |||
| b92487819a | |||
| 3cc37e0b5b | |||
| d87b9ecc34 | |||
| 3b00ae4bef | |||
| 87efdfff2e | |||
| 73556c9fdf | |||
| 72318ced00 | |||
| d7053ba628 | |||
| 52371da4db | |||
| 8e8efd22e9 | |||
| f80d0c87f9 | |||
| 5bd641b843 | |||
| 539fe5f4ed | |||
| 9252e7e384 | |||
| bbf0eed443 | |||
| 677c0a5046 | |||
| ff927caf73 | |||
| e23aa4426c | |||
| 8064a843e8 | |||
| d45b528846 | |||
| cd64ebc518 | |||
| 8246722ae8 | |||
| 0f8a3f4b53 | |||
| ca9ffdbc17 | |||
| 03b7592521 | |||
| ba64ed1f20 | |||
| 480510b980 | |||
| 8c7767a36d | |||
| f335be344e | |||
| 680f5a4872 | |||
| c42a20a8ee | |||
| 87b60a4a21 | |||
| 07e4ba54f3 | |||
| 6f73011bc1 | |||
| f26d51747f | |||
| 1f8554f925 | |||
| 0d871083ac | |||
| ae71918ae2 | |||
| 364a063a11 | |||
| ad4c9b2164 | |||
| 59198ed6ab |
@@ -0,0 +1 @@
|
||||
* text=auto eol=lf
|
||||
@@ -11,8 +11,9 @@ jobs:
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
node-version: [lts/hydrogen]
|
||||
node-version: [22, 24]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
@@ -21,7 +22,7 @@ jobs:
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
|
||||
# 2. Restore npm cache manually
|
||||
# 2. Restore npm cache manually
|
||||
- name: Restore npm cache
|
||||
uses: actions/cache@v3
|
||||
id: npm-cache
|
||||
@@ -32,7 +33,7 @@ jobs:
|
||||
${{ runner.os }}-node-
|
||||
|
||||
- name: Check npm audit
|
||||
run: npm audit --production --audit-level=low
|
||||
run: npm audit --omit=dev --audit-level=low
|
||||
|
||||
- name: Install Dependencies
|
||||
run: npm ci
|
||||
@@ -53,6 +54,7 @@ jobs:
|
||||
|
||||
# For some reason if coverage report action is run before other commands, those commands can't access the directories and files on which they depend on
|
||||
- name: Generate coverage report
|
||||
if: matrix.node-version == 22
|
||||
uses: artiomtr/jest-coverage-report-action@v2.0-rc.2
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@@ -11,7 +11,7 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [lts/hydrogen]
|
||||
node-version: [22]
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -20,9 +20,10 @@ jobs:
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
node-version:
|
||||
${{ matrix.node-version }}
|
||||
|
||||
# 2. Restore npm cache manually
|
||||
# 2. Restore npm cache manually
|
||||
- name: Restore npm cache
|
||||
uses: actions/cache@v3
|
||||
id: npm-cache
|
||||
@@ -50,4 +51,3 @@ jobs:
|
||||
publish_branch: gh-pages
|
||||
publish_dir: ./docs
|
||||
cname: adapter.sasjs.io
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [lts/hydrogen]
|
||||
node-version: [22]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
@@ -23,7 +23,7 @@ jobs:
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
|
||||
# 2. Restore npm cache manually
|
||||
# 2. Restore npm cache manually
|
||||
- name: Restore npm cache
|
||||
uses: actions/cache@v3
|
||||
id: npm-cache
|
||||
@@ -42,6 +42,9 @@ jobs:
|
||||
- name: Build Project
|
||||
run: npm run build
|
||||
|
||||
- name: Clean up ready for publishing
|
||||
run: npm run publishInit
|
||||
|
||||
- name: Semantic Release
|
||||
uses: cycjimmy/semantic-release-action@v3
|
||||
env:
|
||||
|
||||
+123
-107
@@ -1,107 +1,123 @@
|
||||
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
|
||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
|
||||
|
||||
name: SASjs Build and Server Tests
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [lts/hydrogen]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
|
||||
# 2. Restore npm cache manually
|
||||
- name: Restore npm cache
|
||||
uses: actions/cache@v3
|
||||
id: npm-cache
|
||||
with:
|
||||
path: ~/.npm
|
||||
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-node-
|
||||
|
||||
- name: Install Dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Install Rimraf
|
||||
run: npm i rimraf
|
||||
|
||||
- name: Build Package
|
||||
run: npm run package:lib
|
||||
env:
|
||||
CI: true
|
||||
|
||||
- name: Write VPN Files
|
||||
run: |
|
||||
echo "$CA_CRT" > .github/vpn/ca.crt
|
||||
echo "$USER_CRT" > .github/vpn/user.crt
|
||||
echo "$USER_KEY" > .github/vpn/user.key
|
||||
echo "$TLS_KEY" > .github/vpn/tls.key
|
||||
shell: bash
|
||||
env:
|
||||
CA_CRT: ${{ secrets.CA_CRT}}
|
||||
USER_CRT: ${{ secrets.USER_CRT }}
|
||||
USER_KEY: ${{ secrets.USER_KEY }}
|
||||
TLS_KEY: ${{ secrets.TLS_KEY }}
|
||||
|
||||
- name: Chmod VPN files
|
||||
run: |
|
||||
chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
|
||||
|
||||
- name: Install Open VPN
|
||||
run: |
|
||||
sudo apt install apt-transport-https
|
||||
sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
|
||||
sudo apt-key add openvpn-repo-pkg-key.pub
|
||||
sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
|
||||
sudo apt update
|
||||
sudo apt install openvpn3=17~betaUb22042+jammy
|
||||
|
||||
- name: Start Open VPN 3
|
||||
run: openvpn3 session-start --config .github/vpn/config.ovpn
|
||||
|
||||
- name: install pm2
|
||||
run: npm i -g pm2
|
||||
|
||||
- name: Fetch SASJS server
|
||||
run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
|
||||
|
||||
- name: Deploy sasjs-tests
|
||||
run: |
|
||||
npm install -g replace-in-files-cli
|
||||
cd sasjs-tests
|
||||
replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json
|
||||
npm i
|
||||
replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json
|
||||
replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json
|
||||
replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json
|
||||
replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json
|
||||
cat ./public/config.json
|
||||
|
||||
npm run update:adapter
|
||||
pm2 start --name sasjs-test npm -- start
|
||||
|
||||
- name: Sleep for 10 seconds
|
||||
run: sleep 10s
|
||||
shell: bash
|
||||
|
||||
- name: Run cypress on sasjs
|
||||
run: |
|
||||
replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.json
|
||||
replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json
|
||||
replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json
|
||||
cat ./cypress.json
|
||||
echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
|
||||
|
||||
sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
|
||||
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
|
||||
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
|
||||
|
||||
name: SASjs Build and Server Tests
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [22]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v2
|
||||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
|
||||
# 2. Restore npm cache manually
|
||||
- name: Restore npm cache
|
||||
uses: actions/cache@v3
|
||||
id: npm-cache
|
||||
with:
|
||||
path: |
|
||||
~/.npm
|
||||
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-node-
|
||||
|
||||
- name: Cache Cypress binary
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: ~/.cache/Cypress
|
||||
key: cypress-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
|
||||
restore-keys: |
|
||||
cypress-${{ runner.os }}-
|
||||
|
||||
- name: Install Dependencies
|
||||
run: npm ci
|
||||
|
||||
- name: Install Cypress binary
|
||||
run: npx cypress install
|
||||
|
||||
- name: Install Rimraf
|
||||
run: npm i rimraf
|
||||
|
||||
- name: Build Package
|
||||
run: npm run package:lib
|
||||
env:
|
||||
CI: true
|
||||
|
||||
- name: Write VPN Files
|
||||
run: |
|
||||
echo "$CA_CRT" > .github/vpn/ca.crt
|
||||
echo "$USER_CRT" > .github/vpn/user.crt
|
||||
echo "$USER_KEY" > .github/vpn/user.key
|
||||
echo "$TLS_KEY" > .github/vpn/tls.key
|
||||
shell: bash
|
||||
env:
|
||||
CA_CRT: ${{ secrets.CA_CRT}}
|
||||
USER_CRT: ${{ secrets.USER_CRT }}
|
||||
USER_KEY: ${{ secrets.USER_KEY }}
|
||||
TLS_KEY: ${{ secrets.TLS_KEY }}
|
||||
|
||||
- name: Chmod VPN files
|
||||
run: |
|
||||
chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key
|
||||
|
||||
- name: Install Open VPN
|
||||
run: |
|
||||
sudo apt install apt-transport-https
|
||||
sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
|
||||
sudo apt-key add openvpn-repo-pkg-key.pub
|
||||
sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list
|
||||
sudo apt update
|
||||
sudo apt install openvpn3=17~betaUb22042+jammy
|
||||
|
||||
- name: Start Open VPN 3
|
||||
run: openvpn3 session-start --config .github/vpn/config.ovpn
|
||||
|
||||
- name: install pm2
|
||||
run: npm i -g pm2
|
||||
|
||||
- name: Fetch SASJS server
|
||||
run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info
|
||||
|
||||
- name: Deploy sasjs-tests
|
||||
run: |
|
||||
sudo apt install jq
|
||||
cd sasjs-tests
|
||||
npm i --ignore-scripts
|
||||
npm i ../build/sasjs-adapter-5.0.0.tgz
|
||||
jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
|
||||
jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
|
||||
jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
|
||||
jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
|
||||
jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json
|
||||
|
||||
cat ./public/config.json
|
||||
|
||||
npm run update:adapter
|
||||
pm2 start --name sasjs-test npm -- start
|
||||
|
||||
- name: Sleep for 10 seconds
|
||||
run: sleep 10s
|
||||
shell: bash
|
||||
|
||||
- name: Run cypress on sasjs
|
||||
env:
|
||||
TERM: dumb
|
||||
run: |
|
||||
sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:3000'|g" ./cypress.config.js
|
||||
sed -i "s|username: '.*'|username: '${{ secrets.SASJS_USERNAME }}'|g" ./cypress.config.js
|
||||
sed -i "s|password: '.*'|password: '${{ secrets.SASJS_PASSWORD }}'|g" ./cypress.config.js
|
||||
cat ./cypress.config.js
|
||||
echo "SASJS_USERNAME=${{ secrets.SASJS_USERNAME }}"
|
||||
|
||||
sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
tasks:
|
||||
- init: npm install && npm run build
|
||||
@@ -288,6 +288,7 @@ Configuration on the client side involves passing an object on startup, which ca
|
||||
- `verbose` - optional, if `true` then a summary of every HTTP response is logged.
|
||||
- `loginMechanism` - either `Default` or `Redirected`. See [SAS Logon](#sas-logon) section.
|
||||
- `useComputeApi` - Only relevant when the serverType is `SASVIYA`. If `true` the [Compute API](#using-the-compute-api) is used. If `false` the [JES API](#using-the-jes-api) is used. If `null` or `undefined` the [Web](#using-jes-web-app) approach is used.
|
||||
- `runAsTask` - Only relevant for serverType `SASVIYA` and useComputeApi `null`. Will add the `_EXECUTIONTASKS=true` URL param and thus execute jobs as Compute Tasks.
|
||||
- `contextName` - Compute context on which the requests will be called. If missing or not provided, defaults to `Job Execution Compute context`.
|
||||
- `requestHistoryLimit` - Request history limit. Increasing this limit may affect browser performance, especially with debug (logs) enabled. Default is 10.
|
||||
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
const { defineConfig } = require('cypress')
|
||||
|
||||
module.exports = defineConfig({
|
||||
e2e: {
|
||||
includeShadowDom: true,
|
||||
chromeWebSecurity: false,
|
||||
defaultCommandTimeout: 20000,
|
||||
specPattern: 'cypress/integration/**/*.ts',
|
||||
supportFile: 'cypress/support/index.js'
|
||||
},
|
||||
env: {
|
||||
sasjsTestsUrl: 'http://localhost:3000',
|
||||
username: '',
|
||||
password: '',
|
||||
screenshotOnRunFailure: false,
|
||||
testingFinishTimeout: 300000
|
||||
}
|
||||
})
|
||||
@@ -1,11 +0,0 @@
|
||||
{
|
||||
"chromeWebSecurity": false,
|
||||
"defaultCommandTimeout": 20000,
|
||||
"env": {
|
||||
"sasjsTestsUrl": "",
|
||||
"username": "",
|
||||
"password": "",
|
||||
"screenshotOnRunFailure": false,
|
||||
"testingFinishTimeout": 600000
|
||||
}
|
||||
}
|
||||
@@ -9,20 +9,82 @@ context('sasjs-tests', function () {
|
||||
})
|
||||
|
||||
beforeEach(() => {
|
||||
cy.reload()
|
||||
cy.visit(sasjsTestsUrl)
|
||||
})
|
||||
|
||||
function waitForTestsToFinish(timeout: number) {
|
||||
const deadline = Date.now() + timeout
|
||||
function check() {
|
||||
cy.get('tests-view', { log: false }).then(($view) => {
|
||||
const shadow = ($view[0] as HTMLElement).shadowRoot
|
||||
const stillRunning = !!shadow?.querySelector('#run-btn:disabled')
|
||||
if (!stillRunning) return
|
||||
if (Date.now() >= deadline) {
|
||||
cy.log('Timed out waiting for tests to finish; reporting status')
|
||||
return
|
||||
}
|
||||
cy.wait(2000, { log: false })
|
||||
check()
|
||||
})
|
||||
}
|
||||
check()
|
||||
}
|
||||
|
||||
function assertNoFailedTests() {
|
||||
cy.get('test-card').then(($cards) => {
|
||||
const failed: string[] = []
|
||||
const stuck: string[] = []
|
||||
const pending: string[] = []
|
||||
$cards.each((_, card) => {
|
||||
const shadow = (card as HTMLElement).shadowRoot
|
||||
if (!shadow) return
|
||||
const icon = shadow.querySelector('.status-icon')
|
||||
const title =
|
||||
shadow.querySelector('.header h3')?.textContent?.trim() ?? '(unknown)'
|
||||
if (icon?.classList.contains('failed')) {
|
||||
const error =
|
||||
shadow.querySelector('.error pre')?.textContent?.trim() ?? ''
|
||||
failed.push(error ? `- ${title}\n ${error}` : `- ${title}`)
|
||||
} else if (icon?.classList.contains('running')) {
|
||||
stuck.push(`- ${title}`)
|
||||
} else if (icon?.classList.contains('pending')) {
|
||||
pending.push(`- ${title}`)
|
||||
}
|
||||
})
|
||||
const parts: string[] = []
|
||||
if (failed.length)
|
||||
parts.push(`${failed.length} failed:\n${failed.join('\n')}`)
|
||||
if (stuck.length)
|
||||
parts.push(`${stuck.length} stuck (running):\n${stuck.join('\n')}`)
|
||||
if (pending.length)
|
||||
parts.push(
|
||||
`${pending.length} did not start (pending):\n${pending.join('\n')}`
|
||||
)
|
||||
expect(parts, parts.join('\n\n')).to.be.empty
|
||||
})
|
||||
}
|
||||
|
||||
function loginIfNeeded() {
|
||||
cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
|
||||
|
||||
cy.get('body').then(($body) => {
|
||||
if ($body.find('input[placeholder="User Name"]').length > 0) {
|
||||
cy.get('input[placeholder="User Name"]')
|
||||
if ($body.find('login-form').length > 0) {
|
||||
cy.get('login-form')
|
||||
.shadow()
|
||||
.find('#username')
|
||||
.should('be.visible')
|
||||
.type(username)
|
||||
cy.get('input[placeholder="Password"]')
|
||||
cy.get('login-form')
|
||||
.shadow()
|
||||
.find('#password')
|
||||
.should('be.visible')
|
||||
.type(password)
|
||||
cy.get('.submit-button').should('be.visible').click()
|
||||
cy.get('input[placeholder="User Name"]').should('not.exist') // Wait for login to finish
|
||||
cy.get('login-form')
|
||||
.shadow()
|
||||
.find('#submit-btn')
|
||||
.should('be.visible')
|
||||
.click()
|
||||
cy.get('login-form').should('not.exist') // Wait for login to finish
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -30,30 +92,26 @@ context('sasjs-tests', function () {
|
||||
it('Should have all tests successful', () => {
|
||||
loginIfNeeded()
|
||||
|
||||
cy.get('.ui.massive.icon.primary.left.labeled.button')
|
||||
.should('be.visible')
|
||||
.click()
|
||||
cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
|
||||
|
||||
cy.get('.ui.massive.loading.primary.button', {
|
||||
timeout: testingFinishTimeout
|
||||
}).should('not.exist')
|
||||
waitForTestsToFinish(testingFinishTimeout)
|
||||
|
||||
cy.get('span.icon.failed').should('not.exist')
|
||||
assertNoFailedTests()
|
||||
})
|
||||
|
||||
it('Should have all tests successful with debug on', () => {
|
||||
loginIfNeeded()
|
||||
|
||||
cy.get('.ui.fitted.toggle.checkbox label').should('be.visible').click()
|
||||
|
||||
cy.get('.ui.massive.icon.primary.left.labeled.button')
|
||||
cy.get('tests-view')
|
||||
.shadow()
|
||||
.find('#debug-toggle')
|
||||
.should('be.visible')
|
||||
.click()
|
||||
|
||||
cy.get('.ui.massive.loading.primary.button', {
|
||||
timeout: testingFinishTimeout
|
||||
}).should('not.exist')
|
||||
cy.get('tests-view').shadow().find('#run-btn').should('be.visible').click()
|
||||
|
||||
cy.get('span.icon.failed').should('not.exist')
|
||||
waitForTestsToFinish(testingFinishTimeout)
|
||||
|
||||
assertNoFailedTests()
|
||||
})
|
||||
})
|
||||
|
||||
Generated
+326
-117
@@ -5,11 +5,10 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@sasjs/adapter",
|
||||
"hasInstallScript": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@sasjs/utils": "3.5.2",
|
||||
"axios": "1.12.2",
|
||||
"@sasjs/utils": "^3.5.6",
|
||||
"axios": "1.16.0",
|
||||
"axios-cookiejar-support": "5.0.5",
|
||||
"form-data": "4.0.4",
|
||||
"https": "1.0.0",
|
||||
@@ -26,7 +25,7 @@
|
||||
"copyfiles": "2.4.1",
|
||||
"cors": "^2.8.5",
|
||||
"cp": "0.2.0",
|
||||
"cypress": "7.7.0",
|
||||
"cypress": "^15.7.1",
|
||||
"dotenv": "16.0.0",
|
||||
"express": "4.17.3",
|
||||
"jest": "29.7.0",
|
||||
@@ -35,7 +34,7 @@
|
||||
"node-polyfill-webpack-plugin": "1.1.4",
|
||||
"path": "0.12.7",
|
||||
"pem": "1.14.5",
|
||||
"prettier": "2.8.7",
|
||||
"prettier": "3.8.2",
|
||||
"process": "0.11.10",
|
||||
"semantic-release": "19.0.3",
|
||||
"terser-webpack-plugin": "5.3.6",
|
||||
@@ -1694,7 +1693,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@cypress/request": {
|
||||
"version": "2.88.12",
|
||||
"version": "3.0.9",
|
||||
"resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.9.tgz",
|
||||
"integrity": "sha512-I3l7FdGRXluAS44/0NguwWlO83J18p0vlr2FYHrJkWdNYhgVoiYo61IXPqaOsL+vNxU1ZqMACzItGK3/KKDsdw==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
@@ -1704,16 +1705,16 @@
|
||||
"combined-stream": "~1.0.6",
|
||||
"extend": "~3.0.2",
|
||||
"forever-agent": "~0.6.1",
|
||||
"form-data": "~2.3.2",
|
||||
"http-signature": "~1.3.6",
|
||||
"form-data": "~4.0.4",
|
||||
"http-signature": "~1.4.0",
|
||||
"is-typedarray": "~1.0.0",
|
||||
"isstream": "~0.1.2",
|
||||
"json-stringify-safe": "~5.0.1",
|
||||
"mime-types": "~2.1.19",
|
||||
"performance-now": "^2.1.0",
|
||||
"qs": "~6.10.3",
|
||||
"qs": "6.14.0",
|
||||
"safe-buffer": "^5.1.2",
|
||||
"tough-cookie": "^4.1.3",
|
||||
"tough-cookie": "^5.0.0",
|
||||
"tunnel-agent": "^0.6.0",
|
||||
"uuid": "^8.3.2"
|
||||
},
|
||||
@@ -1721,17 +1722,17 @@
|
||||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/@cypress/request/node_modules/form-data": {
|
||||
"version": "2.3.3",
|
||||
"node_modules/@cypress/request/node_modules/tough-cookie": {
|
||||
"version": "5.1.2",
|
||||
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
|
||||
"integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"asynckit": "^0.4.0",
|
||||
"combined-stream": "^1.0.6",
|
||||
"mime-types": "^2.1.12"
|
||||
"tldts": "^6.1.32"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 0.12"
|
||||
"node": ">=16"
|
||||
}
|
||||
},
|
||||
"node_modules/@cypress/webpack-preprocessor": {
|
||||
@@ -2424,10 +2425,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@sasjs/utils": {
|
||||
"version": "3.5.2",
|
||||
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.2.tgz",
|
||||
"integrity": "sha512-LBpBDx0T7G/eO15Gb+r3DR1LfBnoqagWT3HiHabojFziA4ej4ePORo8chrk0zHLIzrjI2ljAnDabyJEwC5KtIA==",
|
||||
"hasInstallScript": true,
|
||||
"version": "3.5.6",
|
||||
"resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-3.5.6.tgz",
|
||||
"integrity": "sha512-jx8zWSOysDD66vTjA0BWiZ8bcFqmqh8F+56fUCgLmJhm89eDbKrGF3mDKMQx3UE7d2+gxp9xYhJCdaBWz0Dlxw==",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@fast-csv/format": "4.3.5",
|
||||
@@ -2962,7 +2962,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@types/sinonjs__fake-timers": {
|
||||
"version": "6.0.4",
|
||||
"version": "8.1.1",
|
||||
"resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
|
||||
"integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -2978,6 +2980,13 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/tmp": {
|
||||
"version": "0.2.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
|
||||
"integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/tough-cookie": {
|
||||
"version": "4.0.2",
|
||||
"dev": true,
|
||||
@@ -3416,6 +3425,8 @@
|
||||
},
|
||||
"node_modules/asn1": {
|
||||
"version": "0.2.6",
|
||||
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
|
||||
"integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -3451,6 +3462,8 @@
|
||||
},
|
||||
"node_modules/assert-plus": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
|
||||
"integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
@@ -3498,6 +3511,8 @@
|
||||
},
|
||||
"node_modules/aws-sign2": {
|
||||
"version": "0.7.0",
|
||||
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
|
||||
"integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"engines": {
|
||||
@@ -3506,18 +3521,20 @@
|
||||
},
|
||||
"node_modules/aws4": {
|
||||
"version": "1.13.2",
|
||||
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
|
||||
"integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/axios": {
|
||||
"version": "1.12.2",
|
||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
|
||||
"integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
|
||||
"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.6",
|
||||
"form-data": "^4.0.4",
|
||||
"proxy-from-env": "^1.1.0"
|
||||
"follow-redirects": "^1.16.0",
|
||||
"form-data": "^4.0.5",
|
||||
"proxy-from-env": "^2.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/axios-cookiejar-support": {
|
||||
@@ -3539,6 +3556,22 @@
|
||||
"tough-cookie": ">=4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/axios/node_modules/form-data": {
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
|
||||
"integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"asynckit": "^0.4.0",
|
||||
"combined-stream": "^1.0.8",
|
||||
"es-set-tostringtag": "^2.1.0",
|
||||
"hasown": "^2.0.2",
|
||||
"mime-types": "^2.1.12"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/babel-jest": {
|
||||
"version": "29.7.0",
|
||||
"resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
|
||||
@@ -3739,6 +3772,8 @@
|
||||
},
|
||||
"node_modules/bcrypt-pbkdf": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
|
||||
"integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
@@ -4185,6 +4220,8 @@
|
||||
},
|
||||
"node_modules/caseless": {
|
||||
"version": "0.12.0",
|
||||
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
|
||||
"integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0"
|
||||
},
|
||||
@@ -4220,14 +4257,6 @@
|
||||
"node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/check-more-types": {
|
||||
"version": "2.24.0",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">= 0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/chrome-trace-event": {
|
||||
"version": "1.0.4",
|
||||
"dev": true,
|
||||
@@ -4415,7 +4444,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/commander": {
|
||||
"version": "5.1.0",
|
||||
"version": "6.2.1",
|
||||
"resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
|
||||
"integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
@@ -4808,58 +4839,129 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cypress": {
|
||||
"version": "7.7.0",
|
||||
"version": "15.7.1",
|
||||
"resolved": "https://registry.npmjs.org/cypress/-/cypress-15.7.1.tgz",
|
||||
"integrity": "sha512-U3sYnJ+Cnpgr6IPycxsznTg//mGVXfPGeGV+om7VQCyp5XyVkhG4oPr3X3hTq1+OB0Om0O5DxusYmt7cbvwqMQ==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@cypress/request": "^2.88.5",
|
||||
"@cypress/request": "^3.0.9",
|
||||
"@cypress/xvfb": "^1.2.4",
|
||||
"@types/node": "^14.14.31",
|
||||
"@types/sinonjs__fake-timers": "^6.0.2",
|
||||
"@types/sinonjs__fake-timers": "8.1.1",
|
||||
"@types/sizzle": "^2.3.2",
|
||||
"@types/tmp": "^0.2.3",
|
||||
"arch": "^2.2.0",
|
||||
"blob-util": "^2.0.2",
|
||||
"bluebird": "^3.7.2",
|
||||
"buffer": "^5.7.1",
|
||||
"cachedir": "^2.3.0",
|
||||
"chalk": "^4.1.0",
|
||||
"check-more-types": "^2.24.0",
|
||||
"ci-info": "^4.1.0",
|
||||
"cli-cursor": "^3.1.0",
|
||||
"cli-table3": "~0.6.0",
|
||||
"commander": "^5.1.0",
|
||||
"cli-table3": "0.6.1",
|
||||
"commander": "^6.2.1",
|
||||
"common-tags": "^1.8.0",
|
||||
"dayjs": "^1.10.4",
|
||||
"debug": "^4.3.2",
|
||||
"debug": "^4.3.4",
|
||||
"enquirer": "^2.3.6",
|
||||
"eventemitter2": "^6.4.3",
|
||||
"eventemitter2": "6.4.7",
|
||||
"execa": "4.1.0",
|
||||
"executable": "^4.1.1",
|
||||
"extract-zip": "2.0.1",
|
||||
"figures": "^3.2.0",
|
||||
"fs-extra": "^9.1.0",
|
||||
"getos": "^3.2.1",
|
||||
"is-ci": "^3.0.0",
|
||||
"hasha": "5.2.2",
|
||||
"is-installed-globally": "~0.4.0",
|
||||
"lazy-ass": "^1.6.0",
|
||||
"listr2": "^3.8.3",
|
||||
"lodash": "^4.17.21",
|
||||
"log-symbols": "^4.0.0",
|
||||
"minimist": "^1.2.5",
|
||||
"minimist": "^1.2.8",
|
||||
"ospath": "^1.2.2",
|
||||
"pretty-bytes": "^5.6.0",
|
||||
"ramda": "~0.27.1",
|
||||
"process": "^0.11.10",
|
||||
"proxy-from-env": "1.0.0",
|
||||
"request-progress": "^3.0.0",
|
||||
"supports-color": "^8.1.1",
|
||||
"tmp": "~0.2.1",
|
||||
"systeminformation": "5.27.7",
|
||||
"tmp": "~0.2.4",
|
||||
"tree-kill": "1.2.2",
|
||||
"untildify": "^4.0.0",
|
||||
"url": "^0.11.0",
|
||||
"yauzl": "^2.10.0"
|
||||
},
|
||||
"bin": {
|
||||
"cypress": "bin/cypress"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12.0.0"
|
||||
"node": "^20.1.0 || ^22.0.0 || >=24.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/cypress/node_modules/buffer": {
|
||||
"version": "5.7.1",
|
||||
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
|
||||
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/feross"
|
||||
},
|
||||
{
|
||||
"type": "patreon",
|
||||
"url": "https://www.patreon.com/feross"
|
||||
},
|
||||
{
|
||||
"type": "consulting",
|
||||
"url": "https://feross.org/support"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"base64-js": "^1.3.1",
|
||||
"ieee754": "^1.1.13"
|
||||
}
|
||||
},
|
||||
"node_modules/cypress/node_modules/ci-info": {
|
||||
"version": "4.3.1",
|
||||
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz",
|
||||
"integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/sibiraj-s"
|
||||
}
|
||||
],
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/cypress/node_modules/cli-table3": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
|
||||
"integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"string-width": "^4.2.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": "10.* || >= 12.*"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"colors": "1.4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/cypress/node_modules/colors": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
|
||||
"integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"engines": {
|
||||
"node": ">=0.1.90"
|
||||
}
|
||||
},
|
||||
"node_modules/cypress/node_modules/fs-extra": {
|
||||
@@ -4876,6 +4978,13 @@
|
||||
"node": ">=10"
|
||||
}
|
||||
},
|
||||
"node_modules/cypress/node_modules/proxy-from-env": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
|
||||
"integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cypress/node_modules/supports-color": {
|
||||
"version": "8.1.1",
|
||||
"dev": true,
|
||||
@@ -4892,6 +5001,8 @@
|
||||
},
|
||||
"node_modules/dashdash": {
|
||||
"version": "1.14.1",
|
||||
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
|
||||
"integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -5250,6 +5361,8 @@
|
||||
},
|
||||
"node_modules/ecc-jsbn": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
|
||||
"integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -5618,7 +5731,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/eventemitter2": {
|
||||
"version": "6.4.9",
|
||||
"version": "6.4.7",
|
||||
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
|
||||
"integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -5772,6 +5887,8 @@
|
||||
},
|
||||
"node_modules/extend": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
|
||||
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -5796,6 +5913,8 @@
|
||||
},
|
||||
"node_modules/extsprintf": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
|
||||
"integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
|
||||
"dev": true,
|
||||
"engines": [
|
||||
"node >=0.6.0"
|
||||
@@ -6016,7 +6135,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/follow-redirects": {
|
||||
"version": "1.15.9",
|
||||
"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",
|
||||
@@ -6049,6 +6170,8 @@
|
||||
},
|
||||
"node_modules/forever-agent": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
|
||||
"integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"engines": {
|
||||
@@ -6159,6 +6282,21 @@
|
||||
"dev": true,
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/fsevents": {
|
||||
"version": "2.3.3",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
|
||||
"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/function-bind": {
|
||||
"version": "1.1.2",
|
||||
"license": "MIT",
|
||||
@@ -6239,16 +6377,10 @@
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/getos": {
|
||||
"version": "3.2.1",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"async": "^3.2.0"
|
||||
}
|
||||
},
|
||||
"node_modules/getpass": {
|
||||
"version": "0.1.7",
|
||||
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
|
||||
"integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -6456,6 +6588,33 @@
|
||||
"minimalistic-assert": "^1.0.1"
|
||||
}
|
||||
},
|
||||
"node_modules/hasha": {
|
||||
"version": "5.2.2",
|
||||
"resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
|
||||
"integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"is-stream": "^2.0.0",
|
||||
"type-fest": "^0.8.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/hasha/node_modules/type-fest": {
|
||||
"version": "0.8.1",
|
||||
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
|
||||
"integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
|
||||
"dev": true,
|
||||
"license": "(MIT OR CC0-1.0)",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/hasown": {
|
||||
"version": "2.0.2",
|
||||
"license": "MIT",
|
||||
@@ -6595,13 +6754,15 @@
|
||||
}
|
||||
},
|
||||
"node_modules/http-signature": {
|
||||
"version": "1.3.6",
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
|
||||
"integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"assert-plus": "^1.0.0",
|
||||
"jsprim": "^2.0.2",
|
||||
"sshpk": "^1.14.1"
|
||||
"sshpk": "^1.18.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.10"
|
||||
@@ -6835,17 +6996,6 @@
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/is-ci": {
|
||||
"version": "3.0.1",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"ci-info": "^3.2.0"
|
||||
},
|
||||
"bin": {
|
||||
"is-ci": "bin.js"
|
||||
}
|
||||
},
|
||||
"node_modules/is-core-module": {
|
||||
"version": "2.16.1",
|
||||
"dev": true,
|
||||
@@ -7054,6 +7204,8 @@
|
||||
},
|
||||
"node_modules/is-typedarray": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
|
||||
"integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -7088,6 +7240,8 @@
|
||||
},
|
||||
"node_modules/isstream": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
|
||||
"integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -8107,9 +8261,7 @@
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/js-yaml": {
|
||||
"version": "3.14.2",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
|
||||
"integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
|
||||
"version": "3.14.1",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -8122,6 +8274,8 @@
|
||||
},
|
||||
"node_modules/jsbn": {
|
||||
"version": "0.1.1",
|
||||
"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
|
||||
"integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -8194,6 +8348,8 @@
|
||||
},
|
||||
"node_modules/json-schema": {
|
||||
"version": "0.4.0",
|
||||
"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
|
||||
"integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
|
||||
"dev": true,
|
||||
"license": "(AFL-2.1 OR BSD-3-Clause)"
|
||||
},
|
||||
@@ -8258,6 +8414,8 @@
|
||||
},
|
||||
"node_modules/jsprim": {
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
|
||||
"integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
|
||||
"dev": true,
|
||||
"engines": [
|
||||
"node >=0.6.0"
|
||||
@@ -8289,14 +8447,6 @@
|
||||
"node": ">=6"
|
||||
}
|
||||
},
|
||||
"node_modules/lazy-ass": {
|
||||
"version": "1.6.0",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": "> 0.8"
|
||||
}
|
||||
},
|
||||
"node_modules/leven": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
|
||||
@@ -12047,6 +12197,8 @@
|
||||
},
|
||||
"node_modules/performance-now": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
|
||||
"integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
@@ -12169,14 +12321,16 @@
|
||||
}
|
||||
},
|
||||
"node_modules/prettier": {
|
||||
"version": "2.8.7",
|
||||
"version": "3.8.2",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.2.tgz",
|
||||
"integrity": "sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"prettier": "bin-prettier.js"
|
||||
"prettier": "bin/prettier.cjs"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.13.0"
|
||||
"node": ">=14"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/prettier/prettier?sponsor=1"
|
||||
@@ -12263,10 +12417,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",
|
||||
@@ -12339,11 +12496,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/qs": {
|
||||
"version": "6.10.4",
|
||||
"version": "6.14.0",
|
||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
|
||||
"integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"side-channel": "^1.0.4"
|
||||
"side-channel": "^1.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.6"
|
||||
@@ -12390,11 +12549,6 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/ramda": {
|
||||
"version": "0.27.2",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/randombytes": {
|
||||
"version": "2.1.0",
|
||||
"dev": true,
|
||||
@@ -13415,6 +13569,8 @@
|
||||
},
|
||||
"node_modules/sshpk": {
|
||||
"version": "1.18.0",
|
||||
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
|
||||
"integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
@@ -13652,6 +13808,33 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/systeminformation": {
|
||||
"version": "5.27.7",
|
||||
"resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.27.7.tgz",
|
||||
"integrity": "sha512-saaqOoVEEFaux4v0K8Q7caiauRwjXC4XbD2eH60dxHXbpKxQ8kH9Rf7Jh+nryKpOUSEFxtCdBlSUx0/lO6rwRg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"os": [
|
||||
"darwin",
|
||||
"linux",
|
||||
"win32",
|
||||
"freebsd",
|
||||
"openbsd",
|
||||
"netbsd",
|
||||
"sunos",
|
||||
"android"
|
||||
],
|
||||
"bin": {
|
||||
"systeminformation": "lib/cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "Buy me a coffee",
|
||||
"url": "https://www.buymeacoffee.com/systeminfo"
|
||||
}
|
||||
},
|
||||
"node_modules/tapable": {
|
||||
"version": "2.2.1",
|
||||
"dev": true,
|
||||
@@ -13852,8 +14035,30 @@
|
||||
"node": ">=0.6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/tldts": {
|
||||
"version": "6.1.86",
|
||||
"resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
|
||||
"integrity": "sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"tldts-core": "^6.1.86"
|
||||
},
|
||||
"bin": {
|
||||
"tldts": "bin/cli.js"
|
||||
}
|
||||
},
|
||||
"node_modules/tldts-core": {
|
||||
"version": "6.1.86",
|
||||
"resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.86.tgz",
|
||||
"integrity": "sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/tmp": {
|
||||
"version": "0.2.3",
|
||||
"version": "0.2.5",
|
||||
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
|
||||
"integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
@@ -13934,6 +14139,16 @@
|
||||
"version": "0.1.0",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/tree-kill": {
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
|
||||
"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
"tree-kill": "cli.js"
|
||||
}
|
||||
},
|
||||
"node_modules/trim-newlines": {
|
||||
"version": "3.0.1",
|
||||
"dev": true,
|
||||
@@ -14194,6 +14409,8 @@
|
||||
},
|
||||
"node_modules/tunnel-agent": {
|
||||
"version": "0.6.0",
|
||||
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
|
||||
"integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
|
||||
"dev": true,
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
@@ -14205,6 +14422,8 @@
|
||||
},
|
||||
"node_modules/tweetnacl": {
|
||||
"version": "0.14.5",
|
||||
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
|
||||
"integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
|
||||
"dev": true,
|
||||
"license": "Unlicense"
|
||||
},
|
||||
@@ -14460,20 +14679,6 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/url/node_modules/qs": {
|
||||
"version": "6.14.0",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
"side-channel": "^1.1.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=0.6"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/ljharb"
|
||||
}
|
||||
},
|
||||
"node_modules/util": {
|
||||
"version": "0.12.5",
|
||||
"dev": true,
|
||||
@@ -14501,6 +14706,8 @@
|
||||
},
|
||||
"node_modules/uuid": {
|
||||
"version": "8.3.2",
|
||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
|
||||
"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"bin": {
|
||||
@@ -14544,6 +14751,8 @@
|
||||
},
|
||||
"node_modules/verror": {
|
||||
"version": "1.10.0",
|
||||
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
|
||||
"integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
|
||||
"dev": true,
|
||||
"engines": [
|
||||
"node >=0.6.0"
|
||||
|
||||
+8
-11
@@ -4,17 +4,14 @@
|
||||
"homepage": "https://adapter.sasjs.io",
|
||||
"scripts": {
|
||||
"nodeVersionMessage": "echo \u001b[33m make sure you are running node lts version \u001b[0m",
|
||||
"preinstall": "npm run nodeVersionMessage",
|
||||
"prebuild": "npm run nodeVersionMessage",
|
||||
"build": "npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
|
||||
"build": "npm run nodeVersionMessage && npx rimraf build && npx rimraf node && mkdir node && copyfiles -u 1 \"./src/**/*\" ./node && webpack && npx rimraf build/src && npx rimraf node",
|
||||
"package:lib": "npm run build && copyfiles ./package.json build && cd build && npm version \"5.0.0\" && npm pack",
|
||||
"publish:lib": "npm run build && cd build && npm publish",
|
||||
"lint:fix": "npx prettier --loglevel silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --write \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
|
||||
"lint:fix": "npx prettier --log-level silent --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --write \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --write \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
|
||||
"lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
|
||||
"lint:silent": "npx prettier --loglevel silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --loglevel silent --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
|
||||
"lint:silent": "npx prettier --log-level silent --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --check \"sasjs-tests/src/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\" && npx prettier --log-level silent --check \"cypress/**/*.{ts,tsx,js,jsx,html,css,sass,less,json,yml,md,graphql}\"",
|
||||
"test": "jest --silent --coverage",
|
||||
"prepublishOnly": "cp -r ./build/* . && rm -rf ./build",
|
||||
"postpublish": "git clean -fd",
|
||||
"publishInit": "cp -r ./build/* . && rm -rf ./build",
|
||||
"semantic-release": "semantic-release",
|
||||
"typedoc": "node createTSDocs",
|
||||
"prepare": "git rev-parse --git-dir && git config core.hooksPath ./.git-hooks && git config core.autocrlf false || true",
|
||||
@@ -54,7 +51,7 @@
|
||||
"copyfiles": "2.4.1",
|
||||
"cors": "^2.8.5",
|
||||
"cp": "0.2.0",
|
||||
"cypress": "7.7.0",
|
||||
"cypress": "^15.7.1",
|
||||
"dotenv": "16.0.0",
|
||||
"express": "4.17.3",
|
||||
"jest": "29.7.0",
|
||||
@@ -63,7 +60,7 @@
|
||||
"node-polyfill-webpack-plugin": "1.1.4",
|
||||
"path": "0.12.7",
|
||||
"pem": "1.14.5",
|
||||
"prettier": "2.8.7",
|
||||
"prettier": "3.8.2",
|
||||
"process": "0.11.10",
|
||||
"semantic-release": "19.0.3",
|
||||
"terser-webpack-plugin": "5.3.6",
|
||||
@@ -79,8 +76,8 @@
|
||||
},
|
||||
"main": "index.js",
|
||||
"dependencies": {
|
||||
"@sasjs/utils": "3.5.2",
|
||||
"axios": "1.12.2",
|
||||
"@sasjs/utils": "^3.5.6",
|
||||
"axios": "1.16.0",
|
||||
"axios-cookiejar-support": "5.0.5",
|
||||
"form-data": "4.0.4",
|
||||
"https": "1.0.0",
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
SKIP_PREFLIGHT_CHECK=true
|
||||
# Removes index.html inline scripts
|
||||
INLINE_RUNTIME_CHUNK=false
|
||||
+23
-17
@@ -1,23 +1,29 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
/.pnp
|
||||
.pnp.js
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
# production
|
||||
/build
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
.env.*
|
||||
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
|
||||
|
||||
# sasjs
|
||||
sasjsbuild
|
||||
sasjsresults
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"trailingComma": "none",
|
||||
"tabWidth": 2,
|
||||
"semi": false,
|
||||
"singleQuote": true
|
||||
}
|
||||
+134
-27
@@ -1,16 +1,18 @@
|
||||
# SASjs Tests
|
||||
|
||||
`sasjs-tests` is a test suite for the SASjs adapter.
|
||||
|
||||
It is a React app bootstrapped using [Create React App](https://github.com/facebook/create-react-app) and [@sasjs/test-framework](https://github.com/sasjs/test-framework).
|
||||
Browser-based integration testing for [@sasjs/adapter](https://github.com/sasjs/adapter) using TypeScript, Custom Elements, and zero dependencies.
|
||||
|
||||
When developing on `@sasjs/adapter`, it's good practice to run the test suite against your changed version of the adapter to ensure that existing functionality has not been impacted.
|
||||
|
||||
You can use the provided `update:adapter` NPM script for this.
|
||||
> **Note:** `@sasjs/adapter` is not listed as a dependency in `package.json` - it is installed from a local build. After cloning or running `npm install`, you must run `update:adapter` before building.
|
||||
|
||||
```bash
|
||||
npm run update:adapter
|
||||
```
|
||||
|
||||
This scripts builds a new version of the adapter and installs it in the `sasjs-tests` project.
|
||||
This script builds a new version of the adapter and installs it in the `sasjs-tests` project.
|
||||
|
||||
## Running tests
|
||||
|
||||
@@ -20,11 +22,70 @@ There are three prerequisites to be able to run the tests:
|
||||
2. `sasjs-tests` deployed to your SAS server.
|
||||
3. The required SAS services created on the same server.
|
||||
|
||||
### 1. Configuring the SASjs adapter
|
||||
### Configuring the SASjs adapter
|
||||
|
||||
There is a `config.json` file in the `/public` folder which specifies the configuration for the SASjs adapter. You can set the values within the `sasjsConfig` property in this file to match your SAS server configuration.
|
||||
|
||||
### 2. Deploying to your SAS server
|
||||
## Test Suites
|
||||
|
||||
Tests are defined in `src/testSuites/`:
|
||||
|
||||
- **Basic.ts** - Login, config, session management, debug mode
|
||||
- **RequestData.ts** - Data serialization (sendArr, sendObj) with various types
|
||||
- **FileUpload.ts** - File upload functionality (VIYA only)
|
||||
- **Compute.ts** - Compute API, JES API, executeScript (VIYA only)
|
||||
- **SasjsRequests.ts** - WORK tables, log capture
|
||||
- **SpecialCases.ts** - Edge cases (currently disabled)
|
||||
|
||||
Each test suite follows this pattern:
|
||||
|
||||
```typescript
|
||||
export const myTests = (adapter: SASjs): TestSuite => ({
|
||||
name: 'My Test Suite',
|
||||
tests: [
|
||||
{
|
||||
title: 'Should do something',
|
||||
description: 'Description of what this tests',
|
||||
test: async () => {
|
||||
// Test logic - return a value
|
||||
return adapter.request('service', data)
|
||||
},
|
||||
assertion: (response) => {
|
||||
// Assertion - return true/false
|
||||
return response.success === true
|
||||
}
|
||||
}
|
||||
],
|
||||
beforeAll: async () => {
|
||||
// Optional: runs once before all tests
|
||||
},
|
||||
afterAll: async () => {
|
||||
// Optional: runs once after all tests
|
||||
}
|
||||
})
|
||||
```
|
||||
|
||||
### Shadow DOM Access
|
||||
|
||||
Cypress accesses Shadow DOM using a custom command:
|
||||
|
||||
```javascript
|
||||
cy.get('login-form').shadow().find('input#username').type('user')
|
||||
```
|
||||
|
||||
The `shadow()` command is defined in `cypress/support/commands.js`.
|
||||
|
||||
## Deployment
|
||||
|
||||
### Build for Production
|
||||
|
||||
```bash
|
||||
npm run build
|
||||
```
|
||||
|
||||
This creates a `dist/` folder ready for deployment.
|
||||
|
||||
### Deploy to SAS Server
|
||||
|
||||
There is a `deploy` NPM script provided in the `sasjs-tests` project's `package.json`.
|
||||
|
||||
@@ -42,21 +103,26 @@ SSH_ACCOUNT=me@my-sas-server.com DEPLOY_PATH=/var/www/html/my-folder/sasjs-tests
|
||||
```
|
||||
|
||||
If you are on `WINDOWS`, you will first need to install one dependency:
|
||||
|
||||
```bash
|
||||
npm i -g copyfiles
|
||||
```
|
||||
|
||||
and then run to build:
|
||||
|
||||
```bash
|
||||
npm run update:adapter && npm run build
|
||||
```
|
||||
|
||||
when it finishes run to deploy:
|
||||
|
||||
```bash
|
||||
scp -rp ./build/* me@my-sas-server.com:/var/www/html/my-folder/sasjs-tests
|
||||
```
|
||||
|
||||
If you'd like to deploy just `sasjs-tests` without changing the adapter version, you can use the `deploy:tests` script, while also setting the same environment variables as above.
|
||||
|
||||
## 3. Creating the required SAS services
|
||||
#### Creating the required SAS services
|
||||
|
||||
The below services need to be created on your SAS server, at the location specified as the `appLoc` in the SASjs configuration.
|
||||
|
||||
@@ -75,8 +141,8 @@ parmcards4;
|
||||
%let table=%scan(&sasjs_tables,&i);
|
||||
%webout(OBJ,&table,missing=STRING,showmeta=YES)
|
||||
%end;
|
||||
%else %do i=1 %to &_webin_file_count;
|
||||
%webout(OBJ,&&_webin_name&i,missing=STRING,showmeta=YES)
|
||||
%else %do i=1 %to &_webin_file_count;
|
||||
%webout(OBJ,&&_webin_name&i,missing=STRING,showmeta=YES)
|
||||
%end;
|
||||
%mend; %x()
|
||||
%webout(CLOSE)
|
||||
@@ -90,8 +156,8 @@ parmcards4;
|
||||
%let table=%scan(&sasjs_tables,&i);
|
||||
%webout(ARR,&table,missing=STRING,showmeta=YES)
|
||||
%end;
|
||||
%else %do i=1 %to &_webin_file_count;
|
||||
%webout(ARR,&&_webin_name&i,missing=STRING,showmeta=YES)
|
||||
%else %do i=1 %to &_webin_file_count;
|
||||
%webout(ARR,&&_webin_name&i,missing=STRING,showmeta=YES)
|
||||
%end;
|
||||
%mend; %x()
|
||||
%webout(CLOSE)
|
||||
@@ -102,7 +168,7 @@ parmcards4;
|
||||
set sashelp.vmacro;
|
||||
run;
|
||||
%webout(OPEN)
|
||||
%webout(OBJ,macvars)
|
||||
%webout(OBJ,macvars)
|
||||
%webout(CLOSE)
|
||||
;;;;
|
||||
%mx_createwebservice(path=&apploc/services/common,name=sendMacVars)
|
||||
@@ -126,23 +192,64 @@ data _null_;
|
||||
|
||||
You should now be able to access the tests in your browser at the deployed path on your server.
|
||||
|
||||
## Creating new tests
|
||||
#### Using SASjs CLI
|
||||
|
||||
The `src/testSuites` folder contains all the test suites currently available.
|
||||
Each suite contains a set of specs, each of which looks like this:
|
||||
|
||||
```javascript
|
||||
{
|
||||
title: "Your test title",
|
||||
description: "A slightly more detailed description",
|
||||
test: async () => {
|
||||
// typically makes a request using the adapter and returns a promise
|
||||
},
|
||||
assertion: (response: any) =>
|
||||
// receives the response when the test promise resolves, runs an assertion and returns a boolean
|
||||
}
|
||||
```bash
|
||||
sasjs deploy -t <target>
|
||||
```
|
||||
|
||||
A test suite is an array of such objects, along with a `name` property.
|
||||
### Matrix Notifications
|
||||
|
||||
You can add your test to one of the existing suites if suitable, or create a new file that specifies a new test suite.
|
||||
The `sasjs-cypress-run.sh` script sends Matrix chat notifications on test failure:
|
||||
|
||||
```bash
|
||||
./sasjs-cypress-run.sh $MATRIX_ACCESS_TOKEN $PR_NUMBER
|
||||
```
|
||||
|
||||
Notification format:
|
||||
|
||||
```
|
||||
Automated sasjs-tests failed on the @sasjs/adapter PR: <PR_NUMBER>
|
||||
```
|
||||
|
||||
## SAS Service Setup
|
||||
|
||||
The tests require SAS services to be deployed at the `appLoc` specified in `config.json`.
|
||||
|
||||
Services expected:
|
||||
|
||||
- `common/sendArr` - Echo back array data
|
||||
- `common/sendObj` - Echo back object data
|
||||
- (Additional services per test suite)
|
||||
|
||||
Deploy these services using [SASjs CLI](https://cli.sasjs.io) or manually.
|
||||
|
||||
## UI Components (Custom Elements)
|
||||
|
||||
- `<login-form>` - SAS authentication
|
||||
- `<tests-view>` - Test orchestrator with run controls
|
||||
- `<test-suite>` - Test suite display with stats
|
||||
- `<test-card>` - Individual test with status (pending/running/passed/failed)
|
||||
|
||||
All components use Shadow DOM for style encapsulation and expose custom events for interactivity.
|
||||
|
||||
### Adding New Test Suites
|
||||
|
||||
1. Create file in `src/testSuites/MyNewTests.ts`
|
||||
2. Export function returning TestSuite
|
||||
3. Import in `src/index.ts`
|
||||
4. Add to `testSuites` array in `showTests()` function
|
||||
|
||||
### Modifying UI Components
|
||||
|
||||
Components are in `src/components/`:
|
||||
|
||||
- Edit `.ts` file
|
||||
- Styles are in corresponding `.css` file
|
||||
- Rebuild with `npm run build`
|
||||
|
||||
## Links
|
||||
|
||||
- [@sasjs/adapter](https://adapter.sasjs.io)
|
||||
- [SASjs Documentation](https://sasjs.io)
|
||||
- [SASjs CLI](https://cli.sasjs.io)
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
// craco.config.js
|
||||
// We use craco instead of react-scripts so we can override webpack config, to include source maps
|
||||
// so we can debug @sasjs/adapter easier when tests fail
|
||||
module.exports = {
|
||||
webpack: {
|
||||
configure: (webpackConfig, { env }) => {
|
||||
// Disable optimizations in both development and production
|
||||
webpackConfig.optimization.minimize = false;
|
||||
webpackConfig.optimization.minimizer = [];
|
||||
webpackConfig.optimization.concatenateModules = false;
|
||||
webpackConfig.optimization.splitChunks = { cacheGroups: { default: false } };
|
||||
return webpackConfig;
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,39 @@
|
||||
* {
|
||||
box-sizing: border-box;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
|
||||
Ubuntu, Cantarell, sans-serif;
|
||||
line-height: 1.6;
|
||||
color: #333;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
|
||||
.app__error {
|
||||
max-width: 800px;
|
||||
margin: 50px auto;
|
||||
padding: 30px;
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
|
||||
|
||||
h1 {
|
||||
color: #e74c3c;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
p {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
pre {
|
||||
background: #2c3e50;
|
||||
color: #ecf0f1;
|
||||
padding: 15px;
|
||||
border-radius: 4px;
|
||||
overflow-x: auto;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/png" href="./src/images/favicon.png" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>SASjs tests</title>
|
||||
<link rel="stylesheet" href="./index.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="./src/main.ts"></script>
|
||||
</body>
|
||||
</html>
|
||||
Generated
+581
-25406
File diff suppressed because it is too large
Load Diff
+13
-41
@@ -1,50 +1,22 @@
|
||||
{
|
||||
"name": "@sasjs/tests",
|
||||
"version": "1.0.0",
|
||||
"homepage": ".",
|
||||
"name": "sasjs-tests-new",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@sasjs/adapter": "file:../build/sasjs-adapter-5.0.0.tgz",
|
||||
"@sasjs/test-framework": "1.5.7",
|
||||
"@types/jest": "^26.0.20",
|
||||
"@types/node": "^14.14.41",
|
||||
"@types/react": "^16.0.1",
|
||||
"@types/react-dom": "^16.0.0",
|
||||
"@types/react-router-dom": "^5.1.7",
|
||||
"react": "^16.0.1",
|
||||
"react-dom": "^16.0.1",
|
||||
"react-router-dom": "^5.2.0",
|
||||
"react-scripts": "4.0.3",
|
||||
"typescript": "^4.1.3"
|
||||
},
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"start": "NODE_OPTIONS=--openssl-legacy-provider react-scripts start",
|
||||
"build": "NODE_OPTIONS=--openssl-legacy-provider craco build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject",
|
||||
"start": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"preview": "vite preview",
|
||||
"update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz",
|
||||
"deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH || npm run deploy:tests-win",
|
||||
"deploy:tests-win": "scp %DEPLOY_PATH% ./build/*",
|
||||
"deploy:tests": "rsync -avhe ssh ./dist/* --delete $SSH_ACCOUNT:$DEPLOY_PATH || npm run deploy:tests-win",
|
||||
"deploy:tests-win": "scp %DEPLOY_PATH% ./dist/*",
|
||||
"deploy": "npm run update:adapter && npm run build && npm run deploy:tests"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": "react-app"
|
||||
},
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not op_mini all"
|
||||
],
|
||||
"development": [
|
||||
"last 1 chrome version",
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@craco/craco": "6.4.3",
|
||||
"node-sass": "9.0.0",
|
||||
"source-map-loader": "0.2.4"
|
||||
"typescript": "~5.9.3",
|
||||
"vite": "npm:rolldown-vite@7.2.2"
|
||||
},
|
||||
"overrides": {
|
||||
"vite": "npm:rolldown-vite@7.2.2"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
"userName": "",
|
||||
"password": "",
|
||||
"sasJsConfig": {
|
||||
"loginMechanism": "Redirected",
|
||||
"serverUrl": "",
|
||||
"appLoc": "/Public/app/adapter-tests/services",
|
||||
"appLoc": "/Public/app/adapter-tests",
|
||||
"serverType": "SASJS",
|
||||
"debug": false,
|
||||
"contextName": "sasjs adapter compute context",
|
||||
"contextName": "SAS Job Execution compute context",
|
||||
"useComputeApi": true
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB |
@@ -1,40 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<meta name="description" content="Tests for SASjs" />
|
||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||
<!--
|
||||
manifest.json provides metadata used when your web app is installed on a
|
||||
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
||||
-->
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||
<!--
|
||||
Notice the use of %PUBLIC_URL% in the tags above.
|
||||
It will be replaced with the URL of the `public` folder during the build.
|
||||
Only files inside the `public` folder can be referenced from the HTML.
|
||||
|
||||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
|
||||
work correctly both with client-side routing and a non-root public URL.
|
||||
Learn how to configure a non-root public URL by running `npm run build`.
|
||||
-->
|
||||
<title>SASjs Tests</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
<div id="root"></div>
|
||||
<!--
|
||||
This HTML file is a template.
|
||||
If you open it directly in the browser, you will see an empty page.
|
||||
|
||||
You can add webfonts, meta tags, or analytics to this file.
|
||||
The build step will place the bundled scripts into the <body> tag.
|
||||
|
||||
To begin the development, run `npm start` or `yarn start`.
|
||||
To create a production bundle, use `npm run build` or `yarn build`.
|
||||
-->
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.4 KiB |
@@ -1,25 +0,0 @@
|
||||
{
|
||||
"short_name": "React App",
|
||||
"name": "Create React App Sample",
|
||||
"icons": [
|
||||
{
|
||||
"src": "favicon.ico",
|
||||
"sizes": "64x64 32x32 24x24 16x16",
|
||||
"type": "image/x-icon"
|
||||
},
|
||||
{
|
||||
"src": "logo192.png",
|
||||
"type": "image/png",
|
||||
"sizes": "192x192"
|
||||
},
|
||||
{
|
||||
"src": "logo512.png",
|
||||
"type": "image/png",
|
||||
"sizes": "512x512"
|
||||
}
|
||||
],
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"theme_color": "#000000",
|
||||
"background_color": "#ffffff"
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 63 KiB |
@@ -7,7 +7,7 @@
|
||||
"targets": [
|
||||
{
|
||||
"name": "4gl",
|
||||
"serverUrl": "https://sas9.4gl.io",
|
||||
"serverUrl": "https://sas.4gl.io",
|
||||
"serverType": "SASJS",
|
||||
"httpsAgentOptions": {
|
||||
"allowInsecureRequests": false
|
||||
@@ -20,7 +20,7 @@
|
||||
"streamConfig": {
|
||||
"streamWeb": true,
|
||||
"streamWebFolder": "webv",
|
||||
"webSourcePath": "build",
|
||||
"webSourcePath": "dist",
|
||||
"streamServiceName": "adapter-tests",
|
||||
"assetPaths": []
|
||||
}
|
||||
@@ -40,7 +40,7 @@
|
||||
"streamConfig": {
|
||||
"streamWeb": true,
|
||||
"streamWebFolder": "webv",
|
||||
"webSourcePath": "build",
|
||||
"webSourcePath": "dist",
|
||||
"streamServiceName": "adapter-tests",
|
||||
"assetPaths": []
|
||||
}
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
import React, { ReactElement, useState, useContext, useEffect } from 'react'
|
||||
import { TestSuiteRunner, TestSuite, AppContext } from '@sasjs/test-framework'
|
||||
import { basicTests } from './testSuites/Basic'
|
||||
import { sendArrTests, sendObjTests } from './testSuites/RequestData'
|
||||
import { specialCaseTests } from './testSuites/SpecialCases'
|
||||
import { sasjsRequestTests } from './testSuites/SasjsRequests'
|
||||
import '@sasjs/test-framework/dist/index.css'
|
||||
import { computeTests } from './testSuites/Compute'
|
||||
import { fileUploadTests } from './testSuites/FileUpload'
|
||||
|
||||
const App = (): ReactElement<{}> => {
|
||||
const { adapter, config } = useContext(AppContext)
|
||||
const [testSuites, setTestSuites] = useState<TestSuite[]>([])
|
||||
const appLoc = config.sasJsConfig.appLoc
|
||||
|
||||
useEffect(() => {
|
||||
if (adapter) {
|
||||
const testSuites = [
|
||||
basicTests(adapter, config.userName, config.password),
|
||||
sendArrTests(adapter, appLoc),
|
||||
sendObjTests(adapter),
|
||||
// specialCaseTests(adapter),
|
||||
sasjsRequestTests(adapter),
|
||||
fileUploadTests(adapter)
|
||||
]
|
||||
|
||||
if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
|
||||
testSuites.push(computeTests(adapter, appLoc))
|
||||
}
|
||||
|
||||
setTestSuites(testSuites)
|
||||
}
|
||||
}, [adapter, config, appLoc])
|
||||
|
||||
return (
|
||||
<div className="app">
|
||||
{adapter && testSuites && <TestSuiteRunner testSuites={testSuites} />}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default App
|
||||
@@ -1,34 +0,0 @@
|
||||
.login-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100vh;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
img {
|
||||
max-width: 30%;
|
||||
}
|
||||
|
||||
form {
|
||||
width: 33%;
|
||||
margin-top: 3%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.row {
|
||||
input {
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
label {
|
||||
font-weight: bold;
|
||||
font-size: 0.9em;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
.submit-button {
|
||||
margin-top: 16px;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
import React, { ReactElement, useState, useCallback, useContext } from 'react'
|
||||
import './Login.scss'
|
||||
import { AppContext } from '@sasjs/test-framework'
|
||||
import { Redirect } from 'react-router-dom'
|
||||
|
||||
const Login = (): ReactElement<{}> => {
|
||||
const [username, setUsername] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
const appContext = useContext(AppContext)
|
||||
|
||||
const handleSubmit = useCallback(
|
||||
(e: any) => {
|
||||
e.preventDefault()
|
||||
appContext.adapter.logIn(username, password).then((res) => {
|
||||
appContext.setIsLoggedIn(res.isLoggedIn)
|
||||
})
|
||||
},
|
||||
[username, password, appContext]
|
||||
)
|
||||
|
||||
return !appContext.isLoggedIn ? (
|
||||
<div className="login-container">
|
||||
<img src="sasjs-logo.png" alt="SASjs Logo" />
|
||||
<form onSubmit={handleSubmit}>
|
||||
<div className="row">
|
||||
<label>User Name</label>
|
||||
<input
|
||||
placeholder="User Name"
|
||||
value={username}
|
||||
required
|
||||
onChange={(e: any) => setUsername(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="row">
|
||||
<label>Password</label>
|
||||
<input
|
||||
placeholder="Password"
|
||||
type="password"
|
||||
value={password}
|
||||
required
|
||||
onChange={(e: any) => setPassword(e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<button type="submit" className="submit-button">
|
||||
Log In
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
) : (
|
||||
<Redirect to="/" />
|
||||
)
|
||||
}
|
||||
|
||||
export default Login
|
||||
@@ -1,23 +0,0 @@
|
||||
import React, { ReactElement, useContext, FunctionComponent } from 'react'
|
||||
import { Redirect, Route } from 'react-router-dom'
|
||||
import { AppContext } from '@sasjs/test-framework'
|
||||
|
||||
interface PrivateRouteProps {
|
||||
component: FunctionComponent
|
||||
exact?: boolean
|
||||
path: string
|
||||
}
|
||||
|
||||
const PrivateRoute = (
|
||||
props: PrivateRouteProps
|
||||
): ReactElement<PrivateRouteProps> => {
|
||||
const { component, path, exact } = props
|
||||
const appContext = useContext(AppContext)
|
||||
return appContext.isLoggedIn ? (
|
||||
<Route component={component} path={path} exact={exact} />
|
||||
) : (
|
||||
<Redirect to="/login" />
|
||||
)
|
||||
}
|
||||
|
||||
export default PrivateRoute
|
||||
@@ -0,0 +1,65 @@
|
||||
:host {
|
||||
display: block;
|
||||
max-width: 400px;
|
||||
margin: 100px auto;
|
||||
padding: 40px;
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
h1 {
|
||||
text-align: center;
|
||||
margin-bottom: 30px;
|
||||
color: #2c3e50;
|
||||
}
|
||||
|
||||
form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 15px;
|
||||
}
|
||||
|
||||
label {
|
||||
font-weight: 600;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
input {
|
||||
padding: 10px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
|
||||
&:focus {
|
||||
outline: none;
|
||||
border-color: #3498db;
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 12px;
|
||||
background: #3498db;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
transition: background 0.2s;
|
||||
|
||||
&:hover:not(:disabled) {
|
||||
background: #2980b9;
|
||||
}
|
||||
|
||||
&:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
|
||||
.error {
|
||||
color: #e74c3c;
|
||||
font-size: 14px;
|
||||
min-height: 20px;
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
import { appContext } from '../core/AppContext'
|
||||
import styles from './LoginForm.css?inline'
|
||||
|
||||
export class LoginForm extends HTMLElement {
|
||||
private static styleSheet = new CSSStyleSheet()
|
||||
private shadow: ShadowRoot
|
||||
|
||||
static {
|
||||
this.styleSheet.replaceSync(styles)
|
||||
}
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
this.shadow = this.attachShadow({ mode: 'open' })
|
||||
this.shadow.adoptedStyleSheets = [LoginForm.styleSheet]
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
this.render()
|
||||
this.attachEventListeners()
|
||||
}
|
||||
|
||||
render() {
|
||||
this.shadow.innerHTML = `
|
||||
<h1>SASjs Tests</h1>
|
||||
<form id="login-form">
|
||||
<label for="username">Username</label>
|
||||
<input type="text" id="username" name="username" placeholder="Enter username" required />
|
||||
|
||||
<label for="password">Password</label>
|
||||
<input type="password" id="password" name="password" placeholder="Enter password" required />
|
||||
|
||||
<button type="submit" id="submit-btn">Log In</button>
|
||||
<div class="error" id="error"></div>
|
||||
</form>
|
||||
`
|
||||
}
|
||||
|
||||
attachEventListeners() {
|
||||
const form = this.shadow.getElementById('login-form') as HTMLFormElement
|
||||
form.addEventListener('submit', async (e) => {
|
||||
e.preventDefault()
|
||||
await this.handleLogin()
|
||||
})
|
||||
}
|
||||
|
||||
async handleLogin() {
|
||||
const username = (
|
||||
this.shadow.getElementById('username') as HTMLInputElement
|
||||
).value
|
||||
const password = (
|
||||
this.shadow.getElementById('password') as HTMLInputElement
|
||||
).value
|
||||
const submitBtn = this.shadow.getElementById(
|
||||
'submit-btn'
|
||||
) as HTMLButtonElement
|
||||
const errorDiv = this.shadow.getElementById('error') as HTMLDivElement
|
||||
|
||||
errorDiv.textContent = ''
|
||||
submitBtn.textContent = 'Logging in...'
|
||||
submitBtn.disabled = true
|
||||
|
||||
try {
|
||||
const adapter = appContext.getAdapter()
|
||||
if (!adapter) {
|
||||
throw new Error('Adapter not initialized')
|
||||
}
|
||||
|
||||
const response = await adapter.logIn(username, password)
|
||||
|
||||
if (response && response.isLoggedIn) {
|
||||
appContext.setIsLoggedIn(true)
|
||||
this.dispatchEvent(
|
||||
new CustomEvent('login-success', {
|
||||
bubbles: true,
|
||||
composed: true
|
||||
})
|
||||
)
|
||||
} else {
|
||||
throw new Error('Login failed')
|
||||
}
|
||||
} catch (error: unknown) {
|
||||
errorDiv.textContent =
|
||||
error instanceof Error
|
||||
? error.message
|
||||
: 'Login failed. Please try again.'
|
||||
submitBtn.textContent = 'Log In'
|
||||
submitBtn.disabled = false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
customElements.define('login-form', LoginForm)
|
||||
@@ -0,0 +1,193 @@
|
||||
:host {
|
||||
display: contents;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 8px 16px;
|
||||
background: #3498db;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 14px;
|
||||
margin-left: 10px;
|
||||
|
||||
&:hover {
|
||||
background: #2980b9;
|
||||
}
|
||||
}
|
||||
|
||||
dialog {
|
||||
max-width: 95vw;
|
||||
max-height: 95vh;
|
||||
width: 1400px;
|
||||
padding: 0;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.3);
|
||||
background: #2c3e50;
|
||||
color: #ecf0f1;
|
||||
|
||||
&::backdrop {
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
}
|
||||
|
||||
.modal-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 20px;
|
||||
border-bottom: 1px solid #34495e;
|
||||
|
||||
h2 {
|
||||
margin: 0;
|
||||
color: #ecf0f1;
|
||||
font-size: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.close-btn {
|
||||
background: transparent;
|
||||
color: #ecf0f1;
|
||||
font-size: 24px;
|
||||
padding: 0;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
cursor: pointer;
|
||||
border-radius: 4px;
|
||||
margin: 0;
|
||||
|
||||
&:hover {
|
||||
background: #34495e;
|
||||
}
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
padding: 20px;
|
||||
overflow-y: auto;
|
||||
max-height: calc(95vh - 80px);
|
||||
}
|
||||
|
||||
.debug-message {
|
||||
text-align: center;
|
||||
padding: 60px 20px;
|
||||
|
||||
.icon {
|
||||
font-size: 64px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin: 10px 0;
|
||||
color: #ecf0f1;
|
||||
}
|
||||
|
||||
span {
|
||||
color: #95a5a6;
|
||||
}
|
||||
}
|
||||
|
||||
.requests-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
}
|
||||
|
||||
details {
|
||||
border: 1px solid #34495e;
|
||||
border-radius: 4px;
|
||||
background: #34495e;
|
||||
|
||||
&[open] summary::before {
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
}
|
||||
|
||||
summary {
|
||||
padding: 15px;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
list-style: none;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
transition: background 0.2s;
|
||||
|
||||
&::-webkit-details-marker {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&::before {
|
||||
content: '▶';
|
||||
display: inline-block;
|
||||
margin-right: 10px;
|
||||
transition: transform 0.2s;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: #3d5266;
|
||||
}
|
||||
}
|
||||
|
||||
.request-timestamp {
|
||||
color: #95a5a6;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.request-content {
|
||||
padding: 0 15px 15px 15px;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid #2c3e50;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.tab-btn {
|
||||
padding: 8px 16px;
|
||||
background: transparent;
|
||||
color: #95a5a6;
|
||||
border: none;
|
||||
border-bottom: 2px solid transparent;
|
||||
cursor: pointer;
|
||||
font-size: 14px;
|
||||
margin: 0;
|
||||
border-radius: 0;
|
||||
|
||||
&:hover {
|
||||
color: #ecf0f1;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
&.active {
|
||||
color: #3498db;
|
||||
border-bottom-color: #3498db;
|
||||
background: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
.tab-pane {
|
||||
display: none;
|
||||
|
||||
&.active {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
pre {
|
||||
background: #1e2832;
|
||||
padding: 15px;
|
||||
border-radius: 4px;
|
||||
overflow-x: auto;
|
||||
margin: 0;
|
||||
color: #ecf0f1;
|
||||
font-family: 'Courier New', monospace;
|
||||
font-size: 13px;
|
||||
line-height: 1.5;
|
||||
white-space: pre-wrap;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
@@ -0,0 +1,180 @@
|
||||
import type { SASjsRequest } from '@sasjs/adapter'
|
||||
import { appContext } from '../core/AppContext'
|
||||
import styles from './RequestsModal.css?inline'
|
||||
|
||||
export class RequestsModal extends HTMLElement {
|
||||
private static styleSheet = new CSSStyleSheet()
|
||||
private shadow: ShadowRoot
|
||||
private dialog: HTMLDialogElement | null = null
|
||||
|
||||
static {
|
||||
this.styleSheet.replaceSync(styles)
|
||||
}
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
this.shadow = this.attachShadow({ mode: 'open' })
|
||||
this.shadow.adoptedStyleSheets = [RequestsModal.styleSheet]
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
this.render()
|
||||
this.attachEventListeners()
|
||||
}
|
||||
|
||||
render() {
|
||||
this.shadow.innerHTML = `
|
||||
<dialog id="requests-dialog">
|
||||
<div class="modal-header">
|
||||
<h2 id="modal-title"></h2>
|
||||
<button class="close-btn" id="close-btn">×</button>
|
||||
</div>
|
||||
<div class="modal-content" id="modal-content"></div>
|
||||
</dialog>
|
||||
`
|
||||
}
|
||||
|
||||
attachEventListeners() {
|
||||
const dialog = this.shadow.getElementById(
|
||||
'requests-dialog'
|
||||
) as HTMLDialogElement
|
||||
const closeBtn = this.shadow.getElementById('close-btn')
|
||||
|
||||
this.dialog = dialog
|
||||
|
||||
closeBtn?.addEventListener('click', () => this.closeModal())
|
||||
dialog?.addEventListener('click', (e) => {
|
||||
if (e.target === dialog) {
|
||||
this.closeModal()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
openModal() {
|
||||
if (!this.dialog) return
|
||||
|
||||
const adapter = appContext.getAdapter()
|
||||
if (!adapter) return
|
||||
|
||||
const requests = adapter.getSasRequests()
|
||||
|
||||
const title = this.shadow.getElementById('modal-title')
|
||||
const content = this.shadow.getElementById('modal-content')
|
||||
|
||||
if (!title || !content) return
|
||||
|
||||
title.textContent = 'Last 20 requests'
|
||||
|
||||
if (!requests || requests.length === 0) {
|
||||
content.innerHTML = `
|
||||
<div class="debug-message">
|
||||
<div class="icon">🐛</div>
|
||||
<h3>There are no requests available.</h3>
|
||||
<span>Please run a test and check again.</span>
|
||||
</div>
|
||||
`
|
||||
} else {
|
||||
content.innerHTML = `
|
||||
<div class="requests-list">
|
||||
${requests
|
||||
.map((request, index) => this.renderRequest(request, index))
|
||||
.join('')}
|
||||
</div>
|
||||
`
|
||||
|
||||
this.attachTabListeners()
|
||||
}
|
||||
|
||||
this.dialog.showModal()
|
||||
}
|
||||
|
||||
closeModal() {
|
||||
this.dialog?.close()
|
||||
}
|
||||
|
||||
renderRequest(request: SASjsRequest, index: number): string {
|
||||
const timestamp = new Date(request.timestamp)
|
||||
const formattedDate = timestamp.toLocaleString('en-US', {
|
||||
weekday: 'long',
|
||||
year: 'numeric',
|
||||
month: 'long',
|
||||
day: 'numeric',
|
||||
hour: 'numeric',
|
||||
minute: 'numeric',
|
||||
second: 'numeric'
|
||||
})
|
||||
const timeAgo = this.getTimeAgo(timestamp)
|
||||
|
||||
return `
|
||||
<details data-index="${index}">
|
||||
<summary>
|
||||
<span>${request.serviceLink}</span>
|
||||
<span class="request-timestamp">${formattedDate} (${timeAgo})</span>
|
||||
</summary>
|
||||
<div class="request-content">
|
||||
<div class="tabs">
|
||||
<button class="tab-btn active" data-tab="log-${index}">Log</button>
|
||||
<button class="tab-btn" data-tab="source-${index}">Source Code</button>
|
||||
<button class="tab-btn" data-tab="generated-${index}">Generated Code</button>
|
||||
</div>
|
||||
<div class="tab-panes">
|
||||
<div class="tab-pane active" id="log-${index}">
|
||||
<pre>${this.decodeHtml(request.logFile)}</pre>
|
||||
</div>
|
||||
<div class="tab-pane" id="source-${index}">
|
||||
<pre>${this.decodeHtml(request.sourceCode)}</pre>
|
||||
</div>
|
||||
<div class="tab-pane" id="generated-${index}">
|
||||
<pre>${this.decodeHtml(request.generatedCode)}</pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</details>
|
||||
`
|
||||
}
|
||||
|
||||
attachTabListeners() {
|
||||
const tabBtns = this.shadow.querySelectorAll('.tab-btn')
|
||||
tabBtns.forEach((btn) => {
|
||||
btn.addEventListener('click', (e) => {
|
||||
const target = e.currentTarget as HTMLElement
|
||||
const tabId = target.getAttribute('data-tab')
|
||||
if (!tabId) return
|
||||
|
||||
const container = target.closest('.request-content')
|
||||
if (!container) return
|
||||
|
||||
container
|
||||
.querySelectorAll('.tab-btn')
|
||||
.forEach((b) => b.classList.remove('active'))
|
||||
container
|
||||
.querySelectorAll('.tab-pane')
|
||||
.forEach((p) => p.classList.remove('active'))
|
||||
|
||||
target.classList.add('active')
|
||||
const pane = container.querySelector(`#${tabId}`)
|
||||
pane?.classList.add('active')
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
decodeHtml(encodedString: string): string {
|
||||
const tempElement = document.createElement('textarea')
|
||||
tempElement.innerHTML = encodedString
|
||||
return tempElement.value
|
||||
}
|
||||
|
||||
getTimeAgo(date: Date): string {
|
||||
const seconds = Math.floor((new Date().getTime() - date.getTime()) / 1000)
|
||||
|
||||
if (seconds < 60) return `${seconds} seconds ago`
|
||||
const minutes = Math.floor(seconds / 60)
|
||||
if (minutes < 60) return `${minutes} minute${minutes !== 1 ? 's' : ''} ago`
|
||||
const hours = Math.floor(minutes / 60)
|
||||
if (hours < 24) return `${hours} hour${hours !== 1 ? 's' : ''} ago`
|
||||
const days = Math.floor(hours / 24)
|
||||
return `${days} day${days !== 1 ? 's' : ''} ago`
|
||||
}
|
||||
}
|
||||
|
||||
customElements.define('requests-modal', RequestsModal)
|
||||
@@ -0,0 +1,126 @@
|
||||
:host {
|
||||
display: block;
|
||||
border: 2px solid #ecf0f1;
|
||||
border-radius: 6px;
|
||||
padding: 15px;
|
||||
background: #fafafa;
|
||||
transition: border-color 0.2s;
|
||||
|
||||
&[status='passed'] {
|
||||
border-color: #27ae60;
|
||||
background: #f0fff4;
|
||||
}
|
||||
|
||||
&[status='failed'] {
|
||||
border-color: #e74c3c;
|
||||
background: #fff5f5;
|
||||
}
|
||||
|
||||
&[status='running'] {
|
||||
border-color: #f39c12;
|
||||
background: #fffbf0;
|
||||
}
|
||||
|
||||
&[status='pending'] {
|
||||
border-color: #95a5a6;
|
||||
background: #f8f9fa;
|
||||
}
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.status-icon {
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
|
||||
&.passed {
|
||||
color: #27ae60;
|
||||
}
|
||||
&.failed {
|
||||
color: #e74c3c;
|
||||
}
|
||||
&.running {
|
||||
color: #f39c12;
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
&.pending {
|
||||
color: #95a5a6;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 16px;
|
||||
color: #2c3e50;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.description {
|
||||
color: #7f8c8d;
|
||||
font-size: 14px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.details {
|
||||
margin-top: 10px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.time {
|
||||
color: #7f8c8d;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.error {
|
||||
margin-top: 10px;
|
||||
|
||||
strong {
|
||||
color: #e74c3c;
|
||||
display: block;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
pre {
|
||||
background: #2c3e50;
|
||||
color: #ecf0f1;
|
||||
padding: 10px;
|
||||
border-radius: 4px;
|
||||
overflow-x: auto;
|
||||
font-size: 12px;
|
||||
line-height: 1.4;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
margin-top: 10px;
|
||||
padding: 6px 12px;
|
||||
background: #3498db;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 13px;
|
||||
|
||||
&:hover:not(:disabled) {
|
||||
background: #2980b9;
|
||||
}
|
||||
|
||||
&:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,144 @@
|
||||
import type { CompletedTest } from '../core/TestRunner'
|
||||
import type { TestStatus } from '../types'
|
||||
import styles from './TestCard.css?inline'
|
||||
|
||||
export class TestCard extends HTMLElement {
|
||||
private static styleSheet = new CSSStyleSheet()
|
||||
private shadow: ShadowRoot
|
||||
private _testData: CompletedTest | null = null
|
||||
|
||||
static {
|
||||
this.styleSheet.replaceSync(styles)
|
||||
}
|
||||
|
||||
static get observedAttributes() {
|
||||
return ['status', 'execution-time']
|
||||
}
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
this.shadow = this.attachShadow({ mode: 'open' })
|
||||
this.shadow.adoptedStyleSheets = [TestCard.styleSheet]
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
this.render()
|
||||
}
|
||||
|
||||
attributeChangedCallback(_name: string, oldValue: string, newValue: string) {
|
||||
if (oldValue !== newValue) {
|
||||
this.render()
|
||||
}
|
||||
}
|
||||
|
||||
set testData(data: CompletedTest) {
|
||||
this._testData = data
|
||||
this.setAttribute('status', data.status)
|
||||
if (data.executionTime) {
|
||||
this.setAttribute('execution-time', data.executionTime.toString())
|
||||
}
|
||||
this.render()
|
||||
}
|
||||
|
||||
get testData(): CompletedTest | null {
|
||||
return this._testData
|
||||
}
|
||||
|
||||
render() {
|
||||
if (!this._testData) return
|
||||
|
||||
const { test, status, executionTime, error } = this._testData
|
||||
const statusIcon = this.getStatusIcon(status)
|
||||
|
||||
this.shadow.innerHTML = `
|
||||
<div class="header">
|
||||
<span class="status-icon ${status}">${statusIcon}</span>
|
||||
<h3>${test.title}</h3>
|
||||
</div>
|
||||
<p class="description">${test.description}</p>
|
||||
|
||||
${
|
||||
executionTime
|
||||
? `
|
||||
<div class="details">
|
||||
<div class="time">Time: ${executionTime.toFixed(3)}s</div>
|
||||
</div>
|
||||
`
|
||||
: ''
|
||||
}
|
||||
|
||||
${
|
||||
error
|
||||
? `
|
||||
<div class="error">
|
||||
<strong>Error:</strong>
|
||||
<pre>${formatError(error)}</pre>
|
||||
</div>
|
||||
`
|
||||
: ''
|
||||
}
|
||||
|
||||
<button id="rerun-btn">Rerun</button>
|
||||
`
|
||||
|
||||
const rerunBtn = this.shadow.getElementById('rerun-btn')
|
||||
if (rerunBtn) {
|
||||
rerunBtn.addEventListener('click', () => {
|
||||
this.dispatchEvent(
|
||||
new CustomEvent('rerun', {
|
||||
bubbles: true,
|
||||
composed: true
|
||||
})
|
||||
)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
getStatusIcon(status: TestStatus): string {
|
||||
switch (status) {
|
||||
case 'passed':
|
||||
return '✓'
|
||||
case 'failed':
|
||||
return '✗'
|
||||
case 'running':
|
||||
return '⟳'
|
||||
case 'pending':
|
||||
return '○'
|
||||
default:
|
||||
return '?'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const escapeHtml = (s: string) =>
|
||||
s.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
|
||||
|
||||
const formatError = (err: unknown): string => {
|
||||
if (err == null) return ''
|
||||
if (typeof err === 'string') return escapeHtml(err)
|
||||
|
||||
const anyErr = err as any
|
||||
// Adapter ErrorResponse: { error: { message, details, raw } }
|
||||
const nestedMsg = anyErr?.error?.message
|
||||
const directMsg = anyErr?.message
|
||||
const msg = directMsg || nestedMsg
|
||||
|
||||
if (msg) {
|
||||
const details = anyErr?.error?.details ?? anyErr?.details
|
||||
const detailsStr =
|
||||
details && typeof details === 'object'
|
||||
? `\n${JSON.stringify(details, null, 2)}`
|
||||
: details
|
||||
? `\n${details}`
|
||||
: ''
|
||||
return escapeHtml(`${msg}${detailsStr}`)
|
||||
}
|
||||
|
||||
try {
|
||||
return escapeHtml(JSON.stringify(err, null, 2))
|
||||
} catch {
|
||||
return escapeHtml(String(err))
|
||||
}
|
||||
}
|
||||
|
||||
customElements.define('test-card', TestCard)
|
||||
@@ -0,0 +1,34 @@
|
||||
:host {
|
||||
display: block;
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 20px;
|
||||
margin-bottom: 20px;
|
||||
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 15px;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid #ecf0f1;
|
||||
}
|
||||
|
||||
h2 {
|
||||
color: #2c3e50;
|
||||
font-size: 20px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.stats {
|
||||
font-size: 14px;
|
||||
color: #7f8c8d;
|
||||
}
|
||||
|
||||
.tests {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
|
||||
gap: 15px;
|
||||
}
|
||||
@@ -0,0 +1,119 @@
|
||||
import type { CompletedTestSuite } from '../core/TestRunner'
|
||||
import { TestCard } from './TestCard'
|
||||
import styles from './TestSuite.css?inline'
|
||||
|
||||
export class TestSuiteElement extends HTMLElement {
|
||||
private static styleSheet = new CSSStyleSheet()
|
||||
private shadow: ShadowRoot
|
||||
private _suiteData: CompletedTestSuite | null = null
|
||||
private _suiteIndex: number = 0
|
||||
|
||||
static {
|
||||
this.styleSheet.replaceSync(styles)
|
||||
}
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
this.shadow = this.attachShadow({ mode: 'open' })
|
||||
this.shadow.adoptedStyleSheets = [TestSuiteElement.styleSheet]
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
this.render()
|
||||
}
|
||||
|
||||
set suiteData(data: CompletedTestSuite) {
|
||||
this._suiteData = data
|
||||
this.render()
|
||||
}
|
||||
|
||||
get suiteData(): CompletedTestSuite | null {
|
||||
return this._suiteData
|
||||
}
|
||||
|
||||
set suiteIndex(index: number) {
|
||||
this._suiteIndex = index
|
||||
}
|
||||
|
||||
get suiteIndex(): number {
|
||||
return this._suiteIndex
|
||||
}
|
||||
|
||||
updateTest(testIndex: number, testData: any) {
|
||||
if (!this._suiteData) return
|
||||
|
||||
// Update the data
|
||||
this._suiteData.completedTests[testIndex] = testData
|
||||
|
||||
// Update stats
|
||||
this.updateStats()
|
||||
|
||||
// Update the specific test card
|
||||
const testsContainer = this.shadow.getElementById('tests-container')
|
||||
if (testsContainer) {
|
||||
const cards = testsContainer.querySelectorAll('test-card')
|
||||
const card = cards[testIndex] as TestCard
|
||||
if (card) {
|
||||
card.testData = testData
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
updateStats() {
|
||||
if (!this._suiteData) return
|
||||
|
||||
const { completedTests } = this._suiteData
|
||||
const passed = completedTests.filter((t) => t.status === 'passed').length
|
||||
const failed = completedTests.filter((t) => t.status === 'failed').length
|
||||
const running = completedTests.filter((t) => t.status === 'running').length
|
||||
const pending = completedTests.filter((t) => t.status === 'pending').length
|
||||
|
||||
const statsEl = this.shadow.querySelector('.stats')
|
||||
if (statsEl) {
|
||||
statsEl.textContent = `Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}`
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
if (!this._suiteData) return
|
||||
|
||||
const { name, completedTests } = this._suiteData
|
||||
const passed = completedTests.filter((t) => t.status === 'passed').length
|
||||
const failed = completedTests.filter((t) => t.status === 'failed').length
|
||||
const running = completedTests.filter((t) => t.status === 'running').length
|
||||
const pending = completedTests.filter((t) => t.status === 'pending').length
|
||||
|
||||
this.shadow.innerHTML = `
|
||||
<div class="header">
|
||||
<h2>${name}</h2>
|
||||
<div class="stats">Passed: ${passed} | Failed: ${failed} | Running: ${running} | Pending: ${pending}</div>
|
||||
</div>
|
||||
<div class="tests" id="tests-container"></div>
|
||||
`
|
||||
|
||||
const testsContainer = this.shadow.getElementById('tests-container')
|
||||
if (testsContainer) {
|
||||
completedTests.forEach((completedTest, testIndex) => {
|
||||
const card = document.createElement('test-card') as TestCard
|
||||
card.testData = completedTest
|
||||
|
||||
card.addEventListener('rerun', () => {
|
||||
this.dispatchEvent(
|
||||
new CustomEvent('rerun-test', {
|
||||
bubbles: true,
|
||||
composed: true,
|
||||
detail: {
|
||||
suiteIndex: this._suiteIndex,
|
||||
testIndex
|
||||
}
|
||||
})
|
||||
)
|
||||
})
|
||||
|
||||
testsContainer.appendChild(card)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
customElements.define('test-suite', TestSuiteElement)
|
||||
@@ -0,0 +1,104 @@
|
||||
:host {
|
||||
display: block;
|
||||
width: 100%;
|
||||
padding: 80px 20px 20px 20px;
|
||||
}
|
||||
|
||||
.header {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 15px 20px;
|
||||
background: white;
|
||||
border-bottom: 2px solid #3498db;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
z-index: 100;
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
h1 {
|
||||
color: #2c3e50;
|
||||
margin: 0;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.header-controls {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 15px;
|
||||
}
|
||||
|
||||
.logout-btn {
|
||||
padding: 8px 16px;
|
||||
background: #e74c3c;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 14px;
|
||||
|
||||
&:hover {
|
||||
background: #c0392b;
|
||||
}
|
||||
}
|
||||
|
||||
.requests-btn {
|
||||
padding: 8px 16px;
|
||||
background: #3498db;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 14px;
|
||||
|
||||
&:hover {
|
||||
background: #2980b9;
|
||||
}
|
||||
}
|
||||
|
||||
.debug-toggle {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
|
||||
label {
|
||||
font-size: 14px;
|
||||
color: #2c3e50;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
input[type='checkbox'] {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.run-btn {
|
||||
padding: 8px 16px;
|
||||
background: #27ae60;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover:not(:disabled) {
|
||||
background: #229954;
|
||||
}
|
||||
|
||||
&:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
|
||||
.results {
|
||||
margin-top: 64px;
|
||||
width: 100%;
|
||||
}
|
||||
@@ -0,0 +1,163 @@
|
||||
import { appContext } from '../core/AppContext'
|
||||
import { TestRunner, type CompletedTestSuite } from '../core/TestRunner'
|
||||
import type { TestSuite } from '../types'
|
||||
import { TestSuiteElement } from './TestSuite'
|
||||
import styles from './TestsView.css?inline'
|
||||
|
||||
export class TestsView extends HTMLElement {
|
||||
private static styleSheet = new CSSStyleSheet()
|
||||
private shadow: ShadowRoot
|
||||
private testRunner: TestRunner | null = null
|
||||
private _testSuites: TestSuite[] = []
|
||||
private debugMode: boolean = false
|
||||
|
||||
static {
|
||||
this.styleSheet.replaceSync(styles)
|
||||
}
|
||||
|
||||
constructor() {
|
||||
super()
|
||||
this.shadow = this.attachShadow({ mode: 'open' })
|
||||
this.shadow.adoptedStyleSheets = [TestsView.styleSheet]
|
||||
}
|
||||
|
||||
connectedCallback() {
|
||||
this.render()
|
||||
}
|
||||
|
||||
get testSuites(): TestSuite[] {
|
||||
return this._testSuites
|
||||
}
|
||||
|
||||
set testSuites(suites: TestSuite[]) {
|
||||
this._testSuites = suites
|
||||
this.testRunner = new TestRunner(suites)
|
||||
this.render()
|
||||
}
|
||||
|
||||
render() {
|
||||
this.shadow.innerHTML = `
|
||||
<div class="header">
|
||||
<h1>SASjs Adapter Tests</h1>
|
||||
<div class="header-controls">
|
||||
<div class="debug-toggle">
|
||||
<input type="checkbox" id="debug-toggle" ${
|
||||
this.debugMode ? 'checked' : ''
|
||||
} />
|
||||
<label for="debug-toggle">Debug Mode</label>
|
||||
</div>
|
||||
<button class="run-btn" id="run-btn">Run All Tests</button>
|
||||
<button class="logout-btn" id="logout-btn">Logout</button>
|
||||
<button class="requests-btn" id="requests-btn">View Requests</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="results" id="results"></div>
|
||||
`
|
||||
|
||||
const logoutBtn = this.shadow.getElementById('logout-btn')
|
||||
logoutBtn?.addEventListener('click', () => this.handleLogout())
|
||||
|
||||
const debugToggle = this.shadow.getElementById(
|
||||
'debug-toggle'
|
||||
) as HTMLInputElement
|
||||
debugToggle?.addEventListener('change', (e) => this.handleDebugToggle(e))
|
||||
|
||||
const runBtn = this.shadow.getElementById('run-btn') as HTMLButtonElement
|
||||
runBtn?.addEventListener('click', () => this.handleRunTests(runBtn))
|
||||
|
||||
const requestsBtn = this.shadow.getElementById('requests-btn')
|
||||
requestsBtn?.addEventListener('click', () => this.handleViewRequests())
|
||||
}
|
||||
|
||||
handleViewRequests() {
|
||||
const requestsModal = document.querySelector('requests-modal') as any
|
||||
if (requestsModal && requestsModal.openModal) {
|
||||
requestsModal.openModal()
|
||||
}
|
||||
}
|
||||
|
||||
handleDebugToggle(e: Event) {
|
||||
const checkbox = e.target as HTMLInputElement
|
||||
this.debugMode = checkbox.checked
|
||||
|
||||
const adapter = appContext.getAdapter()
|
||||
if (adapter) {
|
||||
adapter.setDebugState(this.debugMode)
|
||||
}
|
||||
}
|
||||
|
||||
async handleLogout() {
|
||||
const adapter = appContext.getAdapter()
|
||||
if (adapter) {
|
||||
await adapter.logOut()
|
||||
appContext.setIsLoggedIn(false)
|
||||
this.dispatchEvent(
|
||||
new CustomEvent('logout', {
|
||||
bubbles: true,
|
||||
composed: true
|
||||
})
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
async handleRunTests(runBtn: HTMLButtonElement) {
|
||||
if (!this.testRunner) return
|
||||
|
||||
runBtn.disabled = true
|
||||
runBtn.textContent = 'Running...'
|
||||
|
||||
const resultsContainer = this.shadow.getElementById('results')
|
||||
if (resultsContainer) {
|
||||
resultsContainer.innerHTML = ''
|
||||
}
|
||||
|
||||
await this.testRunner.runAllTests((completedSuites) => {
|
||||
this.renderResults(resultsContainer!, completedSuites)
|
||||
})
|
||||
|
||||
runBtn.disabled = false
|
||||
runBtn.textContent = 'Run All Tests'
|
||||
}
|
||||
|
||||
renderResults(container: HTMLElement, completedSuites: CompletedTestSuite[]) {
|
||||
container.innerHTML = ''
|
||||
|
||||
completedSuites.forEach((suite, suiteIndex) => {
|
||||
const suiteElement = document.createElement(
|
||||
'test-suite'
|
||||
) as TestSuiteElement
|
||||
suiteElement.suiteData = suite
|
||||
suiteElement.suiteIndex = suiteIndex
|
||||
|
||||
suiteElement.addEventListener('rerun-test', ((e: CustomEvent) => {
|
||||
const { suiteIndex, testIndex } = e.detail
|
||||
this.handleRerunTest(suiteIndex, testIndex, container)
|
||||
}) as EventListener)
|
||||
|
||||
container.appendChild(suiteElement)
|
||||
})
|
||||
}
|
||||
|
||||
async handleRerunTest(
|
||||
suiteIndex: number,
|
||||
testIndex: number,
|
||||
container: HTMLElement
|
||||
) {
|
||||
if (!this.testRunner) return
|
||||
|
||||
await this.testRunner.rerunTest(
|
||||
suiteIndex,
|
||||
testIndex,
|
||||
(suiteIdx, testIdx, testData) => {
|
||||
const suites = container.querySelectorAll('test-suite')
|
||||
const suiteElement = suites[suiteIdx] as TestSuiteElement
|
||||
if (suiteElement && suiteElement.updateTest) {
|
||||
suiteElement.updateTest(testIdx, testData)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
customElements.define('tests-view', TestsView)
|
||||
@@ -0,0 +1,5 @@
|
||||
export { LoginForm } from './LoginForm'
|
||||
export { TestCard } from './TestCard'
|
||||
export { TestSuiteElement } from './TestSuite'
|
||||
export { TestsView } from './TestsView'
|
||||
export { RequestsModal } from './RequestsModal'
|
||||
@@ -0,0 +1,14 @@
|
||||
import type { AppConfig } from '../types'
|
||||
|
||||
export interface ConfigWithCredentials extends AppConfig {
|
||||
userName?: string
|
||||
password?: string
|
||||
}
|
||||
|
||||
export async function loadConfig(): Promise<ConfigWithCredentials> {
|
||||
const response = await fetch('config.json')
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to load config.json')
|
||||
}
|
||||
return response.json()
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
import type SASjs from '@sasjs/adapter'
|
||||
import type { AppConfig, AppState } from '../types'
|
||||
|
||||
export class AppContext {
|
||||
private state: AppState = {
|
||||
config: null,
|
||||
adapter: null,
|
||||
isLoggedIn: false
|
||||
}
|
||||
|
||||
private listeners: Array<(state: AppState) => void> = []
|
||||
|
||||
getState(): AppState {
|
||||
return { ...this.state }
|
||||
}
|
||||
|
||||
setState(newState: Partial<AppState>): void {
|
||||
this.state = { ...this.state, ...newState }
|
||||
this.notifyListeners()
|
||||
}
|
||||
|
||||
subscribe(listener: (state: AppState) => void): () => void {
|
||||
this.listeners.push(listener)
|
||||
// Return unsubscribe function
|
||||
return () => {
|
||||
this.listeners = this.listeners.filter((l) => l !== listener)
|
||||
}
|
||||
}
|
||||
|
||||
private notifyListeners(): void {
|
||||
this.listeners.forEach((listener) => listener(this.getState()))
|
||||
}
|
||||
|
||||
setConfig(config: AppConfig): void {
|
||||
this.setState({ config })
|
||||
}
|
||||
|
||||
setAdapter(adapter: SASjs): void {
|
||||
this.setState({ adapter })
|
||||
}
|
||||
|
||||
setIsLoggedIn(isLoggedIn: boolean): void {
|
||||
this.setState({ isLoggedIn })
|
||||
}
|
||||
|
||||
getAdapter(): SASjs | null {
|
||||
return this.state.adapter
|
||||
}
|
||||
|
||||
getConfig(): AppConfig | null {
|
||||
return this.state.config
|
||||
}
|
||||
|
||||
isUserLoggedIn(): boolean {
|
||||
return this.state.isLoggedIn
|
||||
}
|
||||
}
|
||||
|
||||
// Global singleton instance
|
||||
export const appContext = new AppContext()
|
||||
@@ -0,0 +1,190 @@
|
||||
import type { Test, TestSuite, TestStatus } from '../types'
|
||||
import { runTest } from './runTest'
|
||||
|
||||
export interface CompletedTest {
|
||||
test: Test
|
||||
result: boolean
|
||||
error: unknown
|
||||
executionTime: number
|
||||
status: TestStatus
|
||||
}
|
||||
|
||||
export interface CompletedTestSuite {
|
||||
name: string
|
||||
completedTests: CompletedTest[]
|
||||
}
|
||||
|
||||
export class TestRunner {
|
||||
private testSuites: TestSuite[]
|
||||
private completedTestSuites: CompletedTestSuite[] = []
|
||||
private isRunning = false
|
||||
|
||||
constructor(testSuites: TestSuite[]) {
|
||||
this.testSuites = testSuites
|
||||
}
|
||||
|
||||
async runAllTests(
|
||||
onUpdate?: (
|
||||
completedSuites: CompletedTestSuite[],
|
||||
currentIndex: number
|
||||
) => void
|
||||
): Promise<CompletedTestSuite[]> {
|
||||
this.isRunning = true
|
||||
this.completedTestSuites = this.testSuites.map((suite) => ({
|
||||
name: suite.name,
|
||||
completedTests: []
|
||||
}))
|
||||
|
||||
await Promise.allSettled(
|
||||
this.testSuites.map((suite, i) => this.runTestSuite(suite, i, onUpdate))
|
||||
)
|
||||
|
||||
this.isRunning = false
|
||||
return this.completedTestSuites
|
||||
}
|
||||
|
||||
async runTestSuite(
|
||||
suite: TestSuite,
|
||||
suiteIndex: number,
|
||||
onUpdate?: (
|
||||
completedSuites: CompletedTestSuite[],
|
||||
currentIndex: number
|
||||
) => void
|
||||
): Promise<CompletedTestSuite> {
|
||||
// Seed all tests as pending so every card renders before any run starts.
|
||||
const completedTests: CompletedTest[] = suite.tests.map((test) => ({
|
||||
test,
|
||||
result: false,
|
||||
error: null,
|
||||
executionTime: 0,
|
||||
status: 'pending'
|
||||
}))
|
||||
|
||||
if (onUpdate) {
|
||||
this.completedTestSuites[suiteIndex] = {
|
||||
name: suite.name,
|
||||
completedTests: [...completedTests]
|
||||
}
|
||||
onUpdate([...this.completedTestSuites], suiteIndex * 1000)
|
||||
}
|
||||
|
||||
let context: unknown
|
||||
|
||||
// Run beforeAll if exists
|
||||
if (suite.beforeAll) {
|
||||
context = await suite.beforeAll()
|
||||
}
|
||||
|
||||
// Run each test sequentially
|
||||
for (let i = 0; i < suite.tests.length; i++) {
|
||||
const test = suite.tests[i]
|
||||
const currentIndex = suiteIndex * 1000 + i
|
||||
|
||||
// Flip pending → running
|
||||
completedTests[i] = {
|
||||
test,
|
||||
result: false,
|
||||
error: null,
|
||||
executionTime: 0,
|
||||
status: 'running'
|
||||
}
|
||||
|
||||
// Notify update
|
||||
if (onUpdate) {
|
||||
this.completedTestSuites[suiteIndex] = {
|
||||
name: suite.name,
|
||||
completedTests: [...completedTests]
|
||||
}
|
||||
onUpdate([...this.completedTestSuites], currentIndex)
|
||||
}
|
||||
|
||||
// Execute test
|
||||
const result = await runTest(test, { data: context })
|
||||
|
||||
// Update with result
|
||||
completedTests[i] = {
|
||||
test,
|
||||
result: result.result,
|
||||
error: result.error,
|
||||
executionTime: result.executionTime,
|
||||
status: result.result ? 'passed' : 'failed'
|
||||
}
|
||||
|
||||
// Notify update
|
||||
if (onUpdate) {
|
||||
this.completedTestSuites[suiteIndex] = {
|
||||
name: suite.name,
|
||||
completedTests: [...completedTests]
|
||||
}
|
||||
onUpdate([...this.completedTestSuites], currentIndex)
|
||||
}
|
||||
}
|
||||
|
||||
// Run afterAll if exists
|
||||
if (suite.afterAll) {
|
||||
await suite.afterAll()
|
||||
}
|
||||
|
||||
return {
|
||||
name: suite.name,
|
||||
completedTests
|
||||
}
|
||||
}
|
||||
|
||||
async rerunTest(
|
||||
suiteIndex: number,
|
||||
testIndex: number,
|
||||
onUpdate?: (
|
||||
suiteIndex: number,
|
||||
testIndex: number,
|
||||
testData: CompletedTest
|
||||
) => void
|
||||
): Promise<void> {
|
||||
const suite = this.testSuites[suiteIndex]
|
||||
const test = suite.tests[testIndex]
|
||||
|
||||
let context: unknown
|
||||
if (suite.beforeAll) {
|
||||
context = await suite.beforeAll()
|
||||
}
|
||||
|
||||
// Set status to running
|
||||
this.completedTestSuites[suiteIndex].completedTests[testIndex].status =
|
||||
'running'
|
||||
if (onUpdate) {
|
||||
onUpdate(
|
||||
suiteIndex,
|
||||
testIndex,
|
||||
this.completedTestSuites[suiteIndex].completedTests[testIndex]
|
||||
)
|
||||
}
|
||||
|
||||
// Execute test
|
||||
const result = await runTest(test, { data: context })
|
||||
|
||||
// Update with result
|
||||
this.completedTestSuites[suiteIndex].completedTests[testIndex] = {
|
||||
test,
|
||||
result: result.result,
|
||||
error: result.error,
|
||||
executionTime: result.executionTime,
|
||||
status: result.result ? 'passed' : 'failed'
|
||||
}
|
||||
|
||||
if (onUpdate) {
|
||||
onUpdate(
|
||||
suiteIndex,
|
||||
testIndex,
|
||||
this.completedTestSuites[suiteIndex].completedTests[testIndex]
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
getCompletedTestSuites(): CompletedTestSuite[] {
|
||||
return this.completedTestSuites
|
||||
}
|
||||
|
||||
isTestRunning(): boolean {
|
||||
return this.isRunning
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
export * from './runTest'
|
||||
export * from './TestRunner'
|
||||
export * from './AppContext'
|
||||
@@ -0,0 +1,30 @@
|
||||
import type { Test, TestResult } from '../types'
|
||||
|
||||
export async function runTest(
|
||||
testToRun: Test,
|
||||
context: unknown
|
||||
): Promise<TestResult> {
|
||||
const { test, assertion, beforeTest, afterTest } = testToRun
|
||||
const beforeTestFunction = beforeTest ? beforeTest : () => Promise.resolve()
|
||||
const afterTestFunction = afterTest ? afterTest : () => Promise.resolve()
|
||||
|
||||
const startTime = new Date().valueOf()
|
||||
|
||||
return beforeTestFunction()
|
||||
.then(() => test(context))
|
||||
.then((res) => {
|
||||
return Promise.resolve(assertion(res, context))
|
||||
})
|
||||
.then((testResult) => {
|
||||
afterTestFunction()
|
||||
const endTime = new Date().valueOf()
|
||||
const executionTime = (endTime - startTime) / 1000
|
||||
return { result: testResult, error: null, executionTime }
|
||||
})
|
||||
.catch((e) => {
|
||||
console.error(e)
|
||||
const endTime = new Date().valueOf()
|
||||
const executionTime = (endTime - startTime) / 1000
|
||||
return { result: false, error: e, executionTime }
|
||||
})
|
||||
}
|
||||
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
@@ -1,61 +0,0 @@
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans",
|
||||
"Droid Sans", "Helvetica Neue", sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
background-color: #1f2027;
|
||||
color: #eee;
|
||||
}
|
||||
|
||||
* {
|
||||
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", monospace;
|
||||
}
|
||||
|
||||
input {
|
||||
padding: 8px;
|
||||
border-radius: 3px;
|
||||
border: none;
|
||||
font-size: 1.125em;
|
||||
}
|
||||
|
||||
.submit-button {
|
||||
border: none;
|
||||
border-radius: 3px;
|
||||
padding: 8px;
|
||||
background-color: #f9e804;
|
||||
color: black;
|
||||
font-size: 0.8em;
|
||||
|
||||
&.disabled {
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
.loading-spinner {
|
||||
display: inline-block;
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
border: 3px solid rgba(255, 255, 255, 0.3);
|
||||
border-radius: 50%;
|
||||
border-top-color: #fff;
|
||||
animation: spin 1s ease-in-out infinite;
|
||||
-webkit-animation: spin 1s ease-in-out infinite;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
to {
|
||||
-webkit-transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
@-webkit-keyframes spin {
|
||||
to {
|
||||
-webkit-transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
import React from 'react'
|
||||
import ReactDOM from 'react-dom'
|
||||
import { Route, HashRouter, Switch } from 'react-router-dom'
|
||||
import './index.scss'
|
||||
import * as serviceWorker from './serviceWorker'
|
||||
import { AppProvider } from '@sasjs/test-framework'
|
||||
import PrivateRoute from './PrivateRoute'
|
||||
import Login from './Login'
|
||||
import App from './App'
|
||||
|
||||
ReactDOM.render(
|
||||
<AppProvider>
|
||||
<HashRouter>
|
||||
<Switch>
|
||||
<PrivateRoute exact path="/" component={App} />
|
||||
<Route exact path="/login" component={Login} />
|
||||
</Switch>
|
||||
</HashRouter>
|
||||
</AppProvider>,
|
||||
document.getElementById('root')
|
||||
)
|
||||
|
||||
// If you want your app to work offline and load faster, you can change
|
||||
// unregister() to register() below. Note this comes with some pitfalls.
|
||||
// Learn more about service workers: https://bit.ly/CRA-PWA
|
||||
serviceWorker.unregister()
|
||||
@@ -0,0 +1,143 @@
|
||||
import * as SASjsModule from '@sasjs/adapter'
|
||||
const SASjsImport = (SASjsModule as any).default || SASjsModule
|
||||
const SASjs = SASjsImport.default
|
||||
|
||||
import { appContext } from './core/AppContext'
|
||||
import { type ConfigWithCredentials, loadConfig } from './config/loader'
|
||||
import type { TestSuite } from './types'
|
||||
|
||||
// Import custom elements (this registers them)
|
||||
import './components/LoginForm'
|
||||
import './components/TestCard'
|
||||
import './components/TestSuite'
|
||||
import './components/TestsView'
|
||||
import './components/RequestsModal'
|
||||
import type { LoginForm } from './components/LoginForm'
|
||||
import type { TestsView } from './components/TestsView'
|
||||
import type { RequestsModal } from './components/RequestsModal'
|
||||
|
||||
// Import test suites
|
||||
// import { basicTests } from './testSuites/Basic'
|
||||
import { sendArrTests, sendObjTests } from './testSuites/RequestData'
|
||||
import { fileUploadTests } from './testSuites/FileUpload'
|
||||
import { computeTests } from './testSuites/Compute'
|
||||
import { sasjsRequestTests } from './testSuites/SasjsRequests'
|
||||
import { specialCaseTests } from './testSuites/SpecialCases'
|
||||
import { executionTasksTests } from './testSuites/executionTasks'
|
||||
|
||||
async function init() {
|
||||
const appContainer = document.getElementById('app')
|
||||
if (!appContainer) {
|
||||
console.error('App container not found')
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
// Load config
|
||||
const config = await loadConfig()
|
||||
|
||||
// Initialize adapter
|
||||
const adapter = new SASjs(config.sasJsConfig)
|
||||
appContext.setAdapter(adapter)
|
||||
appContext.setConfig(config)
|
||||
|
||||
// Check session
|
||||
try {
|
||||
const sessionResponse = await adapter.checkSession()
|
||||
if (sessionResponse && sessionResponse.isLoggedIn) {
|
||||
appContext.setIsLoggedIn(true)
|
||||
showTests(appContainer, adapter, config)
|
||||
return
|
||||
}
|
||||
} catch {
|
||||
console.log('No active session, showing login')
|
||||
}
|
||||
|
||||
// Show login
|
||||
showLogin(appContainer)
|
||||
} catch (error) {
|
||||
console.error('Failed to initialize app:', error)
|
||||
appContainer.innerHTML = `
|
||||
<div class="app__error">
|
||||
<h1>Initialization Error</h1>
|
||||
<p>Failed to load configuration. Please check config.json file.</p>
|
||||
<pre>${error}</pre>
|
||||
</div>
|
||||
`
|
||||
}
|
||||
}
|
||||
|
||||
function showLogin(container: HTMLElement) {
|
||||
container.innerHTML = ''
|
||||
const loginForm = document.createElement('login-form') as LoginForm
|
||||
|
||||
loginForm.addEventListener('login-success', () => {
|
||||
const adapter = appContext.getAdapter()
|
||||
const config = appContext.getConfig()
|
||||
if (adapter && config) {
|
||||
showTests(container, adapter, config)
|
||||
}
|
||||
})
|
||||
|
||||
container.appendChild(loginForm)
|
||||
}
|
||||
|
||||
function showTests(
|
||||
container: HTMLElement,
|
||||
adapter: typeof SASjs,
|
||||
config: ConfigWithCredentials
|
||||
) {
|
||||
const configTyped = config as {
|
||||
sasJsConfig: { appLoc: string }
|
||||
userName?: string
|
||||
password?: string
|
||||
}
|
||||
const appLoc = configTyped.sasJsConfig.appLoc
|
||||
|
||||
// Build test suites with adapter and credentials
|
||||
const testSuites: TestSuite[] = [
|
||||
// FIXME: disabled basicTests due to login/logout operations
|
||||
// basicTests(adapter, configTyped.userName || '', configTyped.password || ''),
|
||||
sendArrTests(adapter, appLoc),
|
||||
sendObjTests(adapter),
|
||||
specialCaseTests(adapter),
|
||||
sasjsRequestTests(adapter),
|
||||
fileUploadTests(adapter)
|
||||
]
|
||||
|
||||
// Add tests for SASVIYA only
|
||||
if (adapter.getSasjsConfig().serverType === 'SASVIYA') {
|
||||
testSuites.push(executionTasksTests(adapter))
|
||||
testSuites.push(computeTests(adapter, appLoc))
|
||||
}
|
||||
|
||||
container.innerHTML = ''
|
||||
const testsView = document.createElement('tests-view') as TestsView
|
||||
testsView.testSuites = testSuites
|
||||
|
||||
const requestsModal = document.createElement(
|
||||
'requests-modal'
|
||||
) as RequestsModal
|
||||
|
||||
testsView.addEventListener('logout', () => {
|
||||
showLogin(container)
|
||||
})
|
||||
|
||||
container.appendChild(requestsModal)
|
||||
container.appendChild(testsView)
|
||||
}
|
||||
|
||||
// Subscribe to auth changes
|
||||
appContext.subscribe((state) => {
|
||||
const appContainer = document.getElementById('app')
|
||||
if (!appContainer) return
|
||||
|
||||
if (!state.isLoggedIn) {
|
||||
showLogin(appContainer)
|
||||
} else if (state.adapter && state.config) {
|
||||
showTests(appContainer, state.adapter, state.config)
|
||||
}
|
||||
})
|
||||
|
||||
// Initialize app
|
||||
init()
|
||||
Vendored
-1
@@ -1 +0,0 @@
|
||||
/// <reference types="react-scripts" />
|
||||
@@ -1,141 +0,0 @@
|
||||
// This optional code is used to register a service worker.
|
||||
// register() is not called by default.
|
||||
|
||||
// This lets the app load faster on subsequent visits in production, and gives
|
||||
// it offline capabilities. However, it also means that developers (and users)
|
||||
// will only see deployed updates on subsequent visits to a page, after all the
|
||||
// existing tabs open on the page have been closed, since previously cached
|
||||
// resources are updated in the background.
|
||||
|
||||
// To learn more about the benefits of this model and instructions on how to
|
||||
// opt-in, read https://bit.ly/CRA-PWA
|
||||
|
||||
const isLocalhost = Boolean(
|
||||
window.location.hostname === 'localhost' ||
|
||||
// [::1] is the IPv6 localhost address.
|
||||
window.location.hostname === '[::1]' ||
|
||||
// 127.0.0.0/8 are considered localhost for IPv4.
|
||||
window.location.hostname.match(
|
||||
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
|
||||
)
|
||||
)
|
||||
|
||||
export function register(config) {
|
||||
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
|
||||
// The URL constructor is available in all browsers that support SW.
|
||||
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href)
|
||||
if (publicUrl.origin !== window.location.origin) {
|
||||
// Our service worker won't work if PUBLIC_URL is on a different origin
|
||||
// from what our page is served on. This might happen if a CDN is used to
|
||||
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
|
||||
return
|
||||
}
|
||||
|
||||
window.addEventListener('load', () => {
|
||||
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`
|
||||
|
||||
if (isLocalhost) {
|
||||
// This is running on localhost. Let's check if a service worker still exists or not.
|
||||
checkValidServiceWorker(swUrl, config)
|
||||
|
||||
// Add some additional logging to localhost, pointing developers to the
|
||||
// service worker/PWA documentation.
|
||||
navigator.serviceWorker.ready.then(() => {
|
||||
console.log(
|
||||
'This web app is being served cache-first by a service ' +
|
||||
'worker. To learn more, visit https://bit.ly/CRA-PWA'
|
||||
)
|
||||
})
|
||||
} else {
|
||||
// Is not localhost. Just register service worker
|
||||
registerValidSW(swUrl, config)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function registerValidSW(swUrl, config) {
|
||||
navigator.serviceWorker
|
||||
.register(swUrl)
|
||||
.then((registration) => {
|
||||
registration.onupdatefound = () => {
|
||||
const installingWorker = registration.installing
|
||||
if (installingWorker == null) {
|
||||
return
|
||||
}
|
||||
installingWorker.onstatechange = () => {
|
||||
if (installingWorker.state === 'installed') {
|
||||
if (navigator.serviceWorker.controller) {
|
||||
// At this point, the updated precached content has been fetched,
|
||||
// but the previous service worker will still serve the older
|
||||
// content until all client tabs are closed.
|
||||
console.log(
|
||||
'New content is available and will be used when all ' +
|
||||
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
|
||||
)
|
||||
|
||||
// Execute callback
|
||||
if (config && config.onUpdate) {
|
||||
config.onUpdate(registration)
|
||||
}
|
||||
} else {
|
||||
// At this point, everything has been precached.
|
||||
// It's the perfect time to display a
|
||||
// "Content is cached for offline use." message.
|
||||
console.log('Content is cached for offline use.')
|
||||
|
||||
// Execute callback
|
||||
if (config && config.onSuccess) {
|
||||
config.onSuccess(registration)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('Error during service worker registration:', error)
|
||||
})
|
||||
}
|
||||
|
||||
function checkValidServiceWorker(swUrl, config) {
|
||||
// Check if the service worker can be found. If it can't reload the page.
|
||||
fetch(swUrl, {
|
||||
headers: { 'Service-Worker': 'script' }
|
||||
})
|
||||
.then((response) => {
|
||||
// Ensure service worker exists, and that we really are getting a JS file.
|
||||
const contentType = response.headers.get('content-type')
|
||||
if (
|
||||
response.status === 404 ||
|
||||
(contentType != null && contentType.indexOf('javascript') === -1)
|
||||
) {
|
||||
// No service worker found. Probably a different app. Reload the page.
|
||||
navigator.serviceWorker.ready.then((registration) => {
|
||||
registration.unregister().then(() => {
|
||||
window.location.reload()
|
||||
})
|
||||
})
|
||||
} else {
|
||||
// Service worker found. Proceed as normal.
|
||||
registerValidSW(swUrl, config)
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
console.log(
|
||||
'No internet connection found. App is running in offline mode.'
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
export function unregister() {
|
||||
if ('serviceWorker' in navigator) {
|
||||
navigator.serviceWorker.ready
|
||||
.then((registration) => {
|
||||
registration.unregister()
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error(error.message)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
// jest-dom adds custom jest matchers for asserting on DOM nodes.
|
||||
// allows you to do things like:
|
||||
// expect(element).toHaveTextContent(/react/i)
|
||||
// learn more: https://github.com/testing-library/jest-dom
|
||||
import '@testing-library/jest-dom/extend-expect'
|
||||
@@ -1,6 +1,8 @@
|
||||
/* eslint-disable @typescript-eslint/no-unused-vars */
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import SASjs, { LoginMechanism, SASjsConfig } from '@sasjs/adapter'
|
||||
import { TestSuite } from '@sasjs/test-framework'
|
||||
import { ServerType } from '@sasjs/utils/types'
|
||||
import type { TestSuite } from '../types'
|
||||
|
||||
const stringData: any = { table1: [{ col1: 'first col value' }] }
|
||||
|
||||
@@ -61,7 +63,7 @@ export const basicTests = (
|
||||
'Should fail on first attempt and should log the user in on second attempt',
|
||||
test: async () => {
|
||||
await adapter.logOut()
|
||||
await adapter.logIn('invalid', 'invalid').catch((err: any) => {})
|
||||
await adapter.logIn('invalid', 'invalid').catch((_err: any) => {})
|
||||
return await adapter.logIn(userName, password)
|
||||
},
|
||||
assertion: (response: any) =>
|
||||
@@ -75,7 +77,7 @@ export const basicTests = (
|
||||
await adapter.logOut()
|
||||
|
||||
return await adapter.request(
|
||||
'common/sendArr',
|
||||
'services/common/sendArr',
|
||||
stringData,
|
||||
undefined,
|
||||
async () => {
|
||||
@@ -95,7 +97,11 @@ export const basicTests = (
|
||||
useComputeApi: false
|
||||
}
|
||||
|
||||
return await adapter.request('common/sendArr', stringData, config)
|
||||
return await adapter.request(
|
||||
'services/common/sendArr',
|
||||
stringData,
|
||||
config
|
||||
)
|
||||
},
|
||||
assertion: (response: any) => {
|
||||
return response.table1[0][0] === stringData.table1[0].col1
|
||||
@@ -110,7 +116,11 @@ export const basicTests = (
|
||||
debug: true
|
||||
}
|
||||
|
||||
return await adapter.request('common/sendArr', stringData, config)
|
||||
return await adapter.request(
|
||||
'services/common/sendArr',
|
||||
stringData,
|
||||
config
|
||||
)
|
||||
},
|
||||
assertion: (response: any) => {
|
||||
return response.table1[0][0] === stringData.table1[0].col1
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import SASjs from '@sasjs/adapter'
|
||||
import { TestSuite } from '@sasjs/test-framework'
|
||||
import type { TestSuite } from '../types'
|
||||
|
||||
const stringData: any = { table1: [{ col1: 'first col value' }] }
|
||||
|
||||
@@ -10,7 +11,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
title: 'Compute API request',
|
||||
description: 'Should run the request with compute API approach',
|
||||
test: async () => {
|
||||
return await adapter.request('common/sendArr', stringData)
|
||||
return await adapter.request('services/common/sendArr', stringData)
|
||||
},
|
||||
assertion: (response: any) => {
|
||||
return response.table1[0][0] === stringData.table1[0].col1
|
||||
@@ -24,7 +25,11 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
useComputeApi: false
|
||||
}
|
||||
|
||||
return await adapter.request('common/sendArr', stringData, config)
|
||||
return await adapter.request(
|
||||
'services/common/sendArr',
|
||||
stringData,
|
||||
config
|
||||
)
|
||||
},
|
||||
assertion: (response: any) => {
|
||||
return response.table1[0][0] === stringData.table1[0].col1
|
||||
@@ -35,7 +40,10 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
description: 'Should start a compute job and return the session',
|
||||
test: () => {
|
||||
const data: any = { table1: [{ col1: 'first col value' }] }
|
||||
return adapter.startComputeJob(`${appLoc}/common/sendArr`, data)
|
||||
return adapter.startComputeJob(
|
||||
`${appLoc}/services/common/sendArr`,
|
||||
data
|
||||
)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const expectedProperties = ['id', 'applicationName', 'attributes']
|
||||
@@ -48,7 +56,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
test: () => {
|
||||
const data: any = { table1: [{ col1: 'first col value' }] }
|
||||
return adapter.startComputeJob(
|
||||
'/Public/app/adapter-tests/services/common/sendArr',
|
||||
`${appLoc}/services/common/sendArr`,
|
||||
data,
|
||||
{},
|
||||
undefined,
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
/* eslint-disable prefer-const */
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import SASjs from '@sasjs/adapter'
|
||||
import { TestSuite } from '@sasjs/test-framework'
|
||||
import type { TestSuite } from '../types'
|
||||
|
||||
export const fileUploadTests = (adapter: SASjs): TestSuite => ({
|
||||
name: 'File Upload Tests',
|
||||
@@ -20,7 +22,11 @@ export const fileUploadTests = (adapter: SASjs): TestSuite => ({
|
||||
}
|
||||
]
|
||||
|
||||
return adapter.uploadFile('common/sendMacVars', filesToUpload, null)
|
||||
return adapter.uploadFile(
|
||||
'services/common/sendMacVars',
|
||||
filesToUpload,
|
||||
null
|
||||
)
|
||||
},
|
||||
assertion: (response: any) =>
|
||||
(response.macvars as any[]).findIndex(
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import SASjs from '@sasjs/adapter'
|
||||
import { TestSuite } from '@sasjs/test-framework'
|
||||
import type { TestSuite } from '../types'
|
||||
|
||||
const stringData: any = { table1: [{ col1: 'first col value' }] }
|
||||
const numericData: any = { table1: [{ col1: 3.14159265 }] }
|
||||
@@ -52,7 +53,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
title: 'Absolute paths',
|
||||
description: 'Should work with absolute paths to SAS jobs',
|
||||
test: () => {
|
||||
return adapter.request(`${appLoc}/common/sendArr`, stringData)
|
||||
return adapter.request(`${appLoc}/services/common/sendArr`, stringData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return res.table1[0][0] === stringData.table1[0].col1
|
||||
@@ -62,7 +63,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
title: 'Single string value',
|
||||
description: 'Should send an array with a single string value',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', stringData)
|
||||
return adapter.request('services/common/sendArr', stringData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return res.table1[0][0] === stringData.table1[0].col1
|
||||
@@ -73,7 +74,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
description:
|
||||
'Should send an array with a long string value under 32765 characters',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', getLongStringData())
|
||||
return adapter.request('services/common/sendArr', getLongStringData())
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const longStringData = getLongStringData()
|
||||
@@ -86,7 +87,9 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
'Should error out with long string values over 32765 characters',
|
||||
test: () => {
|
||||
const data = getLongStringData(32767)
|
||||
return adapter.request('common/sendArr', data).catch((e: any) => e)
|
||||
return adapter
|
||||
.request('services/common/sendArr', data)
|
||||
.catch((e: any) => e)
|
||||
},
|
||||
assertion: (error: any) => {
|
||||
return !!error && !!error.error && !!error.error.message
|
||||
@@ -96,7 +99,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
title: 'Single numeric value',
|
||||
description: 'Should send an array with a single numeric value',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', numericData)
|
||||
return adapter.request('services/common/sendArr', numericData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return res.table1[0][0] === numericData.table1[0].col1
|
||||
@@ -106,7 +109,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
title: 'Multiple columns',
|
||||
description: 'Should handle data with multiple columns',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', multiColumnData)
|
||||
return adapter.request('services/common/sendArr', multiColumnData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return (
|
||||
@@ -121,7 +124,7 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
title: 'Multiple rows with nulls',
|
||||
description: 'Should handle data with multiple rows with null values',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', multipleRowsWithNulls)
|
||||
return adapter.request('services/common/sendArr', multipleRowsWithNulls)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
let result = true
|
||||
@@ -147,7 +150,10 @@ export const sendArrTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
title: 'Multiple columns with nulls',
|
||||
description: 'Should handle data with multiple columns with null values',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', multipleColumnsWithNulls)
|
||||
return adapter.request(
|
||||
'services/common/sendArr',
|
||||
multipleColumnsWithNulls
|
||||
)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
let result = true
|
||||
@@ -183,7 +189,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
'1InvalidTable': [{ col1: 42 }]
|
||||
}
|
||||
return adapter
|
||||
.request('common/sendObj', invalidData)
|
||||
.request('services/common/sendObj', invalidData)
|
||||
.catch((e: any) => e)
|
||||
},
|
||||
assertion: (error: any) =>
|
||||
@@ -197,7 +203,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
'an invalidTable': [{ col1: 42 }]
|
||||
}
|
||||
return adapter
|
||||
.request('common/sendObj', invalidData)
|
||||
.request('services/common/sendObj', invalidData)
|
||||
.catch((e: any) => e)
|
||||
},
|
||||
assertion: (error: any) =>
|
||||
@@ -211,7 +217,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
'anInvalidTable#': [{ col1: 42 }]
|
||||
}
|
||||
return adapter
|
||||
.request('common/sendObj', invalidData)
|
||||
.request('services/common/sendObj', invalidData)
|
||||
.catch((e: any) => e)
|
||||
},
|
||||
assertion: (error: any) =>
|
||||
@@ -226,7 +232,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
}
|
||||
|
||||
return adapter
|
||||
.request('common/sendObj', invalidData)
|
||||
.request('services/common/sendObj', invalidData)
|
||||
.catch((e: any) => e)
|
||||
},
|
||||
assertion: (error: any) =>
|
||||
@@ -240,7 +246,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
inData: [[{ data: 'value' }]]
|
||||
}
|
||||
return adapter
|
||||
.request('common/sendObj', invalidData)
|
||||
.request('services/common/sendObj', invalidData)
|
||||
.catch((e: any) => e)
|
||||
},
|
||||
assertion: (error: any) =>
|
||||
@@ -250,7 +256,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Single string value',
|
||||
description: 'Should send an object with a single string value',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', stringData)
|
||||
return adapter.request('services/common/sendObj', stringData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return res.table1[0].COL1 === stringData.table1[0].col1
|
||||
@@ -261,7 +267,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
description:
|
||||
'Should send an object with a long string value under 32765 characters',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', getLongStringData())
|
||||
return adapter.request('services/common/sendObj', getLongStringData())
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const longStringData = getLongStringData()
|
||||
@@ -274,7 +280,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
'Should error out with long string values over 32765 characters',
|
||||
test: () => {
|
||||
return adapter
|
||||
.request('common/sendObj', getLongStringData(32767))
|
||||
.request('services/common/sendObj', getLongStringData(32767))
|
||||
.catch((e: any) => e)
|
||||
},
|
||||
assertion: (error: any) => {
|
||||
@@ -285,7 +291,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Single numeric value',
|
||||
description: 'Should send an object with a single numeric value',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', numericData)
|
||||
return adapter.request('services/common/sendObj', numericData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return res.table1[0].COL1 === numericData.table1[0].col1
|
||||
@@ -296,7 +302,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Large data volume',
|
||||
description: 'Should send an object with a large amount of data',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', getLargeObjectData())
|
||||
return adapter.request('services/common/sendObj', getLargeObjectData())
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const data = getLargeObjectData()
|
||||
@@ -307,7 +313,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Multiple columns',
|
||||
description: 'Should handle data with multiple columns',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', multiColumnData)
|
||||
return adapter.request('services/common/sendObj', multiColumnData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return (
|
||||
@@ -322,7 +328,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Multiple rows with nulls',
|
||||
description: 'Should handle data with multiple rows with null values',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', multipleRowsWithNulls)
|
||||
return adapter.request('services/common/sendObj', multipleRowsWithNulls)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
let result = true
|
||||
@@ -348,7 +354,10 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Multiple columns with nulls',
|
||||
description: 'Should handle data with multiple columns with null values',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', multipleColumnsWithNulls)
|
||||
return adapter.request(
|
||||
'services/common/sendObj',
|
||||
multipleColumnsWithNulls
|
||||
)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
let result = true
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import SASjs from '@sasjs/adapter'
|
||||
import { TestSuite } from '@sasjs/test-framework'
|
||||
import type { TestSuite } from '../types'
|
||||
|
||||
const data: any = { table1: [{ col1: 'first col value' }] }
|
||||
|
||||
@@ -10,7 +11,7 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'WORK tables',
|
||||
description: 'Should get WORK tables after request',
|
||||
test: async () => {
|
||||
return adapter.request('common/sendArr', data)
|
||||
return adapter.request('services/common/sendArr', data)
|
||||
},
|
||||
assertion: () => {
|
||||
const requests = adapter.getSasRequests()
|
||||
@@ -27,7 +28,7 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
|
||||
// 'Should make an error and capture log, in the same time it is testing if debug override is working',
|
||||
// test: async () => {
|
||||
// return adapter
|
||||
// .request('common/makeErr', data, { debug: true })
|
||||
// .request('services/common/makeErr', data, { debug: true })
|
||||
// .catch(() => {
|
||||
// const sasRequests = adapter.getSasRequests()
|
||||
// const makeErrRequest: any =
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
/* eslint-disable @typescript-eslint/no-unused-vars */
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import SASjs from '@sasjs/adapter'
|
||||
import { TestSuite } from '@sasjs/test-framework'
|
||||
import type { TestSuite } from '../types'
|
||||
|
||||
const specialCharData: any = {
|
||||
table1: [
|
||||
@@ -109,7 +111,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Common special characters',
|
||||
description: 'Should handle common special characters',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', specialCharData)
|
||||
return adapter.request('services/common/sendArr', specialCharData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return (
|
||||
@@ -131,7 +133,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Other special characters',
|
||||
description: 'Should handle other special characters',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', moreSpecialCharData)
|
||||
return adapter.request('services/common/sendArr', moreSpecialCharData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
// If sas session is `latin9` or `wlatin1` we can't process the special characters,
|
||||
@@ -167,7 +169,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Wide table with sendArr',
|
||||
description: 'Should handle data with 10000 columns',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', getWideData())
|
||||
return adapter.request('services/common/sendArr', getWideData())
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const data = getWideData()
|
||||
@@ -183,7 +185,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Wide table with sendObj',
|
||||
description: 'Should handle data with 10000 columns',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', getWideData())
|
||||
return adapter.request('services/common/sendObj', getWideData())
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const data = getWideData()
|
||||
@@ -200,7 +202,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Multiple tables',
|
||||
description: 'Should handle data with 100 tables',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', getTables())
|
||||
return adapter.request('services/common/sendArr', getTables())
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const data = getTables()
|
||||
@@ -220,7 +222,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Large dataset with sendObj',
|
||||
description: 'Should handle 5mb of data',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', getLargeDataset())
|
||||
return adapter.request('services/common/sendObj', getLargeDataset())
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const data = getLargeDataset()
|
||||
@@ -235,7 +237,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Large dataset with sendArr',
|
||||
description: 'Should handle 5mb of data',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', getLargeDataset())
|
||||
return adapter.request('services/common/sendArr', getLargeDataset())
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
const data = getLargeDataset()
|
||||
@@ -251,7 +253,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Error and _csrf tables with sendArr',
|
||||
description: 'Should handle error and _csrf tables',
|
||||
test: () => {
|
||||
return adapter.request('common/sendArr', errorAndCsrfData)
|
||||
return adapter.request('services/common/sendArr', errorAndCsrfData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return (
|
||||
@@ -270,7 +272,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Error and _csrf tables with sendObj',
|
||||
description: 'Should handle error and _csrf tables',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', errorAndCsrfData)
|
||||
return adapter.request('services/common/sendObj', errorAndCsrfData)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
return (
|
||||
@@ -298,7 +300,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
}
|
||||
|
||||
return await adapter.request(
|
||||
'common/sendArr',
|
||||
'services/common/sendArr',
|
||||
stringData,
|
||||
config,
|
||||
undefined,
|
||||
@@ -317,7 +319,10 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
title: 'Special missing values',
|
||||
description: 'Should support special missing values',
|
||||
test: () => {
|
||||
return adapter.request('common/sendObj', testTableWithSpecialNumeric)
|
||||
return adapter.request(
|
||||
'services/common/sendObj',
|
||||
testTableWithSpecialNumeric
|
||||
)
|
||||
},
|
||||
assertion: (res: any) => {
|
||||
let assertionRes = true
|
||||
@@ -325,7 +330,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
// We receive formats in response. We compare it with formats that we included in request to make sure they are equal
|
||||
const resVars = res[`$${testTable}`].vars
|
||||
|
||||
Object.keys(resVars).forEach((key: any, i: number) => {
|
||||
Object.keys(resVars).forEach((key: any, _i: number) => {
|
||||
let formatValue =
|
||||
testTableWithSpecialNumeric[`$${testTable}`].formats[
|
||||
key.toLowerCase()
|
||||
@@ -363,7 +368,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
'Should support special missing values, when one row is send',
|
||||
test: () => {
|
||||
return adapter.request(
|
||||
'common/sendObj',
|
||||
'services/common/sendObj',
|
||||
testTableWithSpecialNumericOneRow
|
||||
)
|
||||
},
|
||||
@@ -373,7 +378,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
// We receive formats in response. We compare it with formats that we included in request to make sure they are equal
|
||||
const resVars = res[`$${testTable}`].vars
|
||||
|
||||
Object.keys(resVars).forEach((key: any, i: number) => {
|
||||
Object.keys(resVars).forEach((key: any, _i: number) => {
|
||||
let formatValue =
|
||||
testTableWithSpecialNumeric[`$${testTable}`].formats[
|
||||
key.toLowerCase()
|
||||
@@ -411,7 +416,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
'Should support special missing values, when LOWERCASE value is sent',
|
||||
test: () => {
|
||||
return adapter.request(
|
||||
'common/sendObj',
|
||||
'services/common/sendObj',
|
||||
testTableWithSpecialNumericLowercase
|
||||
)
|
||||
},
|
||||
@@ -421,7 +426,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
// We receive formats in response. We compare it with formats that we included in request to make sure they are equal
|
||||
const resVars = res[`$${testTable}`].vars
|
||||
|
||||
Object.keys(resVars).forEach((key: any, i: number) => {
|
||||
Object.keys(resVars).forEach((key: any, _i: number) => {
|
||||
let formatValue =
|
||||
testTableWithSpecialNumericLowercase[`$${testTable}`].formats[
|
||||
key.toLowerCase()
|
||||
@@ -467,7 +472,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
'Should support special missing values, when one row is send (On VIYA Web Approach)',
|
||||
test: () => {
|
||||
return adapter.request(
|
||||
'common/sendObj',
|
||||
'services/common/sendObj',
|
||||
testTableWithSpecialNumericOneRow,
|
||||
{ useComputeApi: undefined }
|
||||
)
|
||||
@@ -478,7 +483,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
// We receive formats in response. We compare it with formats that we included in request to make sure they are equal
|
||||
const resVars = res[`$${testTable}`].vars
|
||||
|
||||
Object.keys(resVars).forEach((key: any, i: number) => {
|
||||
Object.keys(resVars).forEach((key: any, _i: number) => {
|
||||
let formatValue =
|
||||
testTableWithSpecialNumeric[`$${testTable}`].formats[
|
||||
key.toLowerCase()
|
||||
|
||||
@@ -0,0 +1,126 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
import SASjs from '@sasjs/adapter'
|
||||
import type { TestSuite } from '../types'
|
||||
|
||||
const tableData: any = { table1: [{ col1: 'first col value' }] }
|
||||
const fileData: any = { table1: [{ col1: 'value with ; semicolon' }] }
|
||||
const multiTableData: any = {
|
||||
table1: [{ col1: 'first col value' }],
|
||||
table2: [{ col2: 'second table value' }]
|
||||
}
|
||||
const multiFileData: any = {
|
||||
table1: [{ col1: 'value with ; semicolon' }],
|
||||
table2: [{ col2: 'another; value' }]
|
||||
}
|
||||
|
||||
const taskConfig: any = { useComputeApi: null, runAsTask: true }
|
||||
const noTaskConfig: any = { useComputeApi: null, runAsTask: false }
|
||||
|
||||
export const executionTasksTests = (adapter: SASjs): TestSuite => ({
|
||||
name: 'runAsTask behaviour',
|
||||
tests: [
|
||||
{
|
||||
title: 'no inputs (runAsTask=false)',
|
||||
description: 'no payload, runAsTask explicitly disabled',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', null, noTaskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'no inputs (runAsTask=true)',
|
||||
description: 'no payload, runAsTask=true via config',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', null, taskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'one input table (runAsTask=false)',
|
||||
description: 'single table payload, runAsTask explicitly disabled',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', tableData, noTaskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'one input table (runAsTask=true)',
|
||||
description: 'single table payload, runAsTask=true via config',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', tableData, taskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'multiple input tables (runAsTask=false)',
|
||||
description: 'multi-table payload, runAsTask explicitly disabled',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', multiTableData, noTaskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'multiple input tables (runAsTask=true)',
|
||||
description: 'multi-table payload, runAsTask=true via config',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', multiTableData, taskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'semicolon payload, single table, blob path (runAsTask=false)',
|
||||
description: 'semicolon payload routes through blob path, runAsTask off',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', fileData, noTaskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'semicolon payload, single table, blob path (runAsTask=true)',
|
||||
description:
|
||||
'semicolon payload (single table) routes through blob path, runAsTask=true',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', fileData, taskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'semicolon payload, multi-table, blob path (runAsTask=false)',
|
||||
description:
|
||||
'semicolon payload (multi-table) routes through blob path, runAsTask off',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', multiFileData, noTaskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
},
|
||||
{
|
||||
title: 'semicolon payload, multi-table, blob path (runAsTask=true)',
|
||||
description:
|
||||
'semicolon payload (multi-table) routes through blob path, runAsTask=true',
|
||||
test: () =>
|
||||
adapter
|
||||
.request('services/common/sendArr', multiFileData, taskConfig)
|
||||
.then((res: any) => ({ ok: true, res }))
|
||||
.catch((e: any) => ({ ok: false, error: e })),
|
||||
assertion: (res: any) => res?.ok === true
|
||||
}
|
||||
]
|
||||
})
|
||||
@@ -0,0 +1,12 @@
|
||||
import type SASjs from '@sasjs/adapter'
|
||||
import type { SASjsConfig } from '@sasjs/adapter'
|
||||
|
||||
export interface AppConfig {
|
||||
sasJsConfig: SASjsConfig
|
||||
}
|
||||
|
||||
export interface AppState {
|
||||
config: AppConfig | null
|
||||
adapter: SASjs | null
|
||||
isLoggedIn: boolean
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
export * from './test'
|
||||
export * from './context'
|
||||
@@ -0,0 +1,24 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
export interface Test {
|
||||
title: string
|
||||
description: string
|
||||
beforeTest?: (...args: any) => Promise<any>
|
||||
afterTest?: (...args: any) => Promise<any>
|
||||
test: (context: any) => Promise<any>
|
||||
assertion: (...args: any) => boolean
|
||||
}
|
||||
|
||||
export interface TestSuite {
|
||||
name: string
|
||||
tests: Test[]
|
||||
beforeAll?: (...args: any) => Promise<any>
|
||||
afterAll?: (...args: any) => Promise<any>
|
||||
}
|
||||
|
||||
export interface TestResult {
|
||||
result: boolean
|
||||
error: Error | null
|
||||
executionTime: number
|
||||
}
|
||||
|
||||
export type TestStatus = 'pending' | 'running' | 'passed' | 'failed'
|
||||
@@ -1,22 +0,0 @@
|
||||
export const assert = (
|
||||
expression: boolean | (() => boolean),
|
||||
message = 'Assertion failed'
|
||||
) => {
|
||||
let result
|
||||
try {
|
||||
if (typeof expression === 'boolean') {
|
||||
result = expression
|
||||
} else {
|
||||
result = expression()
|
||||
}
|
||||
} catch (e: any) {
|
||||
console.error(message)
|
||||
throw new Error(message)
|
||||
}
|
||||
if (!!result) {
|
||||
return
|
||||
} else {
|
||||
console.error(message)
|
||||
throw new Error(message)
|
||||
}
|
||||
}
|
||||
+20
-22
@@ -1,28 +1,26 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "es5",
|
||||
"lib": [
|
||||
"dom",
|
||||
"dom.iterable",
|
||||
"esnext"
|
||||
],
|
||||
"sourceMap": true,
|
||||
"inlineSources": true,
|
||||
"allowJs": true,
|
||||
"target": "ES2022",
|
||||
"useDefineForClassFields": true,
|
||||
"module": "ESNext",
|
||||
"lib": ["ES2022", "DOM", "DOM.Iterable"],
|
||||
"types": ["vite/client"],
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"module": "esnext",
|
||||
"moduleResolution": "node",
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
|
||||
/* Bundler mode */
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"verbatimModuleSyntax": true,
|
||||
"moduleDetection": "force",
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx",
|
||||
"noFallthroughCasesInSwitch": true
|
||||
|
||||
/* Linting */
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"erasableSyntaxOnly": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUncheckedSideEffectImports": true
|
||||
},
|
||||
"include": [
|
||||
"src"
|
||||
]
|
||||
"include": ["src"]
|
||||
}
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
import { defineConfig } from 'vite'
|
||||
export default defineConfig({
|
||||
server: {
|
||||
port: 3000
|
||||
},
|
||||
build: {
|
||||
assetsInlineLimit: 0,
|
||||
assetsDir: ''
|
||||
},
|
||||
base: ''
|
||||
})
|
||||
+16
-11
@@ -32,16 +32,18 @@ export class ContextManager {
|
||||
return this.defaultLauncherContexts
|
||||
}
|
||||
|
||||
constructor(private serverUrl: string, private requestClient: RequestClient) {
|
||||
constructor(
|
||||
private serverUrl: string,
|
||||
private requestClient: RequestClient
|
||||
) {
|
||||
if (serverUrl) isUrl(serverUrl)
|
||||
}
|
||||
|
||||
public async getComputeContexts(accessToken?: string) {
|
||||
const { result: contexts } = await this.requestClient
|
||||
.get<{ items: Context[] }>(
|
||||
`${this.serverUrl}/compute/contexts?limit=10000`,
|
||||
accessToken
|
||||
)
|
||||
.get<{
|
||||
items: Context[]
|
||||
}>(`${this.serverUrl}/compute/contexts?limit=10000`, accessToken)
|
||||
.catch((err) => {
|
||||
throw prefixMessage(err, 'Error while getting compute contexts. ')
|
||||
})
|
||||
@@ -59,10 +61,9 @@ export class ContextManager {
|
||||
|
||||
public async getLauncherContexts(accessToken?: string) {
|
||||
const { result: contexts } = await this.requestClient
|
||||
.get<{ items: Context[] }>(
|
||||
`${this.serverUrl}/launcher/contexts?limit=10000`,
|
||||
accessToken
|
||||
)
|
||||
.get<{
|
||||
items: Context[]
|
||||
}>(`${this.serverUrl}/launcher/contexts?limit=10000`, accessToken)
|
||||
.catch((err) => {
|
||||
throw prefixMessage(err, 'Error while getting launcher contexts. ')
|
||||
})
|
||||
@@ -291,7 +292,9 @@ export class ContextManager {
|
||||
accessToken?: string
|
||||
): Promise<Context> {
|
||||
const { result: contexts } = await this.requestClient
|
||||
.get<{ items: Context[] }>(
|
||||
.get<{
|
||||
items: Context[]
|
||||
}>(
|
||||
`${this.serverUrl}/compute/contexts?filter=eq(name, "${contextName}")`,
|
||||
accessToken
|
||||
)
|
||||
@@ -332,7 +335,9 @@ export class ContextManager {
|
||||
authConfig?: AuthConfig
|
||||
) {
|
||||
const { result: contexts } = await this.requestClient
|
||||
.get<{ items: Context[] }>(
|
||||
.get<{
|
||||
items: Context[]
|
||||
}>(
|
||||
`${this.serverUrl}/compute/contexts?limit=10000`,
|
||||
authConfig?.access_token
|
||||
)
|
||||
|
||||
+162
-13
@@ -35,6 +35,60 @@ interface JobExecutionResult {
|
||||
log?: string
|
||||
error?: object
|
||||
}
|
||||
/* Viya /types/types?limit=999999 response structure */
|
||||
interface IViyaTypesResponse {
|
||||
accept: string
|
||||
count: number
|
||||
items: IViyaTypesItem[]
|
||||
limit: number
|
||||
links: IViyaTypesLink[]
|
||||
name: string
|
||||
start: number
|
||||
version: number
|
||||
}
|
||||
|
||||
/* Item element within the Viya types response */
|
||||
interface IViyaTypesItem {
|
||||
description?: string
|
||||
extensions?: string[]
|
||||
iconUri?: string
|
||||
label: string
|
||||
links: IViyaTypesLink[]
|
||||
mappedTypes?: string[]
|
||||
mediaType?: string
|
||||
mediaTypes?: string[]
|
||||
name?: string | undefined
|
||||
pluralLabel?: string
|
||||
properties?: IViyaTypesProperties
|
||||
resourceUri?: string
|
||||
serviceRootUri?: string
|
||||
tags?: string[]
|
||||
version: number
|
||||
}
|
||||
|
||||
/**
|
||||
* Generic structure for a link
|
||||
* in the links array of a Viya
|
||||
* types/types api response
|
||||
*/
|
||||
type IViyaTypesLink = Record<string, string>
|
||||
|
||||
/**
|
||||
* Generic structure for a type's
|
||||
* 'properties' object from the Viya
|
||||
* types/types api response
|
||||
*/
|
||||
type IViyaTypesProperties = Record<string, string>
|
||||
|
||||
/**
|
||||
* Arbitrary interface for storing
|
||||
* sufficient additional detail to
|
||||
* create and patch a new file.
|
||||
*/
|
||||
interface IViyaTypesExtensionInfo {
|
||||
typeDefName: string | undefined
|
||||
properties: IViyaTypesProperties | undefined
|
||||
}
|
||||
|
||||
/**
|
||||
* A client for interfacing with the SAS Viya REST API.
|
||||
@@ -61,6 +115,9 @@ export class SASViyaApiClient {
|
||||
this.requestClient
|
||||
)
|
||||
private folderMap = new Map<string, Job[]>()
|
||||
private fileExtensionMap = new Map<string, IViyaTypesExtensionInfo>()
|
||||
private boolExtensionMap = false // required in case the map has zero entries
|
||||
// after an attempt to populate it.
|
||||
|
||||
/**
|
||||
* A helper method used to call appendRequest method of RequestClient
|
||||
@@ -434,15 +491,102 @@ export class SASViyaApiClient {
|
||||
const formData = new NodeFormData()
|
||||
formData.append('file', contentBuffer, fileName)
|
||||
|
||||
return (
|
||||
await this.requestClient.post<File>(
|
||||
`/files/files?parentFolderUri=${parentFolderUri}&typeDefName=file#rawUpload`,
|
||||
formData,
|
||||
accessToken,
|
||||
'multipart/form-data; boundary=' + (formData as any)._boundary,
|
||||
headers
|
||||
)
|
||||
).result
|
||||
/** Query Viya for file metadata based on extension type. */
|
||||
|
||||
// typeDefName - Viya accepts this property during the file creation
|
||||
let typeDefName: string | undefined = undefined
|
||||
// Additional properties are supplied by a patch.
|
||||
let filePatch:
|
||||
| {
|
||||
name: string
|
||||
properties: IViyaTypesProperties | undefined
|
||||
}
|
||||
| undefined = undefined
|
||||
|
||||
// The patching process requires properties related to the file-extension
|
||||
const fileExtension: string | undefined = fileName
|
||||
.split('.')
|
||||
.pop()
|
||||
?.toLowerCase()
|
||||
|
||||
if (fileExtension) {
|
||||
if (!this.boolExtensionMap) {
|
||||
// Populate the file extension map
|
||||
// 1. Get Viya's response to this api call
|
||||
const typesQueryUrl = `/types/types?limit=999999`
|
||||
const response = (
|
||||
await this.requestClient.get(typesQueryUrl, accessToken)
|
||||
).result as IViyaTypesResponse
|
||||
// 2. Filter the returned items that have file extensions into a map
|
||||
// using forEach as an item may relate to multiple file extensions.
|
||||
response.items
|
||||
.filter((e) => e.extensions)
|
||||
.forEach((e) => {
|
||||
e.extensions?.forEach((ext) => {
|
||||
this.fileExtensionMap.set(ext, {
|
||||
// `name` becomes the typeDefName value at file creation time.
|
||||
// `name` is ignored here if it is not populated in the map, or
|
||||
// has a blank/empty value.
|
||||
typeDefName: e.name
|
||||
? e.name.trim().length
|
||||
? e.name.trim()
|
||||
: undefined
|
||||
: undefined,
|
||||
properties: e.properties
|
||||
})
|
||||
})
|
||||
})
|
||||
// 3. Toggle the flag to avoid repeating this step
|
||||
this.boolExtensionMap = true
|
||||
}
|
||||
|
||||
// Query the map for the current file extension
|
||||
const fileExtInfo = this.fileExtensionMap.get(fileExtension)
|
||||
if (fileExtInfo) {
|
||||
// If the extension was found in the map, record the typeDefName and
|
||||
// create a patch if a properties object was returned.
|
||||
typeDefName = fileExtInfo.typeDefName
|
||||
if (fileExtInfo.properties)
|
||||
filePatch = { name: fileName, properties: fileExtInfo.properties }
|
||||
}
|
||||
}
|
||||
|
||||
// Create the file
|
||||
const createFileResponse = await this.requestClient.post<File>(
|
||||
`/files/files?parentFolderUri=${parentFolderUri}&typeDefName=${
|
||||
typeDefName ?? 'file'
|
||||
}#rawUpload`,
|
||||
formData,
|
||||
accessToken,
|
||||
'multipart/form-data; boundary=' + (formData as any)._boundary,
|
||||
headers
|
||||
)
|
||||
|
||||
// If a patch was created...
|
||||
if (filePatch) {
|
||||
try {
|
||||
const patchHeaders = {
|
||||
Accept: 'application/json',
|
||||
'If-Match': '*'
|
||||
}
|
||||
// Get the URI of the newly created file
|
||||
const fileUri = createFileResponse.result.links.filter(
|
||||
(e) => e.method == 'PATCH' && e.rel == 'patch'
|
||||
)[0].uri
|
||||
// and apply the patch
|
||||
return (
|
||||
await this.requestClient.patch<File>(
|
||||
`${fileUri}`,
|
||||
filePatch,
|
||||
accessToken,
|
||||
patchHeaders
|
||||
)
|
||||
).result
|
||||
} catch (e: any) {
|
||||
throw new Error(`Error patching file ${fileName}.\n${e.message}`)
|
||||
}
|
||||
}
|
||||
return createFileResponse.result
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -882,17 +1026,22 @@ export class SASViyaApiClient {
|
||||
}
|
||||
|
||||
files.forEach((fileInfo, index) => {
|
||||
jobArguments[
|
||||
`_webin_fileuri${index + 1}`
|
||||
] = `/files/files/${fileInfo.file.id}`
|
||||
jobArguments[`_webin_fileuri${index + 1}`] =
|
||||
`/files/files/${fileInfo.file.id}`
|
||||
jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName
|
||||
})
|
||||
|
||||
// Viya JES requires arguments to be Map<String,String>; coerce booleans/numbers.
|
||||
const stringifiedArguments: { [key: string]: string } = {}
|
||||
for (const k of Object.keys(jobArguments)) {
|
||||
stringifiedArguments[k] = String(jobArguments[k])
|
||||
}
|
||||
|
||||
const postJobRequestBody = {
|
||||
name: `exec-${jobName}`,
|
||||
description: 'Powered by SASjs',
|
||||
jobDefinition,
|
||||
arguments: jobArguments
|
||||
arguments: stringifiedArguments
|
||||
}
|
||||
|
||||
const { result: postedJob } = await this.requestClient.post<Job>(
|
||||
|
||||
+2
-2
@@ -1063,8 +1063,8 @@ export default class SASjs {
|
||||
this.sasjsConfig.serverType === ServerType.SasViya
|
||||
? this.sasjsConfig.pathSASViya
|
||||
: this.sasjsConfig.serverType === ServerType.Sas9
|
||||
? this.sasjsConfig.pathSAS9
|
||||
: this.sasjsConfig.pathSASJS
|
||||
? this.sasjsConfig.pathSAS9
|
||||
: this.sasjsConfig.pathSASJS
|
||||
|
||||
this.authManager = new AuthManager(
|
||||
this.sasjsConfig.serverUrl,
|
||||
|
||||
@@ -125,9 +125,8 @@ export async function executeOnComputeApi(
|
||||
jobVariables['_webin_file_count'] = files.length
|
||||
|
||||
files.forEach((fileInfo, index) => {
|
||||
jobVariables[
|
||||
`_webin_fileuri${index + 1}`
|
||||
] = `/files/files/${fileInfo.file.id}`
|
||||
jobVariables[`_webin_fileuri${index + 1}`] =
|
||||
`/files/files/${fileInfo.file.id}`
|
||||
jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName
|
||||
})
|
||||
} else {
|
||||
|
||||
@@ -683,8 +683,8 @@ const mockSimplePoll = (runningCount = 2) => {
|
||||
count === 0
|
||||
? 'pending'
|
||||
: count <= runningCount
|
||||
? 'running'
|
||||
: 'completed',
|
||||
? 'running'
|
||||
: 'completed',
|
||||
etag: '',
|
||||
status: 200
|
||||
})
|
||||
|
||||
@@ -23,6 +23,20 @@ describe('uploadTables', () => {
|
||||
)
|
||||
})
|
||||
|
||||
it('should skip $tablename formats metadata keys', async () => {
|
||||
const data = {
|
||||
tablewith2cols2rows: [{ col1: 'val1', specialMissingsCol: 'A' }],
|
||||
$tablewith2cols2rows: { formats: { specialMissingsCol: 'best.' } }
|
||||
}
|
||||
|
||||
const files = await uploadTables(requestClient, data, 't0k3n')
|
||||
|
||||
expect(files).toEqual([
|
||||
{ tableName: 'tablewith2cols2rows', file: 'test-file' }
|
||||
])
|
||||
expect(requestClient.uploadFile).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('should throw an error when the CSV exceeds the maximum length', async () => {
|
||||
const data = { foo: 'bar' }
|
||||
jest
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { prefixMessage } from '@sasjs/utils/error'
|
||||
import { RequestClient } from '../../request/RequestClient'
|
||||
import { convertToCSV } from '../../utils/convertToCsv'
|
||||
import { convertToCSV, isFormatsTable } from '../../utils/convertToCsv'
|
||||
|
||||
/**
|
||||
* Uploads tables to SAS as specially formatted CSVs.
|
||||
@@ -18,6 +18,10 @@ export async function uploadTables(
|
||||
const uploadedFiles = []
|
||||
|
||||
for (const tableName in data) {
|
||||
// $tablename keys carry only column-format metadata for the matching
|
||||
// tablename payload; they must not be uploaded as separate files.
|
||||
if (isFormatsTable(tableName)) continue
|
||||
|
||||
const csv = convertToCSV(data, tableName)
|
||||
if (csv === 'ERROR: LARGE STRING LENGTH') {
|
||||
throw new Error(
|
||||
|
||||
@@ -27,8 +27,8 @@ export class AuthManager {
|
||||
this.serverType === ServerType.Sas9
|
||||
? '/SASLogon/logout?'
|
||||
: this.serverType === ServerType.SasViya
|
||||
? '/SASLogon/logout.do?'
|
||||
: '/SASLogon/logout'
|
||||
? '/SASLogon/logout.do?'
|
||||
: '/SASLogon/logout'
|
||||
|
||||
this.redirectedLoginUrl = this.serverUrl + this.redirectedLoginUrl
|
||||
}
|
||||
@@ -269,8 +269,8 @@ export class AuthManager {
|
||||
this.serverType === ServerType.SasViya
|
||||
? `${this.serverUrl}/identities/users/@currentUser`
|
||||
: this.serverType === ServerType.Sas9
|
||||
? `${this.serverUrl}/SASStoredProcess`
|
||||
: `${this.serverUrl}/SASjsApi/session`
|
||||
? `${this.serverUrl}/SASStoredProcess`
|
||||
: `${this.serverUrl}/SASjsApi/session`
|
||||
|
||||
const { result: loginResponse } = await this.requestClient
|
||||
.get<string>(url, undefined, 'text/plain')
|
||||
|
||||
@@ -10,7 +10,7 @@ describe('openWebPage', () => {
|
||||
describe('window.open is not blocked', () => {
|
||||
const mockedOpen = jest
|
||||
.fn()
|
||||
.mockImplementation(() => ({} as unknown as Window))
|
||||
.mockImplementation(() => ({}) as unknown as Window)
|
||||
const originalOpen = window.open
|
||||
|
||||
beforeAll(() => {
|
||||
|
||||
@@ -11,6 +11,13 @@ export const generateTableUploadForm = (
|
||||
let tableCounter = 0
|
||||
|
||||
for (const tableName in data) {
|
||||
if (
|
||||
isFormatsTable(tableName) &&
|
||||
Object.keys(data).includes(tableName.replace(/^\$/, ''))
|
||||
) {
|
||||
continue
|
||||
}
|
||||
|
||||
tableCounter++
|
||||
|
||||
// Formats table should not be sent as part of 'sasjs_tables'
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
import { generateTableUploadForm } from '../generateTableUploadForm'
|
||||
import { convertToCSV } from '../../utils/convertToCsv'
|
||||
import NodeFormData from 'form-data'
|
||||
|
||||
describe('generateTableUploadForm', () => {
|
||||
it('should skip formats table and emit single sasjs1data for paired data + $data', () => {
|
||||
const tableName = 'jsdata'
|
||||
const data: { [key: string]: any } = {
|
||||
[tableName]: [
|
||||
{ var1: 'string', var2: 232 },
|
||||
{ var1: 'string', var2: 233 }
|
||||
],
|
||||
[`$${tableName}`]: { formats: { var1: '$char12.', var2: 'best.' } }
|
||||
}
|
||||
const expectedCsv = convertToCSV(data, tableName)
|
||||
|
||||
const formData = new NodeFormData()
|
||||
const { requestParams } = generateTableUploadForm(formData, data)
|
||||
|
||||
expect(requestParams.sasjs_tables).toBe(tableName)
|
||||
expect(requestParams.sasjs1data).toBe(expectedCsv)
|
||||
expect(requestParams.sasjs2data).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should number sequentially across multiple tables w/ paired formats', () => {
|
||||
const data: { [key: string]: any } = {
|
||||
tableA: [{ a: 1 }],
|
||||
$tableA: { formats: { a: 'best.' } },
|
||||
tableB: [{ b: 'x' }],
|
||||
$tableB: { formats: { b: '$char1.' } }
|
||||
}
|
||||
const expectedCsvA = convertToCSV(data, 'tableA')
|
||||
const expectedCsvB = convertToCSV(data, 'tableB')
|
||||
|
||||
const formData = new NodeFormData()
|
||||
const { requestParams } = generateTableUploadForm(formData, data)
|
||||
|
||||
expect(requestParams.sasjs_tables).toBe('tableA tableB')
|
||||
expect(requestParams.sasjs1data).toBe(expectedCsvA)
|
||||
expect(requestParams.sasjs2data).toBe(expectedCsvB)
|
||||
expect(requestParams.sasjs3data).toBeUndefined()
|
||||
})
|
||||
|
||||
it('should throw if string value exceeds 32765 chars', () => {
|
||||
const formData = new NodeFormData()
|
||||
const data = { testTable: [{ var1: 'z'.repeat(32766) }] }
|
||||
|
||||
expect(() => generateTableUploadForm(formData, data)).toThrow(
|
||||
new Error(
|
||||
'The max length of a string value in SASjs is 32765 characters.'
|
||||
)
|
||||
)
|
||||
})
|
||||
|
||||
it('should append chunks to formData when csv exceeds 16k', () => {
|
||||
const tableName = 'big'
|
||||
const data = { [tableName]: [{ var1: 'z'.repeat(16001) }] }
|
||||
|
||||
const formData = new NodeFormData()
|
||||
const appendSpy = jest.spyOn(formData, 'append')
|
||||
|
||||
const { requestParams } = generateTableUploadForm(formData, data)
|
||||
|
||||
expect(requestParams.sasjs_tables).toBe(tableName)
|
||||
expect(requestParams.sasjs1data).toBeUndefined()
|
||||
expect(appendSpy).toHaveBeenCalled()
|
||||
expect(appendSpy.mock.calls.every(([key]) => key === 'sasjs1data')).toBe(
|
||||
true
|
||||
)
|
||||
})
|
||||
})
|
||||
@@ -8,7 +8,10 @@ import {
|
||||
import { BaseJobExecutor } from './JobExecutor'
|
||||
|
||||
export class ComputeJobExecutor extends BaseJobExecutor {
|
||||
constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
|
||||
constructor(
|
||||
serverUrl: string,
|
||||
private sasViyaApiClient: SASViyaApiClient
|
||||
) {
|
||||
super(serverUrl, ServerType.SasViya)
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,10 @@ import { BaseJobExecutor } from './JobExecutor'
|
||||
import { appendExtraResponseAttributes } from '../utils'
|
||||
|
||||
export class JesJobExecutor extends BaseJobExecutor {
|
||||
constructor(serverUrl: string, private sasViyaApiClient: SASViyaApiClient) {
|
||||
constructor(
|
||||
serverUrl: string,
|
||||
private sasViyaApiClient: SASViyaApiClient
|
||||
) {
|
||||
super(serverUrl, ServerType.SasViya)
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,10 @@ export interface JobExecutor {
|
||||
}
|
||||
|
||||
export abstract class BaseJobExecutor implements JobExecutor {
|
||||
constructor(protected serverUrl: string, protected serverType: ServerType) {}
|
||||
constructor(
|
||||
protected serverUrl: string,
|
||||
protected serverType: ServerType
|
||||
) {}
|
||||
|
||||
private waitingRequests: ExecuteFunction[] = []
|
||||
|
||||
@@ -52,7 +55,6 @@ export abstract class BaseJobExecutor implements JobExecutor {
|
||||
if (config.debug) {
|
||||
requestParams['_omittextlog'] = 'false'
|
||||
requestParams['_omitSessionResults'] = 'false'
|
||||
|
||||
requestParams['_debug'] = 131
|
||||
}
|
||||
|
||||
|
||||
@@ -16,9 +16,11 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
|
||||
import {
|
||||
isRelativePath,
|
||||
parseSasViyaDebugResponse,
|
||||
parseSasViyaLogDebugResponse,
|
||||
appendExtraResponseAttributes,
|
||||
parseWeboutResponse,
|
||||
getFormData
|
||||
getFormData,
|
||||
isNode
|
||||
} from '../utils'
|
||||
import { BaseJobExecutor } from './JobExecutor'
|
||||
|
||||
@@ -97,12 +99,14 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
apiUrl = apiUrl.replace('_program=', '__program=')
|
||||
}
|
||||
|
||||
// if context name exists and is not blank string
|
||||
// then add _contextname variable in apiUrl
|
||||
apiUrl +=
|
||||
config.contextName && !/\s/.test(config.contextName)
|
||||
? `&_contextname=${config.contextName}`
|
||||
: ''
|
||||
// Append context name to URL if provided and non-empty
|
||||
apiUrl += config.contextName?.trim()
|
||||
? `&_contextname=${encodeURIComponent(config.contextName)}`
|
||||
: ''
|
||||
|
||||
if (config.runAsTask === true) {
|
||||
apiUrl += '&_executionTasks=true'
|
||||
}
|
||||
}
|
||||
|
||||
let requestParams = {
|
||||
@@ -115,6 +119,26 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
*/
|
||||
let formData = getFormData()
|
||||
|
||||
// FIXME(viya - SAS Track CS0409737): remove when Viya stops rejecting empty multipart on
|
||||
// _executionTasks=true. Dummy file keeps the body non-empty
|
||||
const hasExecutionTasksFlag = config.runAsTask === true
|
||||
|
||||
// Move debug params to URL for viya; viya seems to honor them more
|
||||
// reliably in the query string than the multipart body.
|
||||
if (
|
||||
hasExecutionTasksFlag &&
|
||||
config.debug &&
|
||||
config.serverType === ServerType.SasViya
|
||||
) {
|
||||
const debugKeys = ['_debug', '_omitSessionResults']
|
||||
debugKeys.forEach((key) => {
|
||||
if (requestParams[key] !== undefined) {
|
||||
apiUrl += `&${key}=${encodeURIComponent(requestParams[key])}`
|
||||
delete requestParams[key]
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
if (data) {
|
||||
const stringifiedData = JSON.stringify(data)
|
||||
if (
|
||||
@@ -135,10 +159,21 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
generateTableUploadForm(formData, data)
|
||||
formData = newFormData
|
||||
requestParams = { ...requestParams, ...params }
|
||||
|
||||
if (
|
||||
config.serverType === ServerType.SasViya &&
|
||||
hasExecutionTasksFlag
|
||||
) {
|
||||
addDummyFile(formData)
|
||||
}
|
||||
} catch (e: any) {
|
||||
return Promise.reject(new ErrorResponse(e?.message, e))
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (config.serverType === ServerType.SasViya && hasExecutionTasksFlag) {
|
||||
addDummyFile(formData)
|
||||
}
|
||||
}
|
||||
|
||||
for (const key in requestParams) {
|
||||
@@ -170,11 +205,14 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
if (config.debug) {
|
||||
switch (this.serverType) {
|
||||
case ServerType.SasViya:
|
||||
jsonResponse = await parseSasViyaDebugResponse(
|
||||
res.result,
|
||||
this.requestClient,
|
||||
this.serverUrl
|
||||
)
|
||||
jsonResponse =
|
||||
config.useComputeApi === null && config.runAsTask === true
|
||||
? await parseSasViyaLogDebugResponse(res.result)
|
||||
: await parseSasViyaDebugResponse(
|
||||
res.result,
|
||||
this.requestClient,
|
||||
this.serverUrl
|
||||
)
|
||||
break
|
||||
case ServerType.Sas9:
|
||||
jsonResponse =
|
||||
@@ -233,6 +271,23 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
return requestPromise
|
||||
}
|
||||
|
||||
protected getRequestParams(config: any): any {
|
||||
const requestParams = super.getRequestParams(config)
|
||||
|
||||
// FIXME(viya - possible issue with default debug flags)
|
||||
// runAsTask on Viya: use _debug=128 (not 131) and omit _omittextlog
|
||||
if (
|
||||
config.debug &&
|
||||
config.serverType === ServerType.SasViya &&
|
||||
config.runAsTask === true
|
||||
) {
|
||||
requestParams['_debug'] = 128
|
||||
delete requestParams['_omittextlog']
|
||||
}
|
||||
|
||||
return requestParams
|
||||
}
|
||||
|
||||
private async getJobUri(sasJob: string) {
|
||||
if (!this.sasViyaApiClient) return ''
|
||||
let uri = ''
|
||||
@@ -265,3 +320,18 @@ export class WebJobExecutor extends BaseJobExecutor {
|
||||
return uri
|
||||
}
|
||||
}
|
||||
|
||||
function addDummyFile(formData: NodeFormData | FormData) {
|
||||
if (isNode()) {
|
||||
;(formData as NodeFormData).append('_sasjs_noop', '', {
|
||||
filename: '_sasjs_noop.txt',
|
||||
contentType: 'text/plain'
|
||||
})
|
||||
} else {
|
||||
;(formData as FormData).append(
|
||||
'_sasjs_noop',
|
||||
new Blob([''], { type: 'text/plain' }),
|
||||
'_sasjs_noop.txt'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
import NodeFormData from 'form-data'
|
||||
import { ServerType } from '@sasjs/utils/types'
|
||||
import { WebJobExecutor } from '../WebJobExecutor'
|
||||
import { RequestClient } from '../../request/RequestClient'
|
||||
import { SASViyaApiClient } from '../../SASViyaApiClient'
|
||||
|
||||
describe('WebJobExecutor runAsTask behaviour', () => {
|
||||
const serverUrl = 'https://sample.server.com'
|
||||
const jobsPath = '/SASJobExecution'
|
||||
|
||||
const makeExecutor = (serverType: ServerType = ServerType.SasViya) => {
|
||||
const requestClient = new RequestClient(serverUrl)
|
||||
const sasViyaApiClient = {
|
||||
getJobsInFolder: async () => []
|
||||
} as unknown as SASViyaApiClient
|
||||
const executor = new WebJobExecutor(
|
||||
serverUrl,
|
||||
serverType,
|
||||
jobsPath,
|
||||
requestClient,
|
||||
sasViyaApiClient
|
||||
)
|
||||
const postSpy = jest
|
||||
.spyOn(requestClient, 'post')
|
||||
.mockResolvedValue({ result: { table1: [] }, etag: '' } as any)
|
||||
jest.spyOn(requestClient, 'appendRequest').mockImplementation()
|
||||
return { executor, postSpy }
|
||||
}
|
||||
|
||||
const baseConfig = {
|
||||
serverUrl,
|
||||
serverType: ServerType.SasViya,
|
||||
appLoc: '/Public/app',
|
||||
useComputeApi: false,
|
||||
debug: false
|
||||
}
|
||||
|
||||
it('sends table data in body (runAsTask=false)', async () => {
|
||||
const { executor, postSpy } = makeExecutor()
|
||||
|
||||
await executor.execute(
|
||||
'services/common/sendArr',
|
||||
{ table1: [{ col1: 'v' }] },
|
||||
{ ...baseConfig, runAsTask: false }
|
||||
)
|
||||
|
||||
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
|
||||
expect(apiUrl).not.toContain('_executionTasks=true')
|
||||
expect(body).toBeInstanceOf(NodeFormData)
|
||||
expect(contentType).toMatch(/^multipart\/form-data/)
|
||||
})
|
||||
|
||||
it('uploads as file when payload has semicolons (runAsTask=false)', async () => {
|
||||
const { executor, postSpy } = makeExecutor()
|
||||
|
||||
await executor.execute(
|
||||
'services/common/sendArr',
|
||||
{ table1: [{ col1: 'has; semicolon' }] },
|
||||
{ ...baseConfig, runAsTask: false }
|
||||
)
|
||||
|
||||
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
|
||||
expect(apiUrl).not.toContain('_executionTasks=')
|
||||
expect(body).toBeInstanceOf(NodeFormData)
|
||||
expect(contentType).toMatch(/^multipart\/form-data/)
|
||||
})
|
||||
|
||||
it('appends &_executionTasks=true to URL when runAsTask=true and no data', async () => {
|
||||
const { executor, postSpy } = makeExecutor()
|
||||
|
||||
await executor.execute('services/common/sendArr', null, {
|
||||
...baseConfig,
|
||||
runAsTask: true
|
||||
})
|
||||
|
||||
const [apiUrl] = postSpy.mock.calls[0]
|
||||
expect(apiUrl).toContain('&_executionTasks=true')
|
||||
})
|
||||
|
||||
it('appends &_executionTasks=true and sends table data when runAsTask=true with one input table', async () => {
|
||||
const { executor, postSpy } = makeExecutor()
|
||||
|
||||
await executor.execute(
|
||||
'services/common/sendArr',
|
||||
{ table1: [{ col1: 'v' }] },
|
||||
{ ...baseConfig, runAsTask: true }
|
||||
)
|
||||
|
||||
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
|
||||
expect(apiUrl).toContain('&_executionTasks=true')
|
||||
expect(body).toBeInstanceOf(NodeFormData)
|
||||
expect(contentType).toMatch(/^multipart\/form-data/)
|
||||
const dump = (body as NodeFormData).getBuffer().toString()
|
||||
expect(dump).toContain('name="sasjs_tables"')
|
||||
expect(dump).toContain('name="sasjs1data"')
|
||||
})
|
||||
|
||||
it('appends &_executionTasks=true to URL when runAsTask=true with multiple input tables', async () => {
|
||||
const { executor, postSpy } = makeExecutor()
|
||||
|
||||
await executor.execute(
|
||||
'services/common/sendArr',
|
||||
{ table1: [{ col1: 'v' }], table2: [{ col2: 'w' }] },
|
||||
{ ...baseConfig, runAsTask: true }
|
||||
)
|
||||
|
||||
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
|
||||
expect(apiUrl).toContain('&_executionTasks=true')
|
||||
expect(body).toBeInstanceOf(NodeFormData)
|
||||
expect(contentType).toMatch(/^multipart\/form-data/)
|
||||
const dump = (body as NodeFormData).getBuffer().toString()
|
||||
expect(dump).toContain('name="sasjs_tables"')
|
||||
expect(dump).toMatch(/table1\s+table2/)
|
||||
})
|
||||
|
||||
it('uploads as file when runAsTask=true and payload has semicolons', async () => {
|
||||
const { executor, postSpy } = makeExecutor()
|
||||
|
||||
await executor.execute(
|
||||
'services/common/sendArr',
|
||||
{ table1: [{ col1: 'has; semicolon' }] },
|
||||
{ ...baseConfig, runAsTask: true }
|
||||
)
|
||||
|
||||
const [apiUrl, body, , contentType] = postSpy.mock.calls[0]
|
||||
expect(apiUrl).toContain('&_executionTasks=true')
|
||||
expect(body).toBeInstanceOf(NodeFormData)
|
||||
expect(contentType).toMatch(/^multipart\/form-data/)
|
||||
const dump = (body as NodeFormData).getBuffer().toString()
|
||||
expect(dump).toContain('filename="table1.csv"')
|
||||
expect(dump).toContain('Content-Type: application/csv')
|
||||
})
|
||||
|
||||
it('does NOT append _executionTasks=true to URL when runAsTask=false', async () => {
|
||||
const { executor, postSpy } = makeExecutor()
|
||||
|
||||
await executor.execute(
|
||||
'services/common/sendArr',
|
||||
{ table1: [{ col1: 'v' }] },
|
||||
{ ...baseConfig, runAsTask: false }
|
||||
)
|
||||
|
||||
const [apiUrl] = postSpy.mock.calls[0]
|
||||
expect(apiUrl).not.toContain('_executionTasks=true')
|
||||
})
|
||||
})
|
||||
@@ -273,9 +273,13 @@ export class RequestClient implements HttpClient {
|
||||
public async patch<T>(
|
||||
url: string,
|
||||
data: any = {},
|
||||
accessToken?: string
|
||||
accessToken?: string,
|
||||
overrideHeaders: { [key: string]: string | number } = {}
|
||||
): Promise<{ result: T; etag: string }> {
|
||||
const headers = this.getHeaders(accessToken, 'application/json')
|
||||
const headers = {
|
||||
...this.getHeaders(accessToken, 'application/json'),
|
||||
...overrideHeaders
|
||||
}
|
||||
|
||||
return this.httpClient
|
||||
.patch<T>(url, data, { headers, withXSRFToken: true })
|
||||
|
||||
@@ -631,7 +631,7 @@ describe('RequestClient - Self Signed Server', () => {
|
||||
getTokenRequestErrorPrefixResponse(err.message, ServerType.SasViya)
|
||||
)
|
||||
|
||||
expect(rejectionErrorMessage).toEqual(expectedError)
|
||||
expect(rejectionErrorMessage).toContain(expectedError)
|
||||
})
|
||||
|
||||
it('should response the POST method using insecure flag', async () => {
|
||||
|
||||
@@ -79,6 +79,14 @@ export class SASjsConfig {
|
||||
* may affect browser performance, especially with debug (logs) enabled.
|
||||
*/
|
||||
requestHistoryLimit?: number = 10
|
||||
/**
|
||||
* Optional setting. When `true`, the request runs as a Viya execution task —
|
||||
* appends `_executionTasks=true` to the request URL. Only applies to the Viya
|
||||
* web jobs path, i.e. when `serverType === SASVIYA` AND
|
||||
* `useComputeApi` is `null`/`undefined`. Has no effect when `useComputeApi`
|
||||
* is explicitly set to `true` or `false`.
|
||||
*/
|
||||
runAsTask?: boolean = false
|
||||
}
|
||||
|
||||
export enum LoginMechanism {
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
export class AuthorizeError extends Error {
|
||||
constructor(public message: string, public confirmUrl: string) {
|
||||
constructor(
|
||||
public message: string,
|
||||
public confirmUrl: string
|
||||
) {
|
||||
super(message)
|
||||
this.name = 'AuthorizeError'
|
||||
Object.setPrototypeOf(this, AuthorizeError.prototype)
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
import { Job } from '../Job'
|
||||
|
||||
export class ComputeJobExecutionError extends Error {
|
||||
constructor(public job: Job, public log: string) {
|
||||
constructor(
|
||||
public job: Job,
|
||||
public log: string
|
||||
) {
|
||||
super('Error: Job execution failed')
|
||||
this.name = 'ComputeJobExecutionError'
|
||||
Object.setPrototypeOf(this, ComputeJobExecutionError.prototype)
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
export class JobStatePollError extends Error {
|
||||
constructor(id: string, public originalError: Error) {
|
||||
constructor(
|
||||
id: string,
|
||||
public originalError: Error
|
||||
) {
|
||||
super(
|
||||
`Error while polling job state for job ${id}: ${
|
||||
originalError.message || originalError
|
||||
|
||||
@@ -110,8 +110,8 @@ export const convertToCSV = (
|
||||
longestValueForField
|
||||
? longestValueForField
|
||||
: firstFoundType === 'chars'
|
||||
? '1'
|
||||
: 'best'
|
||||
? '1'
|
||||
: 'best'
|
||||
}.`
|
||||
)
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@ export * from './parseGeneratedCode'
|
||||
export * from './parseSasViyaLog'
|
||||
export * from './parseSourceCode'
|
||||
export * from './parseViyaDebugResponse'
|
||||
export * from './parseViyaLogDebugResponse'
|
||||
export * from './parseWeboutResponse'
|
||||
export * from './serialize'
|
||||
export * from './splitChunks'
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
import { getValidJson } from './getValidJson'
|
||||
import { parseWeboutResponse } from './parseWeboutResponse'
|
||||
|
||||
/**
|
||||
* When querying a Viya job using the Web approach with _DEBUG=128 (used when
|
||||
* runAsTask is true), the webout JSON is inlined into the response via:
|
||||
* var blob = new Blob([`{...}`], {type: 'application/json'});
|
||||
* On abort/error paths the same shape is used but with text/plain and
|
||||
* weboutBEGIN/END markers around the JSON:
|
||||
* var blob = new Blob([`>>weboutBEGIN<<\n{...}\n>>weboutEND<<\n`], {type: 'text/plain'});
|
||||
* No follow-up request is needed — extract and parse the JSON directly.
|
||||
*/
|
||||
export const parseSasViyaLogDebugResponse = async (response: any) => {
|
||||
// If upstream already parsed the response as JSON (object), pass through.
|
||||
if (typeof response !== 'string') {
|
||||
return response
|
||||
}
|
||||
|
||||
const blobMatch = response.match(
|
||||
/new Blob\(\[`([\s\S]*?)`\],\s*\{type:\s*'(?:application\/json|text\/plain)'\}\)/
|
||||
)
|
||||
if (!blobMatch) {
|
||||
throw new Error('Unable to find webout blob in debug log response.')
|
||||
}
|
||||
|
||||
const blobContent = blobMatch[1]
|
||||
const stripped = blobContent.includes('>>weboutBEGIN<<')
|
||||
? parseWeboutResponse(blobContent)
|
||||
: blobContent
|
||||
|
||||
return getValidJson(stripped)
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
import { parseSasViyaLogDebugResponse } from '../parseViyaLogDebugResponse'
|
||||
|
||||
describe('parseSasViyaLogDebugResponse', () => {
|
||||
it('should extract and parse JSON from inline Blob', async () => {
|
||||
const resultData = { message: 'success' }
|
||||
const response = `<html><body><script>
|
||||
var blob = new Blob([\`${JSON.stringify(resultData)}\`], {type: 'application/json'});
|
||||
</script></body></html>`
|
||||
|
||||
const result = await parseSasViyaLogDebugResponse(response)
|
||||
|
||||
expect(result).toEqual(resultData)
|
||||
})
|
||||
|
||||
it('should extract and parse multiline JSON from inline Blob', async () => {
|
||||
const resultData = {
|
||||
SYSDATE: '13MAY26',
|
||||
SYSCC: '0',
|
||||
saslibs: [{ LIBRARYREF: 'FORMATS' }]
|
||||
}
|
||||
const response = `<script>
|
||||
var blob = new Blob([\`{"SYSDATE" : "13MAY26"
|
||||
,"SYSCC" : "0"
|
||||
,"saslibs": [{"LIBRARYREF":"FORMATS"}]
|
||||
}
|
||||
\`], {type: 'application/json'});
|
||||
</script>`
|
||||
|
||||
const result = await parseSasViyaLogDebugResponse(response)
|
||||
|
||||
expect(result).toEqual(resultData)
|
||||
})
|
||||
|
||||
it('should extract and parse JSON wrapped in weboutBEGIN/END (text/plain blob)', async () => {
|
||||
const resultData = { SYSCC: '1012', SYSERRORTEXT: 'File missing.' }
|
||||
const response = `<script>
|
||||
var blob = new Blob([\`>>weboutBEGIN<<
|
||||
${JSON.stringify(resultData)}
|
||||
>>weboutEND<<
|
||||
\`], {type: 'text/plain'});
|
||||
</script>`
|
||||
|
||||
const result = await parseSasViyaLogDebugResponse(response)
|
||||
|
||||
expect(result).toEqual(resultData)
|
||||
})
|
||||
|
||||
it('should throw an error if blob is not found', async () => {
|
||||
const response = `<html><body>No blob here</body></html>`
|
||||
|
||||
await expect(parseSasViyaLogDebugResponse(response)).rejects.toThrow(
|
||||
'Unable to find webout blob in debug log response.'
|
||||
)
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user