From 23db7e7b7df2f22bbf7ce16865f83091624d8047 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Thu, 7 Apr 2022 18:48:22 +0500 Subject: [PATCH 1/5] fix: session death time has to be a valid string number --- api/src/controllers/internal/Session.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/src/controllers/internal/Session.ts b/api/src/controllers/internal/Session.ts index 332ffd3..e26d0c7 100644 --- a/api/src/controllers/internal/Session.ts +++ b/api/src/controllers/internal/Session.ts @@ -12,8 +12,7 @@ import { createFile, fileExists, generateTimestamp, - readFile, - moveFile + readFile } from '@sasjs/utils' const execFilePromise = promisify(execFile) @@ -41,6 +40,7 @@ export class SessionController { const sessionFolder = path.join(getTmpSessionsFolderPath(), sessionId) const creationTimeStamp = sessionId.split('-').pop() as string + // death time of session is 15 mins from creation const deathTimeStamp = ( parseInt(creationTimeStamp) + 15 * 60 * 1000 - @@ -140,7 +140,9 @@ ${autoExecContent}` private scheduleSessionDestroy(session: Session) { setTimeout(async () => { if (session.inUse) { - session.deathTimeStamp = session.deathTimeStamp + 1000 * 10 + // adding 10 more minutes + const newDeathTimeStamp = parseInt(session.deathTimeStamp) + 10 * 1000 + session.deathTimeStamp = newDeathTimeStamp.toString() this.scheduleSessionDestroy(session) } else { From 82633adbc497de9babc7f7faa0982374e4d4b109 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Thu, 7 Apr 2022 18:48:31 +0500 Subject: [PATCH 2/5] chore: removed unused util --- api/src/utils/index.ts | 1 - api/src/utils/sleep.ts | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 api/src/utils/sleep.ts diff --git a/api/src/utils/index.ts b/api/src/utils/index.ts index 59ae5e6..b99c7bc 100644 --- a/api/src/utils/index.ts +++ b/api/src/utils/index.ts @@ -14,7 +14,6 @@ export * from './removeTokensInDB' export * from './saveTokensInDB' export * from './setProcessVariables' export * from './setupFolders' -export * from './sleep' export * from './upload' export * from './validation' export * from './verifyTokenInDB' diff --git a/api/src/utils/sleep.ts b/api/src/utils/sleep.ts deleted file mode 100644 index 61d7522..0000000 --- a/api/src/utils/sleep.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const sleep = async (delay: number) => { - await new Promise((resolve) => setTimeout(resolve, delay)) -} From 61080d4694859306049346d2e3174f27bb6dac16 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Thu, 7 Apr 2022 18:59:31 +0500 Subject: [PATCH 3/5] fix: web component added tooltip for webout in studio --- web/src/containers/Studio/index.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/src/containers/Studio/index.tsx b/web/src/containers/Studio/index.tsx index 27c73db..4a6bafd 100644 --- a/web/src/containers/Studio/index.tsx +++ b/web/src/containers/Studio/index.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react' import axios from 'axios' import Box from '@mui/material/Box' -import { Button, Paper, Stack, Tab } from '@mui/material' +import { Button, Paper, Stack, Tab, Tooltip } from '@mui/material' import { makeStyles } from '@mui/styles' import Editor, { OnMount } from '@monaco-editor/react' import { useLocation } from 'react-router-dom' @@ -102,7 +102,9 @@ const Studio = () => { - + + + From f25760283492140cc1f14e51ed27673ec28baaf3 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Thu, 7 Apr 2022 19:10:45 +0500 Subject: [PATCH 4/5] fix: web component UI fix for studio scrolling --- web/src/containers/Studio/index.tsx | 119 +++++++++++++--------------- 1 file changed, 57 insertions(+), 62 deletions(-) diff --git a/web/src/containers/Studio/index.tsx b/web/src/containers/Studio/index.tsx index 4a6bafd..98db395 100644 --- a/web/src/containers/Studio/index.tsx +++ b/web/src/containers/Studio/index.tsx @@ -86,72 +86,67 @@ const Studio = () => { const classes = useStyles() return ( - <> -
-
-
- - - + + + + + + + + + + + + {/* */} + - - - - - - - - - - {/* */} - { + if (val) setFileContent(val) }} - elevation={3} - > - { - if (val) setFileContent(val) - }} - /> - - - - - - -
-

SAS Log

- 
{log}
-
- - -
- 
{webout}
-
- - - - + /> + + + + + + +
+

SAS Log

+ 
{log}
+
+ + +
+ 
{webout}
+
+ + + ) } From 74ba65f9f330bf8c98c12a9c66bb60773d5a7b77 Mon Sep 17 00:00:00 2001 From: Saad Jutt Date: Thu, 7 Apr 2022 20:18:36 +0500 Subject: [PATCH 5/5] feat(appstream): Upload an app from appStream page --- api/public/plus.png | Bin 0 -> 899 bytes api/src/routes/appStream/appStreamHtml.ts | 33 ++++-------- api/src/routes/appStream/script.ts | 58 ++++++++++++++++++++++ api/src/routes/appStream/style.ts | 22 ++++++++ 4 files changed, 90 insertions(+), 23 deletions(-) create mode 100644 api/public/plus.png create mode 100644 api/src/routes/appStream/script.ts create mode 100644 api/src/routes/appStream/style.ts diff --git a/api/public/plus.png b/api/public/plus.png new file mode 100644 index 0000000000000000000000000000000000000000..940ba91dcd40aeaa865a9c46a599491e9356be82 GIT binary patch literal 899 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm1x)VD1X3*Nj=qiz3>*8o|0J>k`3lJ%LB0$O zRcZ_j4J`}|zkoswFBlj~4Hy_+B``2p&0t^2<1Fxq zEM{O}PXb{^i>jHofr9KMp1!W^&sf;`#Elk*m_z|J1$w$ThE&{oduOkoNT5vH$M$~R z2{}CyUTd##WhI-KgqhrF2v6Kzo_NqSBBFvbs-bh^G(TxGHR+@MF0F^|zPT~uEE8L8 zdfz#b^ZBcsjnw~tcDSLb#yv^J69xUd<#d~Q&gJKFvkx%p|G4$d;O@3l4bECxZ9EaV z)pPQ0C%SxnEw%CTH;d)E+iVYL+HQ-OzxLYAMc2Q1eBLFNotwAF^;%Eq#8&RGwXdVr z_!);Ch+s@+?GZH~mC^Y0k@YvJH#-kqTKQE-J7jD5Yy-XOEt}TIttpzXyY9-q`kB^u z=0xv*s5<%9?%Kru=Qa9OhmwBrNEjyGda&wTjPJKu21yS4-|Fn&e)hwi#M}G$Zt9gE znDqaF`Oa_m>mBQh=JpoN{+TJEA^F<$@V5Tqa}%12X6u^XPkLs%;h@)I{~MdXU#l-@ z(3HRNRMXx|_CvglRm|F--=j93$;~_S_lfTM8CT{Mo^t^^;9LhQT}?Xctf)(gHU zF8@|~@cu11HcptHiBAcX?_fP=h4MhT#0PlJdl&REF~M ia=pyF?Be9af>gcyqV(DCY@~pS7(8A5T-G@yGywn>if?oP literal 0 HcmV?d00001 diff --git a/api/src/routes/appStream/appStreamHtml.ts b/api/src/routes/appStream/appStreamHtml.ts index 0f48b10..1dd9930 100644 --- a/api/src/routes/appStream/appStreamHtml.ts +++ b/api/src/routes/appStream/appStreamHtml.ts @@ -1,27 +1,6 @@ import { AppStreamConfig } from '../../types' - -const style = `` +import { script } from './script' +import { style } from './style' const defaultAppLogo = '/sasjs-logo.svg' @@ -52,6 +31,14 @@ export const appStreamHtml = (appStreamConfig: AppStreamConfig) => ` singleAppStreamHtml(streamServiceName, entry.appLoc, entry.streamLogo) ) .join('')} + + + + Upload New App + + ${script} ` diff --git a/api/src/routes/appStream/script.ts b/api/src/routes/appStream/script.ts new file mode 100644 index 0000000..ce332e2 --- /dev/null +++ b/api/src/routes/appStream/script.ts @@ -0,0 +1,58 @@ +export const script = `` diff --git a/api/src/routes/appStream/style.ts b/api/src/routes/appStream/style.ts new file mode 100644 index 0000000..1c7e0fc --- /dev/null +++ b/api/src/routes/appStream/style.ts @@ -0,0 +1,22 @@ +export const style = ``