1
0
mirror of https://github.com/sasjs/server.git synced 2026-01-15 09:50:06 +00:00

fix: debug not passed

This commit is contained in:
Mihajlo Medjedovic
2021-10-18 10:42:21 +00:00
parent 38ab27c1ed
commit d9555e151b
4 changed files with 9 additions and 8 deletions

View File

@@ -41,7 +41,7 @@ export class ExecutionController {
let webout = path.join(session.path, 'webout.txt') let webout = path.join(session.path, 'webout.txt')
await createFile(webout, '') await createFile(webout, '')
program = ` program = `
%let sasjsprocessmode=Stored Program; %let sasjsprocessmode=Stored Program;
filename _webout "${webout}"; filename _webout "${webout}";
@@ -49,7 +49,7 @@ ${program}`
// if no files are uploaded filesNamesMap will be undefined // if no files are uploaded filesNamesMap will be undefined
if (otherArgs && otherArgs.filesNamesMap) { if (otherArgs && otherArgs.filesNamesMap) {
const uploadSasCode = generateFileUploadSasCode( const uploadSasCode = await generateFileUploadSasCode(
otherArgs.filesNamesMap, otherArgs.filesNamesMap,
session.path session.path
) )

View File

@@ -16,7 +16,7 @@ export class FileUploadController {
private upload = multer({ storage: this.storage }) private upload = multer({ storage: this.storage })
//It will intercept request and generate uniqe uuid to be used as a subfolder name //It will intercept request and generate unique uuid to be used as a subfolder name
//that will store the files uploaded //that will store the files uploaded
public preuploadMiddleware = async (req: any, res: any, next: any) => { public preuploadMiddleware = async (req: any, res: any, next: any) => {
let session let session

View File

@@ -103,13 +103,13 @@ router.post(
if (req.files && req.files.length > 0) { if (req.files && req.files.length > 0) {
filesNamesMap = makeFilesNamesMap(req.files) filesNamesMap = makeFilesNamesMap(req.files)
} }
await new ExecutionController() await new ExecutionController()
.execute( .execute(
sasCodePath, sasCodePath,
undefined, undefined,
req.sasSession, req.sasSession,
{ ...req.query }, { ...req.query, ...req.body },
{ filesNamesMap: filesNamesMap } { filesNamesMap: filesNamesMap }
) )
.then((result: {}) => { .then((result: {}) => {

View File

@@ -27,10 +27,10 @@ export const makeFilesNamesMap = (files: MulterFile[]) => {
* @param sasUploadFolder name of the folder that is created for the purpose of files in concurrent request * @param sasUploadFolder name of the folder that is created for the purpose of files in concurrent request
* @returns generated sas code * @returns generated sas code
*/ */
export const generateFileUploadSasCode = ( export const generateFileUploadSasCode = async (
filesNamesMap: any, filesNamesMap: any,
sasSessionFolder: string sasSessionFolder: string
): string => { ): Promise<string> => {
let uploadSasCode = '' let uploadSasCode = ''
let fileCount = 0 let fileCount = 0
let uploadedFilesMap: { let uploadedFilesMap: {
@@ -40,7 +40,8 @@ export const generateFileUploadSasCode = (
count: number count: number
}[] = [] }[] = []
fs.readdirSync(sasSessionFolder).forEach((fileName) => { const sasSessionFolderList: string[] = await listFilesInFolder(sasSessionFolder)
sasSessionFolderList.forEach((fileName) => {
let fileCountString = fileCount < 100 ? '0' + fileCount : fileCount let fileCountString = fileCount < 100 ? '0' + fileCount : fileCount
fileCountString = fileCount < 10 ? '00' + fileCount : fileCount fileCountString = fileCount < 10 ? '00' + fileCount : fileCount