Merge pull request #687 from sasjs/issue-686

fix: file upload on SASJS SERVER

package-lock.json

@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
-        "@sasjs/utils": "2.40.0",
+        "@sasjs/utils": "2.42.0",
         "axios": "0.26.0",
         "axios-cookiejar-support": "1.0.1",
         "form-data": "4.0.0",
@@ -1142,9 +1142,9 @@
       }
     },
     "node_modules/@sasjs/utils": {
-      "version": "2.40.0",
+      "version": "2.42.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.40.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.42.0.tgz",
-      "integrity": "sha512-U0y/eqRlvfkMHmKDlr1xmeN+Rask7TnJPuRpOz71P8QpGYTw1M9AyZvzRSk503p4KCJb8ysdcqXyGVLfhuoM+A==",
+      "integrity": "sha512-Y69l89PYNF/h9xvVH72om/39xA+cY80bhiVLzp/fJb3BlvzCf4RNswBBanUOv2I5JNa7gPpJuE7mEiXOlhD3eg==",
       "hasInstallScript": true,
       "dependencies": {
         "@types/fs-extra": "9.0.13",
@@ -13870,9 +13870,9 @@
       }
     },
     "@sasjs/utils": {
-      "version": "2.40.0",
+      "version": "2.42.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.40.0.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.42.0.tgz",
-      "integrity": "sha512-U0y/eqRlvfkMHmKDlr1xmeN+Rask7TnJPuRpOz71P8QpGYTw1M9AyZvzRSk503p4KCJb8ysdcqXyGVLfhuoM+A==",
+      "integrity": "sha512-Y69l89PYNF/h9xvVH72om/39xA+cY80bhiVLzp/fJb3BlvzCf4RNswBBanUOv2I5JNa7gPpJuE7mEiXOlhD3eg==",
       "requires": {
         "@types/fs-extra": "9.0.13",
         "@types/prompts": "2.0.13",

package.json

@@ -72,7 +72,7 @@
   },
   "main": "index.js",
   "dependencies": {
-    "@sasjs/utils": "2.40.0",
+    "@sasjs/utils": "2.42.0",
     "axios": "0.26.0",
     "axios-cookiejar-support": "1.0.1",
     "form-data": "4.0.0",

sasjs-tests/README.md

@@ -84,6 +84,15 @@ parmcards4;
   %webout(CLOSE)
 ;;;;
 %mm_createwebservice(path=/Public/app/common,name=sendArr)
+parmcards4;
+  data work.macvars;
+    set sashelp.vmacro;
+  run;
+  %webout(OPEN)
+  %webout(OBJ,macvars) 
+  %webout(CLOSE)
+;;;;
+%mm_createwebservice(path=/Public/app/common,name=sendMacVars)
 parmcards4;
 let he who hath understanding, reckon the number of the beast
 ;;;;
@@ -118,7 +127,6 @@ parmcards4;
   %webout(CLOSE)
 ;;;;
 %mp_createwebservice(path=/Public/app/common,name=sendObj)
-filename ft15f001 temp;
 parmcards4;
   %webout(FETCH)
   %webout(OPEN)
@@ -132,7 +140,15 @@ parmcards4;
   %webout(CLOSE)
 ;;;;
 %mp_createwebservice(path=/Public/app/common,name=sendArr)
-filename ft15f001 temp;
+parmcards4;
+  data work.macvars;
+    set sashelp.vmacro;
+  run;
+  %webout(OPEN)
+  %webout(OBJ,macvars) 
+  %webout(CLOSE)
+;;;;
+%mp_createwebservice(path=/Public/app/common,name=sendMacVars)
 parmcards4;
 If you can keep your head when all about you
     Are losing theirs and blaming it on you,

sasjs-tests/package-lock.json

@@ -2388,11 +2388,11 @@
     "node_modules/@sasjs/adapter": {
       "version": "5.0.0",
       "resolved": "file:../build/sasjs-adapter-5.0.0.tgz",
-      "integrity": "sha512-lbDWueAEnfNlu4OGrc9hBEzT0aoLfAy7eLd2nLHArrF6zukcSGBNhUgOqxIhlz4WeBdf1gt3nk1G7p5X1mrWYQ==",
+      "integrity": "sha512-5qtEs9yFuZ4v2UrFGNHeCIr/yZTp7D9He+e+N333qW9mdLJJ8fzRifuur/rFE6bNPqC2bdCjicYkO/yrHR4LQw==",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
-        "@sasjs/utils": "2.36.1",
+        "@sasjs/utils": "2.40.1",
         "axios": "0.26.0",
         "axios-cookiejar-support": "1.0.1",
         "form-data": "4.0.0",
@@ -2422,9 +2422,9 @@
       }
     },
     "node_modules/@sasjs/utils": {
-      "version": "2.36.1",
+      "version": "2.40.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.36.1.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.40.1.tgz",
-      "integrity": "sha512-JkGUpLOODsvkeU+S25jb9k2WnvzyD2w6cEk7YyQ/byuqKL8xawH91PPWegrVcJlDY8WmqKE4CPcA3d1mM3B3LA==",
+      "integrity": "sha512-wWYElDH71bSZTdZ5V38743vAnw2EPDhzH7+1s7zxINHpaQWK/qrDldI0vgVFLeGpxVU0D7WPZ/ltG6MoE2obeg==",
       "hasInstallScript": true,
       "dependencies": {
         "@types/fs-extra": "9.0.13",
@@ -20998,9 +20998,9 @@
     },
     "@sasjs/adapter": {
       "version": "file:../build/sasjs-adapter-5.0.0.tgz",
-      "integrity": "sha512-lbDWueAEnfNlu4OGrc9hBEzT0aoLfAy7eLd2nLHArrF6zukcSGBNhUgOqxIhlz4WeBdf1gt3nk1G7p5X1mrWYQ==",
+      "integrity": "sha512-5qtEs9yFuZ4v2UrFGNHeCIr/yZTp7D9He+e+N333qW9mdLJJ8fzRifuur/rFE6bNPqC2bdCjicYkO/yrHR4LQw==",
       "requires": {
-        "@sasjs/utils": "2.36.1",
+        "@sasjs/utils": "2.40.1",
         "axios": "0.26.0",
         "axios-cookiejar-support": "1.0.1",
         "form-data": "4.0.0",
@@ -21022,9 +21022,9 @@
       }
     },
     "@sasjs/utils": {
-      "version": "2.36.1",
+      "version": "2.40.1",
-      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.36.1.tgz",
+      "resolved": "https://registry.npmjs.org/@sasjs/utils/-/utils-2.40.1.tgz",
-      "integrity": "sha512-JkGUpLOODsvkeU+S25jb9k2WnvzyD2w6cEk7YyQ/byuqKL8xawH91PPWegrVcJlDY8WmqKE4CPcA3d1mM3B3LA==",
+      "integrity": "sha512-wWYElDH71bSZTdZ5V38743vAnw2EPDhzH7+1s7zxINHpaQWK/qrDldI0vgVFLeGpxVU0D7WPZ/ltG6MoE2obeg==",
       "requires": {
         "@types/fs-extra": "9.0.13",
         "@types/prompts": "2.0.13",

sasjs-tests/src/App.tsx

@@ -6,6 +6,7 @@ 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)
@@ -18,7 +19,8 @@ const App = (): ReactElement<{}> => {
         sendArrTests(adapter),
         sendObjTests(adapter),
         specialCaseTests(adapter),
-        sasjsRequestTests(adapter)
+        sasjsRequestTests(adapter),
+        fileUploadTests(adapter)
       ]
 
       if (adapter.getSasjsConfig().serverType === 'SASVIYA') {

sasjs-tests/src/testSuites/FileUpload.ts

@@ -0,0 +1,35 @@
+import SASjs from '@sasjs/adapter'
+import { TestSuite } from '@sasjs/test-framework'
+
+export const fileUploadTests = (adapter: SASjs): TestSuite => ({
+  name: 'File Upload Tests',
+  tests: [
+    {
+      title: 'Upload File',
+      description: 'Should upload the file to VIYA',
+      test: async () => {
+        let blob: any = new Blob(['test'], { type: 'text/html' })
+        blob['lastModifiedDate'] = ''
+        blob['name'] = 'macvars_testfile'
+        let file = blob
+
+        const filesToUpload = [
+          {
+            file: file,
+            fileName: file.name
+          }
+        ]
+
+        return adapter.uploadFile('common/sendMacVars', filesToUpload, null)
+      },
+      assertion: (response: any) =>
+        (response.macvars as any[]).findIndex(
+          (el: any) => el.NAME === '_WEBIN_FILE_COUNT' && el.VALUE === '1'
+        ) > -1 &&
+        (response.macvars as any[]).findIndex(
+          (el: any) =>
+            el.NAME === '_WEBIN_FILENAME' && el.VALUE === 'macvars_testfile'
+        ) > -1
+    }
+  ]
+})

sasjs-tests/src/testSuites/RequestData.ts

@@ -218,6 +218,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
         const invalidData: any = {
           xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx: [{ col1: 42 }]
         }
+
         return adapter.request('common/sendObj', invalidData).catch((e) => e)
       },
       assertion: (error: any) =>

src/SASjs.ts

@@ -5,8 +5,7 @@ import {
   EditContextInput,
   PollOptions,
   LoginMechanism,
-  ExecutionQuery,
+  ExecutionQuery
-  FileTree
 } from './types'
 import { SASViyaApiClient } from './SASViyaApiClient'
 import { SAS9ApiClient } from './SAS9ApiClient'
@@ -18,7 +17,7 @@ import {
   AuthConfig,
   ExtraResponseAttributes,
   SasAuthResponse,
-  StreamConfig
+  ServicePackSASjs
 } from '@sasjs/utils/types'
 import { RequestClient } from './request/RequestClient'
 import { SasjsRequestClient } from './request/SasjsRequestClient'
@@ -889,27 +888,21 @@ export default class SASjs {
 
   /**
    * Creates the folders and services at the given location `appLoc` on the given server `serverUrl`.
-   * @param members - the JSON specifying the folders and services to be created.
+   * @param dataJson - the JSON specifying the folders and files to be created, can also includes
-   * @param appLoc - the base folder in which to create the new folders and
+   * appLoc, streamServiceName, streamWebFolder, streamLogo
-   * services.  If not provided, is taken from SASjsConfig.
+   * @param appLoc - (optional) the base folder in which to create the new folders and
-   * @param streamConfig - optional configuration object of StreamConfig for deploying streaming app.
+   * services.  If not provided, is taken from SASjsConfig. Precedence will be of appLoc present in dataJson.
-   * @param authConfig - a valid client, secret, refresh and access tokens that are authorised to execute compute jobs.
+   * @param authConfig - (optional) a valid client, secret, refresh and access tokens that are authorised to execute compute jobs.
    */
   public async deployToSASjs(
-    members: FileTree,
+    dataJson: ServicePackSASjs,
     appLoc?: string,
-    streamConfig?: StreamConfig,
     authConfig?: AuthConfig
   ) {
     if (!appLoc) {
       appLoc = this.sasjsConfig.appLoc
     }
-    return await this.sasJSApiClient?.deploy(
+    return await this.sasJSApiClient?.deploy(dataJson, appLoc, authConfig)
-      members,
-      appLoc,
-      streamConfig,
-      authConfig
-    )
   }
 
   public async executeJobSASjs(query: ExecutionQuery) {
@@ -1102,13 +1095,8 @@ export default class SASjs {
     }
 
     if (this.sasjsConfig.serverType === ServerType.Sasjs) {
-      if (this.sasJSApiClient) {
+      if (!this.sasJSApiClient) {
-        this.sasJSApiClient.setConfig(this.sasjsConfig.serverUrl)
+        this.sasJSApiClient = new SASjsApiClient(this.requestClient)
-      } else {
-        this.sasJSApiClient = new SASjsApiClient(
-          this.sasjsConfig.serverUrl,
-          this.requestClient
-        )
       }
     }
 

src/SASjsApiClient.ts

@@ -1,5 +1,5 @@
-import { AuthConfig, ServerType, StreamConfig } from '@sasjs/utils/types'
+import { AuthConfig, ServerType, ServicePackSASjs } from '@sasjs/utils/types'
-import { FileTree, ExecutionQuery } from './types'
+import { ExecutionQuery } from './types'
 import { RequestClient } from './request/RequestClient'
 import { getAccessTokenForSasjs } from './auth/getAccessTokenForSasjs'
 import { refreshTokensForSasjs } from './auth/refreshTokensForSasjs'
@@ -8,19 +8,11 @@ import { parseWeboutResponse } from './utils'
 import { getTokens } from './auth/getTokens'
 
 export class SASjsApiClient {
-  constructor(
+  constructor(private requestClient: RequestClient) {}
-    private serverUrl: string,
-    private requestClient: RequestClient
-  ) {}
-
-  public setConfig(serverUrl: string) {
-    if (serverUrl) this.serverUrl = serverUrl
-  }
 
   public async deploy(
-    members: FileTree,
+    dataJson: ServicePackSASjs,
     appLoc: string,
-    streamConfig?: StreamConfig,
     authConfig?: AuthConfig
   ) {
     let access_token = (authConfig || {}).access_token
@@ -31,6 +23,9 @@ export class SASjsApiClient {
         ServerType.Sasjs
       ))
     }
+
+    dataJson.appLoc = dataJson.appLoc || appLoc
+
     const { result } = await this.requestClient.post<{
       status: string
       message: string
@@ -38,13 +33,7 @@ export class SASjsApiClient {
       example?: {}
     }>(
       'SASjsApi/drive/deploy',
-      {
+      dataJson,
-        fileTree: members,
-        appLoc: appLoc,
-        streamServiceName: streamConfig?.streamServiceName,
-        streamWebFolder: streamConfig?.streamWebFolder,
-        streamLogo: streamConfig?.streamLogo
-      },
       access_token,
       undefined,
       {},

src/file/generateFileUploadForm.ts

@@ -26,11 +26,18 @@ export const generateFileUploadForm = (
       )
     }
 
-    const file = new Blob([csv], {
+    if (typeof FormData === 'undefined' && formData instanceof NodeFormData) {
-      type: 'application/csv'
+      formData.append(name, csv, {
-    })
+        filename: `${name}.csv`,
+        contentType: 'application/csv'
+      })
+    } else {
+      const file = new Blob([csv], {
+        type: 'application/csv'
+      })
 
-    formData.append(name, file, `${name}.csv`)
+      formData.append(name, file, `${name}.csv`)
+    }
   }
 
   return formData

src/job-execution/FileUploader.ts

@@ -99,7 +99,20 @@ export class FileUploader extends BaseJobExecutor {
                     ? parseWeboutResponse(res.result, uploadUrl)
                     : res.result
                 break
+              case ServerType.Sasjs:
+                if (typeof res.result._webout === 'object') {
+                  jsonResponse = res.result._webout
+                } else {
+                  const webout = parseWeboutResponse(
+                    res.result._webout,
+                    uploadUrl
+                  )
+                  jsonResponse = getValidJson(webout)
+                }
+                break
             }
+          } else if (this.serverType === ServerType.Sasjs) {
+            jsonResponse = getValidJson(res.result._webout)
           } else {
             jsonResponse =
               typeof res.result === 'string'

src/request/RequestClient.ts

@@ -131,6 +131,26 @@ export class RequestClient implements HttpClient {
         } else {
           sasWork = response.log
         }
+      } else if (response?.result?.log) {
+        //In this scenario we know we got the response from SASJS server
+        //Log is array of `{ line: '' }` so we need to convert it back to text
+        //To be able to parse it with current functions.
+        let log: string = ''
+
+        if (typeof log !== 'string') {
+          log = response.result.log
+            .map((logLine: any) => logLine.line)
+            .join('\n')
+        }
+
+        sourceCode = parseSourceCode(log)
+        generatedCode = parseGeneratedCode(log)
+
+        if (response?.result?._webout) {
+          sasWork = response.result._webout.WORK
+        } else {
+          sasWork = log
+        }
       } else if (response?.result) {
         sourceCode = parseSourceCode(response.result)
         generatedCode = parseGeneratedCode(response.result)

src/types/FileTree.ts

@@ -1,47 +0,0 @@
-export interface FileTree {
-  members: [FolderMember, ServiceMember]
-}
-
-export enum MemberType {
-  folder = 'folder',
-  service = 'service'
-}
-
-export interface FolderMember {
-  name: string
-  type: MemberType.folder
-  members: [FolderMember, ServiceMember]
-}
-
-export interface ServiceMember {
-  name: string
-  type: MemberType.service
-  code: string
-}
-
-export const isFileTree = (arg: any): arg is FileTree =>
-  arg &&
-  arg.members &&
-  Array.isArray(arg.members) &&
-  arg.members.filter(
-    (member: FolderMember | ServiceMember) =>
-      !isFolderMember(member) && !isServiceMember(member)
-  ).length === 0
-
-const isFolderMember = (arg: any): arg is FolderMember =>
-  arg &&
-  typeof arg.name === 'string' &&
-  arg.type === MemberType.folder &&
-  arg.members &&
-  Array.isArray(arg.members) &&
-  arg.members.filter(
-    (member: FolderMember | ServiceMember) =>
-      !isFolderMember(member) && !isServiceMember(member)
-  ).length === 0
-
-const isServiceMember = (arg: any): arg is ServiceMember =>
-  arg &&
-  typeof arg.name === 'string' &&
-  arg.type === MemberType.service &&
-  arg.code &&
-  typeof arg.code === 'string'

src/types/index.ts

@@ -12,5 +12,4 @@ export * from './Session'
 export * from './UploadFile'
 export * from './PollOptions'
 export * from './WriteStream'
-export * from './FileTree'
 export * from './ExecuteScript'

src/utils/parseViyaDebugResponse.ts

@@ -16,10 +16,15 @@ export const parseSasViyaDebugResponse = async (
   requestClient: RequestClient,
   serverUrl: string
 ) => {
+  // On viya 3.5, iframe is like <iframe style="width: 99%; height: 500px" src="..."></iframe>
+  // On viya 4, iframe is like <iframe style="width: 99%; height: 500px; background-color:Canvas;" src=...></iframe>
+
   const iframeStart = response.split(
-    '<iframe style="width: 99%; height: 500px" src="'
+    /<iframe style="width: 99%; height: 500px" src="|<iframe style="width: 99%; height: 500px; background-color:Canvas;" src=/
   )[1]
-  const jsonUrl = iframeStart ? iframeStart.split('"></iframe>')[0] : null
+  const jsonUrl = iframeStart
+    ? iframeStart.split(/"><\/iframe>|><\/iframe>/)[0]
+    : null
   if (!jsonUrl) {
     throw new Error('Unable to find webout file URL.')
   }