mirror of
https://github.com/sasjs/adapter.git
synced 2026-06-09 18:40:22 +00:00
Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 |
@@ -11,8 +11,9 @@ jobs:
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
node-version: [lts/iron]
|
||||
node-version: [22, 24]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
@@ -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/iron]
|
||||
node-version: [22]
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
@@ -14,7 +14,7 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [lts/iron]
|
||||
node-version: [22]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
@@ -12,7 +12,7 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
node-version: [lts/iron]
|
||||
node-version: [22]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
@@ -93,10 +93,11 @@ jobs:
|
||||
run: |
|
||||
sudo apt install jq
|
||||
cd sasjs-tests
|
||||
jq '.dependencies."@sasjs/adapter" |= "latest"' ./package.json > ./package.temp && mv ./package.temp ./package.json
|
||||
npm i
|
||||
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
|
||||
|
||||
@@ -110,8 +111,10 @@ jobs:
|
||||
shell: bash
|
||||
|
||||
- name: Run cypress on sasjs
|
||||
env:
|
||||
TERM: dumb
|
||||
run: |
|
||||
sed -i "s|sasjsTestsUrl: '.*'|sasjsTestsUrl: 'http://localhost:5173'|g" ./cypress.config.js
|
||||
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
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
tasks:
|
||||
- init: npm install && npm run build
|
||||
+1
-1
@@ -9,7 +9,7 @@ module.exports = defineConfig({
|
||||
supportFile: 'cypress/support/index.js'
|
||||
},
|
||||
env: {
|
||||
sasjsTestsUrl: 'http://localhost:5173',
|
||||
sasjsTestsUrl: 'http://localhost:3000',
|
||||
username: '',
|
||||
password: '',
|
||||
screenshotOnRunFailure: false,
|
||||
|
||||
@@ -9,10 +9,12 @@ context('sasjs-tests', function () {
|
||||
})
|
||||
|
||||
beforeEach(() => {
|
||||
cy.reload()
|
||||
cy.visit(sasjsTestsUrl)
|
||||
})
|
||||
|
||||
function loginIfNeeded() {
|
||||
cy.get('login-form, tests-view', { timeout: 30000 }).should('exist')
|
||||
|
||||
cy.get('body').then(($body) => {
|
||||
if ($body.find('login-form').length > 0) {
|
||||
cy.get('login-form')
|
||||
|
||||
Generated
+40
-17
@@ -7,8 +7,8 @@
|
||||
"name": "@sasjs/adapter",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@sasjs/utils": "3.5.6",
|
||||
"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",
|
||||
@@ -34,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",
|
||||
@@ -3527,14 +3527,14 @@
|
||||
"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": {
|
||||
@@ -3556,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",
|
||||
@@ -6119,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",
|
||||
@@ -12303,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"
|
||||
@@ -12397,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",
|
||||
|
||||
+5
-5
@@ -7,9 +7,9 @@
|
||||
"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",
|
||||
"publishInit": "cp -r ./build/* . && rm -rf ./build",
|
||||
"semantic-release": "semantic-release",
|
||||
@@ -60,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",
|
||||
@@ -76,8 +76,8 @@
|
||||
},
|
||||
"main": "index.js",
|
||||
"dependencies": {
|
||||
"@sasjs/utils": "3.5.6",
|
||||
"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",
|
||||
|
||||
@@ -6,13 +6,13 @@ Browser-based integration testing for [@sasjs/adapter](https://github.com/sasjs/
|
||||
|
||||
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
|
||||
|
||||
|
||||
Generated
+54
-1633
File diff suppressed because it is too large
Load Diff
@@ -18,8 +18,5 @@
|
||||
},
|
||||
"overrides": {
|
||||
"vite": "npm:rolldown-vite@7.2.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@sasjs/adapter": "^4.14.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
"sasJsConfig": {
|
||||
"loginMechanism": "Redirected",
|
||||
"serverUrl": "",
|
||||
"appLoc": "/Public/app/adapter-tests/services",
|
||||
"serverType": "SASVIYA",
|
||||
"appLoc": "/Public/app/adapter-tests",
|
||||
"serverType": "SASJS",
|
||||
"debug": false,
|
||||
"contextName": "SAS Job Execution compute context",
|
||||
"useComputeApi": true
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"targets": [
|
||||
{
|
||||
"name": "4gl",
|
||||
"serverUrl": "https://sas9.4gl.io",
|
||||
"serverUrl": "https://sas.4gl.io",
|
||||
"serverType": "SASJS",
|
||||
"httpsAgentOptions": {
|
||||
"allowInsecureRequests": false
|
||||
|
||||
@@ -72,7 +72,7 @@ export class TestCard extends HTMLElement {
|
||||
? `
|
||||
<div class="error">
|
||||
<strong>Error:</strong>
|
||||
<pre>${(error as Error).message || String(error)}</pre>
|
||||
<pre>${formatError(error)}</pre>
|
||||
</div>
|
||||
`
|
||||
: ''
|
||||
@@ -110,4 +110,35 @@ export class TestCard extends HTMLElement {
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
|
||||
@@ -22,6 +22,7 @@ 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'
|
||||
|
||||
async function init() {
|
||||
const appContainer = document.getElementById('app')
|
||||
@@ -98,7 +99,7 @@ function showTests(
|
||||
// basicTests(adapter, configTyped.userName || '', configTyped.password || ''),
|
||||
sendArrTests(adapter, appLoc),
|
||||
sendObjTests(adapter),
|
||||
// specialCaseTests(adapter),
|
||||
specialCaseTests(adapter),
|
||||
sasjsRequestTests(adapter),
|
||||
fileUploadTests(adapter)
|
||||
]
|
||||
|
||||
@@ -77,7 +77,7 @@ export const basicTests = (
|
||||
await adapter.logOut()
|
||||
|
||||
return await adapter.request(
|
||||
'common/sendArr',
|
||||
'services/common/sendArr',
|
||||
stringData,
|
||||
undefined,
|
||||
async () => {
|
||||
@@ -97,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
|
||||
@@ -112,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
|
||||
|
||||
@@ -11,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
|
||||
@@ -25,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
|
||||
@@ -36,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']
|
||||
@@ -49,7 +56,7 @@ export const computeTests = (adapter: SASjs, appLoc: string): TestSuite => ({
|
||||
test: () => {
|
||||
const data: any = { table1: [{ col1: 'first col value' }] }
|
||||
return adapter.startComputeJob(
|
||||
`${appLoc}/common/sendArr`,
|
||||
`${appLoc}/services/common/sendArr`,
|
||||
data,
|
||||
{},
|
||||
undefined,
|
||||
|
||||
@@ -22,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(
|
||||
|
||||
@@ -53,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
|
||||
@@ -63,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
|
||||
@@ -74,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()
|
||||
@@ -87,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
|
||||
@@ -97,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
|
||||
@@ -107,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 (
|
||||
@@ -122,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
|
||||
@@ -148,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
|
||||
@@ -184,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) =>
|
||||
@@ -198,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) =>
|
||||
@@ -212,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) =>
|
||||
@@ -227,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) =>
|
||||
@@ -241,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) =>
|
||||
@@ -251,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
|
||||
@@ -262,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()
|
||||
@@ -275,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) => {
|
||||
@@ -286,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
|
||||
@@ -297,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()
|
||||
@@ -308,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 (
|
||||
@@ -323,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
|
||||
@@ -349,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
|
||||
|
||||
@@ -11,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()
|
||||
@@ -28,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 =
|
||||
|
||||
@@ -111,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 (
|
||||
@@ -133,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,
|
||||
@@ -169,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()
|
||||
@@ -185,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()
|
||||
@@ -202,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()
|
||||
@@ -222,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()
|
||||
@@ -237,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()
|
||||
@@ -253,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 (
|
||||
@@ -272,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 (
|
||||
@@ -300,7 +300,7 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
|
||||
}
|
||||
|
||||
return await adapter.request(
|
||||
'common/sendArr',
|
||||
'services/common/sendArr',
|
||||
stringData,
|
||||
config,
|
||||
undefined,
|
||||
@@ -319,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
|
||||
@@ -365,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
|
||||
)
|
||||
},
|
||||
@@ -413,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
|
||||
)
|
||||
},
|
||||
@@ -469,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 }
|
||||
)
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
import { defineConfig } from 'vite'
|
||||
export default defineConfig({
|
||||
server: {
|
||||
port: 3000
|
||||
},
|
||||
build: {
|
||||
assetsInlineLimit: 0,
|
||||
assetsDir: ''
|
||||
|
||||
+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
|
||||
)
|
||||
|
||||
@@ -1026,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(() => {
|
||||
|
||||
@@ -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[] = []
|
||||
|
||||
|
||||
@@ -97,12 +97,10 @@ 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)}`
|
||||
: ''
|
||||
}
|
||||
|
||||
let requestParams = {
|
||||
|
||||
@@ -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 () => {
|
||||
|
||||
@@ -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'
|
||||
}.`
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user