mirror of
https://github.com/sasjs/server.git
synced 2026-01-07 06:30:06 +00:00
fix(deploy): user can deploy to same appName with different/same appLoc
This commit is contained in:
50
api/public/test.html
Normal file
50
api/public/test.html
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<base href="/AppStream/" />
|
||||||
|
<style>
|
||||||
|
* {
|
||||||
|
font-family: 'Roboto', sans-serif;
|
||||||
|
}
|
||||||
|
.app-container {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: baseline;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.app-container .app {
|
||||||
|
width: 100px;
|
||||||
|
margin: 10px;
|
||||||
|
overflow: hidden;
|
||||||
|
border-radius: 10px 10px 0 0;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>App Stream</h1>
|
||||||
|
<div class="app-container">
|
||||||
|
<a class="app" href="clickme">
|
||||||
|
<img src="/sasjs-logo.svg" />
|
||||||
|
clickme
|
||||||
|
</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
<a class="app" href="#"><img src="/sasjs-logo.svg" />App Name here</a>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -40,17 +40,6 @@ export const publishAppStream = async (
|
|||||||
|
|
||||||
if (!streamServiceName) {
|
if (!streamServiceName) {
|
||||||
streamServiceName = `AppStreamName${appCount + 1}`
|
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))
|
router.use(`/${streamServiceName}`, express.static(pathToDeployment))
|
||||||
|
|||||||
Reference in New Issue
Block a user