sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-08 07:00:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into homepage-sasjs-executor

Browse Source 
Conflicts:
	api/src/app.ts
	api/src/routes/index.ts
	api/src/routes/spec/routes.spec.ts
This commit is contained in:
Sabir Hassan
2021-11-01 13:12:52 +00:00
parent bdbf7573be f1e464d4a4
commit 0c6ccddafd
11 changed files with 336 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/controllers/Execution.ts
View File

@@ -16,7 +16,8 @@ export class ExecutionController {
autoExec?: string,
session?: Session,
vars?: any,
otherArgs?: any
otherArgs?: any,
returnJson?: boolean
) {
if (program) {
if (!(await fileExists(program))) {
@@ -91,6 +92,7 @@ ${program}`
(key: string) => key.toLowerCase() === '_debug'
)
let jsonResult
if ((debug && vars[debug] >= 131) || stderr) {
webout = `<html><body>
${webout}
@@ -99,13 +101,15 @@ ${webout}
<pre>${log}</pre>
</div>
</body></html>`
} else if (returnJson) {
jsonResult = { result: webout, log: log }
}
session.inUse = false
sessionController.deleteSession(session)
return Promise.resolve(webout)
return Promise.resolve(jsonResult || webout)
}
buildDirectorytree() {

4
api/src/controllers/deploy.ts
View File

@@ -14,7 +14,9 @@ export const createFileTree = async (
)
await asyncForEach(members, async (member: FolderMember | ServiceMember) => {
const name = member.name
let name = member.name
if (member.type === 'service') name += '.sas'
if (member.type === MemberType.folder) {
await createFolder(path.join(destinationPath, name)).catch((err) =>