sasjs/adapter
1
0
Fork 0
mirror of https://github.com/sasjs/adapter.git synced 2025-12-11 01:14:36 +00:00
Code Issues Projects Releases Wiki Activity

chore: merge

Browse Source
This commit is contained in:
Mihajlo Medjedovic
2021-06-08 17:01:41 +02:00
parent 89ff323206 e36cd785e8
commit 88f70a7966
3 changed files with 971 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1351
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

15
src/SASViyaApiClient.ts
View File

@@ -28,7 +28,7 @@ import { timestampToYYYYMMDDHHMMSS } from '@sasjs/utils/time'
import { Logger, LogLevel } from '@sasjs/utils/logger'
import { isAuthorizeFormRequired } from './auth/isAuthorizeFormRequired'
import { RequestClient } from './request/RequestClient'
import { SasAuthResponse } from '@sasjs/utils/types'
import { SasAuthResponse, MacroVar } from '@sasjs/utils/types'
import { prefixMessage } from '@sasjs/utils/error'
/**
@@ -271,6 +271,7 @@ export class SASViyaApiClient {
* @param waitForResult - when set to true, function will return the session
* @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
* @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
* @param variables - an object that represents macro variables.
*/
public async executeScript(
jobPath: string,
@@ -282,7 +283,8 @@ export class SASViyaApiClient {
expectWebout = false,
waitForResult = true,
pollOptions?: PollOptions,
printPid = false
printPid = false,
variables?: MacroVar
): Promise<any> {
try {
const headers: any = {
@@ -356,6 +358,8 @@ export class SASViyaApiClient {
: jobPath
}
if (variables) jobVariables = { ...jobVariables, ...variables }
let files: any[] = []
if (data) {
@@ -812,6 +816,7 @@ export class SASViyaApiClient {
* @param expectWebout - a boolean indicating whether to expect a _webout response.
* @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
* @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
* @param variables - an object that represents macro variables.
*/
public async executeComputeJob(
sasJob: string,
@@ -822,7 +827,8 @@ export class SASViyaApiClient {
waitForResult = true,
expectWebout = false,
pollOptions?: PollOptions,
printPid = false
printPid = false,
variables?: MacroVar
) {
if (isRelativePath(sasJob) && !this.rootFolderName) {
throw new Error(
@@ -901,7 +907,8 @@ export class SASViyaApiClient {
expectWebout,
waitForResult,
pollOptions,
printPid
printPid,
variables
)
}

9
src/SASjs.ts
View File

@@ -4,7 +4,7 @@ import { SASViyaApiClient } from './SASViyaApiClient'
import { SAS9ApiClient } from './SAS9ApiClient'
import { FileUploader } from './FileUploader'
import { AuthManager } from './auth'
import { ServerType } from '@sasjs/utils/types'
import { ServerType, MacroVar } from '@sasjs/utils/types'
import { RequestClient } from './request/RequestClient'
import {
JobExecutor,
@@ -677,6 +677,7 @@ export default class SASjs {
* @param waitForResult - a boolean that indicates whether the function needs to wait for execution to complete.
* @param pollOptions - an object that represents poll interval(milliseconds) and maximum amount of attempts. Object example: { MAX_POLL_COUNT: 24 * 60 * 60, POLL_INTERVAL: 1000 }.
* @param printPid - a boolean that indicates whether the function should print (PID) of the started job.
* @param variables - an object that represents macro variables.
*/
public async startComputeJob(
sasJob: string,
@@ -685,7 +686,8 @@ export default class SASjs {
accessToken?: string,
waitForResult?: boolean,
pollOptions?: PollOptions,
printPid = false
printPid = false,
variables?: MacroVar
) {
config = {
...this.sasjsConfig,
@@ -708,7 +710,8 @@ export default class SASjs {
!!waitForResult,
false,
pollOptions,
printPid
printPid,
variables
)
}