Merge pull request #105 from sasjs/deploy-app-with-current-names-also

Deploy app with current names also

api/src/routes/appStream/appStreamHtml.ts

@@ -14,12 +14,12 @@ const style = `<style>
   width: 150px;
   margin: 10px;
   overflow: hidden;
-  border-radius: 10px 10px 0 0;
   text-align: center;
 }
 .app-container .app img{
   width: 100%;
   margin-bottom: 10px;
+  border-radius: 10px;
 }
 </style>`
 
@@ -31,7 +31,10 @@ const singleAppStreamHtml = (
   logo?: string
 ) =>
   ` <a class="app" href="${streamServiceName}" title="${appLoc}">
-      <img src="${logo ? streamServiceName + '/' + logo : defaultAppLogo}" />
+      <img
+        src="${logo ? streamServiceName + '/' + logo : defaultAppLogo}"
+        onerror="this.src = '${defaultAppLogo}';"
+      />
       ${streamServiceName}
     </a>`
 

api/src/routes/appStream/index.ts

@@ -40,17 +40,6 @@ export const publishAppStream = async (
 
     if (!streamServiceName) {
       streamServiceName = `AppStreamName${appCount + 1}`
-    } else {
-      const alreadyDeployed = process.appStreamConfig[streamServiceName]
-      if (alreadyDeployed) {
-        if (alreadyDeployed.appLoc === appLoc) {
-          // redeploying to same streamServiceName
-        } else {
-          // trying to deploy to another existing streamServiceName
-          // assign new streamServiceName
-          streamServiceName = `${streamServiceName}-${appCount + 1}`
-        }
-      }
     }
 
     router.use(`/${streamServiceName}`, express.static(pathToDeployment))

api/src/utils/appStreamConfig.ts

@@ -5,6 +5,8 @@ import { AppStreamConfig } from '../types'
 import { getTmpAppStreamConfigPath } from './file'
 
 export const loadAppStreamConfig = async () => {
+  if (process.env.NODE_ENV === 'test') return
+
   const appStreamConfigPath = getTmpAppStreamConfigPath()
 
   const content = (await fileExists(appStreamConfigPath))

api/src/utils/copySASjsCore.ts

@@ -10,6 +10,8 @@ import {
 import { getTmpMacrosPath, sasJSCoreMacros, sasJSCoreMacrosInfo } from '.'
 
 export const copySASjsCore = async () => {
+  if (process.env.NODE_ENV === 'test') return
+
   console.log('Copying Macros from container to drive(tmp).')
 
   const macrosDrivePath = getTmpMacrosPath()