Merge pull request #132 from kthcloud/beta

Fix shared resources in deploy list

src/contexts/ResourceContext.jsx

@@ -90,7 +90,7 @@ export const ResourceContextProvider = ({ children }) => {
   };
 
   const getTeamResourceIds = () => {
-    if (!teams) return;
+    if (!teams) return [];
 
     let resourceIds = [];
 
@@ -127,17 +127,16 @@ export const ResourceContextProvider = ({ children }) => {
     let userOwned = array.filter((row) => row.ownerId === user.id);
 
     let teamResourceIds = getTeamResourceIds();
-    teamResourceIds.forEach((resourceId) => {
-      let sharedRow = array.find((row) => row.id === resourceId);
 
-      sharedRow.shared = true;
+    let sharedResources = array.filter((row) =>
+      teamResourceIds.includes(row.id)
+    );
 
-      if (sharedRow && !userOwned.includes(sharedRow)) {
-        userOwned.push(sharedRow);
-      }
+    sharedResources = sharedResources.map((row) => {
+      return { ...row, shared: true };
     });
 
-    setUserRows(userOwned);
+    setUserRows(userOwned.concat(sharedResources));
   };
 
   const loadZones = async () => {

src/locales/en.json

@@ -152,6 +152,7 @@
         "explain-deployment": "Ideal for web apps. Provides the ability to easily run a single container. Allows for CI/CD through GitHub Actions and other pipelines. Your repo must have a Dockerfile.",
         "explain-vm": "Provides the ability to run an operating system directly. More versatile but deployment and maintenance will be more difficult. Ideal for GPU compute.",
         "choose-zone": "Choose zone",
+        "zone": "Zone",
         "choose-zone-subheader-1": "Your chosen zone determines where your",
         "choose-zone-subheader-2": "will be hosted. Selecting the closest zone to your users will improve performance",
         "deploy-hidden": "This deployment is private, it is not visible on the Internet",

src/locales/se.json

@@ -238,6 +238,7 @@
     "your-snapshots": "Dina avbildningar",
     "proxies-subheader-2": "Det gör så du kommer åt den med en snygg länk istället för en slumpmässig port.",
     "choose-zone": "Välj zon",
+    "zone": "Zon",
     "overview": "Överblick",
     "proxies-subheader-1": "Driftssätt en proxy till en exponerad port på din virtuella maskin.",
     "your-snapshot-will-be-created-as": "Din avbildning skapas som",

src/pages/deploy/Deploy.jsx

@@ -109,7 +109,8 @@ export function Deploy() {
     { id: "name", label: t("admin-name"), alignRight: false },
     { id: "type", label: t("resource-type"), alignRight: false },
     { id: "status", label: t("admin-status"), alignRight: false },
-    { id: "" },
+    { id: "zone", label: t("zone"), alignRight: false },
+    { id: "", label: "", alignRight: true },
   ];
 
   const bulkDelete = async () => {
@@ -119,13 +120,11 @@ export function Deploy() {
     try {
       const promises = selected.map(async (id) => {
         if (userRows.find((row) => row.id === id).type === "vm") {
-          console.log("deleting vm");
           const res = await deleteVM(id, keycloak.token);
           queueJob(res);
           return;
         }
         if (userRows.find((row) => row.id === id).type === "deployment") {
-          console.log("deleting k8s");
           const res = await deleteDeployment(id, keycloak.token);
           queueJob(res);
           return;
@@ -470,10 +469,18 @@ export function Deploy() {
                               >
                                 {renderResourceStatus(row)}
                                 {renderStatusCode(row)}
-                                {renderZone(row)}
                                 {renderShared(row)}
                               </Stack>
                             </TableCell>
+                            <TableCell align="left">
+                              <Stack
+                                direction="row"
+                                alignItems="center"
+                                spacing={1}
+                              >
+                                {renderZone(row)}
+                              </Stack>
+                            </TableCell>
 
                             <TableCell align="right">
                               {renderResourceButtons(row)}

src/pages/edit/DangerZone.jsx

@@ -79,7 +79,6 @@ const DangerZone = ({ resource }) => {
     options = [...new Set(options)];
     options.sort((a, b) => a.localeCompare(b));
     setResultsTeam(options);
-    console.log(options);
   };
 
   const updateOwner = async () => {

src/pages/edit/deployments/LogsView.jsx

@@ -44,8 +44,6 @@ export const LogsView = ({ deployment }) => {
       }
     );
 
-    console.log(eventSource);
-
     setSse(eventSource);
 
     eventSource.onerror = () => {
@@ -70,7 +68,6 @@ export const LogsView = ({ deployment }) => {
     });
 
     eventSource.onopen = (e) => {
-      console.log(e);
       setConnection("connected");
     };
   };

src/pages/profile/Profile.jsx

@@ -86,14 +86,12 @@ export function Profile() {
 
     try {
       const data = mode === "keys" ? { publicKeys: user.publicKeys } : user;
-      const response = await updateUser(keycloak.subject, keycloak.token, data);
-      console.log(response);
+      await updateUser(keycloak.subject, keycloak.token, data);
       setValidationError({});
       enqueueSnackbar(t("successfully-updated") + " " + mode, {
         variant: "success",
       });
     } catch (error) {
-      console.log(error);
       if (error.validationErrors) setValidationError(error.validationErrors);
 
       enqueueSnackbar(t("error-updating") + mode, {
@@ -225,8 +223,6 @@ export function Profile() {
                       )}
 
                       <div style={{ flexGrow: "1" }} />
-
-
                     </Stack>
                   </Stack>
                 </CardContent>

src/pages/teams/Teams.jsx

@@ -70,7 +70,6 @@ const Teams = () => {
       setTeamDescription("");
       setStale("created");
     } catch (error) {
-      console.log(error);
       errorHandler(error).forEach((e) =>
         enqueueSnackbar(t("update-error") + e, {
           variant: "error",