diff --git a/src/controllers/Execution.ts b/src/controllers/Execution.ts index 5eb4383..24827b7 100644 --- a/src/controllers/Execution.ts +++ b/src/controllers/Execution.ts @@ -41,7 +41,7 @@ export class ExecutionController { let webout = path.join(session.path, 'webout.txt') await createFile(webout, '') - + program = ` %let sasjsprocessmode=Stored Program; filename _webout "${webout}"; @@ -89,7 +89,7 @@ ${program}` (key: string) => key.toLowerCase() === '_debug' ) - if (debug && vars[debug] >= 131 || stderr) { + if ((debug && vars[debug] >= 131) || stderr) { webout = ` ${webout}
@@ -98,7 +98,7 @@ ${webout}
` } - + session.inUse = false sessionController.deleteSession(session) diff --git a/src/routes/index.ts b/src/routes/index.ts index 0f921bf..1ed3d4b 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -1,9 +1,19 @@ import express from 'express' -import { createFileTree, getSessionController, getTreeExample } from '../controllers' +import { + createFileTree, + getSessionController, + getTreeExample +} from '../controllers' import { ExecutionResult, isRequestQuery, isFileTree } from '../types' import path from 'path' -import { addExtensionIfNotFound, getTmpFilesFolderPath, getTmpFolderPath, makeFilesNamesMap } from '../utils' +import { + addExtensionIfNotFound, + getTmpFilesFolderPath, + getTmpFolderPath, + makeFilesNamesMap +} from '../utils' import { ExecutionController, FileUploadController } from '../controllers' +import { uuidv4 } from '@sasjs/utils' const router = express.Router() @@ -51,7 +61,7 @@ router.get('/SASjsExecutor/do', async (req, res) => { let sasCodePath = path .join(getTmpFilesFolderPath(), req.query._program) .replace(new RegExp('/', 'g'), path.sep) - + // If no extension provided, add .sas extension sasCodePath += !sasCodePath.includes('.') ? '.sas' : '' diff --git a/src/utils/index.ts b/src/utils/index.ts index 61fe8f3..2f4a3cb 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,3 +1,3 @@ export * from './file' export * from './sleep' -export * from './upload' \ No newline at end of file +export * from './upload' diff --git a/src/utils/upload.ts b/src/utils/upload.ts index b033494..2c685f4 100644 --- a/src/utils/upload.ts +++ b/src/utils/upload.ts @@ -14,11 +14,11 @@ export const makeFilesNamesMap = (files: MulterFile[]) => { const filesNamesMap: {[key: string]: string} = {} - for (let file of files) { - filesNamesMap[file.filename] = file.fieldname - } + for (let file of files) { + filesNamesMap[file.filename] = file.fieldname + } - return filesNamesMap + return filesNamesMap } /** @@ -27,7 +27,7 @@ export const makeFilesNamesMap = (files: MulterFile[]) => { * @param sasUploadFolder name of the folder that is created for the purpose of files in concurrent request * @returns generated sas code */ - export const generateFileUploadSasCode = ( +export const generateFileUploadSasCode = ( filesNamesMap: any, sasSessionFolder: string ): string => { @@ -84,4 +84,4 @@ export const makeFilesNamesMap = (files: MulterFile[]) => { uploadSasCode += `\n` return uploadSasCode -} \ No newline at end of file +}