sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2025-12-11 03:34:35 +00:00
Code Issues Projects Releases Wiki Activity

fix(stp): write original file name in sas code for upload

Browse Source
This commit is contained in:
Saad Jutt
2022-03-18 06:57:52 +05:00
parent 02a242fe4b
commit 8822de95df
4 changed files with 522 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/controllers/internal/Execution.ts
View File

@@ -119,7 +119,7 @@ ${preProgramVarStatments}
${program}`
// if no files are uploaded filesNamesMap will be undefined
if (otherArgs && otherArgs.filesNamesMap) {
if (otherArgs?.filesNamesMap) {
const uploadSasCode = await generateFileUploadSasCode(
otherArgs.filesNamesMap,
session.path

2
api/src/controllers/internal/FileUploadController.ts
View File

@@ -1,6 +1,6 @@
import multer from 'multer'
import { uuidv4 } from '@sasjs/utils'
import { getSessionController } from '.'
const multer = require('multer')
export class FileUploadController {
private storage = multer.diskStorage({

6
api/src/utils/upload.ts
View File

@@ -15,7 +15,7 @@ export const makeFilesNamesMap = (files: MulterFile[]) => {
const filesNamesMap: { [key: string]: string } = {}
for (let file of files) {
filesNamesMap[file.filename] = file.fieldname
filesNamesMap[file.filename] = file.originalname
}
return filesNamesMap
@@ -66,7 +66,7 @@ export const generateFileUploadSasCode = async (
uploadSasCode += `\n%let _WEBIN_FILE_COUNT=${fileCount};`
for (let uploadedMap of uploadedFilesMap) {
uploadSasCode += `\n%let _WEBIN_FILENAME${uploadedMap.count}=${uploadedMap.filepath};`
uploadSasCode += `\n%let _WEBIN_FILENAME${uploadedMap.count}=${uploadedMap.filename};`
}
for (let uploadedMap of uploadedFilesMap) {
@@ -74,7 +74,7 @@ export const generateFileUploadSasCode = async (
}
for (let uploadedMap of uploadedFilesMap) {
uploadSasCode += `\n%let _WEBIN_NAME${uploadedMap.count}=${uploadedMap.filename};`
uploadSasCode += `\n%let _WEBIN_NAME${uploadedMap.count}=${uploadedMap.filepath};`
}
if (fileCount > 0) {