From caaf4a5a40807e4e9f352114b3398977d31e6f94 Mon Sep 17 00:00:00 2001
From: Frikky <frikky@shuffler.io>
Date: Thu, 16 Nov 2023 18:22:53 +0100
Subject: [PATCH] Added Queue size to Environments to understand size of queue
 currently

---
 backend/go-app/go.mod        |   4 +-
 docker-compose.yml           |   6 +-
 frontend/src/views/Admin.jsx | 103 ++++++++++++++++++-----------------
 3 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index a69a127b..71086381 100644
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -1,6 +1,6 @@
 module shuffle-shared
 
-//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
+replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
 
 go 1.19
 
@@ -19,7 +19,7 @@ require (
 	github.com/h2non/filetype v1.1.3
 	github.com/satori/go.uuid v1.2.0
 	github.com/shuffle/shuffle-shared v0.4.79
-	golang.org/x/crypto v0.9.0
+	golang.org/x/crypto v0.14.0
 	google.golang.org/api v0.125.0
 	google.golang.org/grpc v1.55.0
 	gopkg.in/src-d/go-git.v4 v4.13.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 8bde6ff6..c35a6138 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   frontend:
-    image: ghcr.io/shuffle/shuffle-frontend:latest
+    image: ghcr.io/shuffle/shuffle-frontend:nightly
     container_name: shuffle-frontend
     hostname: shuffle-frontend
     ports:
@@ -15,7 +15,7 @@ services:
     depends_on:
       - backend
   backend:
-    image: ghcr.io/shuffle/shuffle-backend:latest
+    image: ghcr.io/shuffle/shuffle-backend:nightly
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
     # Here for debugging:
@@ -34,7 +34,7 @@ services:
       - SHUFFLE_FILE_LOCATION=/shuffle-files
     restart: unless-stopped
   orborus:
-    image: ghcr.io/shuffle/shuffle-orborus:latest
+    image: ghcr.io/shuffle/shuffle-orborus:nightly
     container_name: shuffle-orborus
     hostname: shuffle-orborus
     networks:
diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx
index 9631fd1e..565597cc 100755
--- a/frontend/src/views/Admin.jsx
+++ b/frontend/src/views/Admin.jsx
@@ -3941,7 +3941,7 @@ If you're interested, please let me know a time that works for you, or set up a
               style={{ minWidth: 125, maxWidth: 125 }}
             />
             <ListItemText
-              primary="Disabled"
+              primary={isCloud ? "Disabled" : "In Queue"}
               style={{ minWidth: 100, maxWidth: 100 }}
             />
             <ListItemText
@@ -3982,6 +3982,8 @@ If you're interested, please let me know a time that works for you, or set up a
 
 								console.log("Show CPU alert: ", showCPUAlert)
 
+				const queueSize = isCloud ? -1 : environment.queue !== undefined && environment.queue !== null ? environment.queue < 0 ? 0 : environment.queue > 100 ? ">100" : environment.queue : 0
+
                 return (
 									<span key={index}>
                   	<ListItem key={index} style={{ backgroundColor: bgColor }}>
@@ -4091,7 +4093,8 @@ If you're interested, please let me know a time that works for you, or set up a
                   	      overflow: "hidden",
                   	      marginLeft: 10,
                   	    }}
-                  	    primary={environment.archived.toString()}
+
+                  	    primary={isCloud ? environment.archived.toString() : queueSize}
                   	  />
                   	  <ListItemText
                   	    style={{
@@ -4116,59 +4119,59 @@ If you're interested, please let me know a time that works for you, or set up a
                   	    }}
                   	  >
                   	    <div style={{ display: "flex" }}>
-													<ButtonGroup style={{borderRadius: "5px 5px 5px 5px",}}>
-														<Button
-															variant={environment.archived ? "contained" : "outlined"}
-															style={{ }}
-															onClick={() => deleteEnvironment(environment)}
-															color="primary"
-														>
-															{environment.archived ? "Activate" : "Disable"}
-														</Button>
-														<Button
-															variant={"outlined"}
-															style={{ }}
-															disabled={isCloud && environment.Name.toLowerCase() !== "cloud"}
-															onClick={() => {
-																console.log("Should clear executions for: ", environment);
+							<ButtonGroup style={{borderRadius: "5px 5px 5px 5px",}}>
+								<Button
+									variant={environment.archived ? "contained" : "outlined"}
+									style={{ }}
+									onClick={() => deleteEnvironment(environment)}
+									color="primary"
+								>
+									{environment.archived ? "Activate" : "Disable"}
+								</Button>
+								<Button
+									variant={"outlined"}
+									style={{ }}
+									disabled={isCloud && environment.Name.toLowerCase() !== "cloud"}
+									onClick={() => {
+										console.log("Should clear executions for: ", environment);
 
-																if (isCloud && environment.Name.toLowerCase() === "cloud") {
-																	rerunCloudWorkflows(environment);
-																} else { 
-																	abortEnvironmentWorkflows(environment);
-																}
-															}}
-															color="primary"
-														>
-															{isCloud && environment.Name.toLowerCase() === "cloud" ? "Rerun" : "Clear"}
-														</Button>
-													</ButtonGroup>
+										if (isCloud && environment.Name.toLowerCase() === "cloud") {
+											rerunCloudWorkflows(environment);
+										} else { 
+											abortEnvironmentWorkflows(environment);
+										}
+									}}
+									color="primary"
+								>
+									{isCloud && environment.Name.toLowerCase() === "cloud" ? "Rerun" : "Clear"}
+								</Button>
+							</ButtonGroup>
                   	    </div>
                   	  </ListItemText>
                   	</ListItem>
-										{showCPUAlert === false ? null : 
+					{showCPUAlert === false ? null : 
                   		<ListItem key={index+"_cpu"} style={{ backgroundColor: bgColor }}>
-												<div style={{border: "1px solid #f85a3e", borderRadius: theme.palette.borderRadius, marginTop: 10, marginBottom: 10, padding: 15, textAlign: "center", height: 70, textAlign: "left", backgroundColor: theme.palette.surfaceColor, display: "flex", }}>
-													<div style={{flex: 2, overflow: "hidden",}}>
-														<Typography variant="body1" >
-															90% CPU the server(s) hosting the Shuffle App Runner (Orborus) was found.  
-														</Typography>
-														<Typography variant="body2" color="textSecondary">
-															Need help with High Availability and Scale? <a href="/docs/configuration#scale" target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#f85a3e" }}>Read documentation</a> and <a href="https://shuffler.io/contact" target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#f85a3e" }}>Get in touch</a>.  
-														</Typography>
-													</div>
-													<div style={{flex: 1, display: "flex", marginLeft: 30, }}>
-														<Button style={{borderRadius: 25, width: 200, height: 50, marginTop: 8, }} variant="outlined" color="secondary" onClick={() => {
-															// dismiss -> get envs
-														 	changeRecommendation(userdata.priorities[foundIndex], "dismiss")
-														}}>
-															Dismiss	
-														</Button>
-													</div> 
-												</div>
-											</ListItem>
-										}
-									</span>
+							<div style={{border: "1px solid #f85a3e", borderRadius: theme.palette.borderRadius, marginTop: 10, marginBottom: 10, padding: 15, textAlign: "center", height: 70, textAlign: "left", backgroundColor: theme.palette.surfaceColor, display: "flex", }}>
+								<div style={{flex: 2, overflow: "hidden",}}>
+									<Typography variant="body1" >
+										90% CPU the server(s) hosting the Shuffle App Runner (Orborus) was found.  
+									</Typography>
+									<Typography variant="body2" color="textSecondary">
+										Need help with High Availability and Scale? <a href="/docs/configuration#scale" target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#f85a3e" }}>Read documentation</a> and <a href="https://shuffler.io/contact" target="_blank" rel="noopener noreferrer" style={{ textDecoration: "none", color: "#f85a3e" }}>Get in touch</a>.  
+									</Typography>
+								</div>
+								<div style={{flex: 1, display: "flex", marginLeft: 30, }}>
+									<Button style={{borderRadius: 25, width: 200, height: 50, marginTop: 8, }} variant="outlined" color="secondary" onClick={() => {
+										// dismiss -> get envs
+										changeRecommendation(userdata.priorities[foundIndex], "dismiss")
+									}}>
+										Dismiss	
+									</Button>
+								</div> 
+							</div>
+						</ListItem>
+					}
+				</span>
                 );
               })}
         </List>