fix: dont show if not podman

Signed-off-by: Charlie Drage <charlie@charliedrage.com>
containers · Jul 24, 2023 · d90df20 · d90df20
1 parent 024386d
commit d90df20
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/packages/renderer/src/lib/ContainerList.svelte b/packages/renderer/src/lib/ContainerList.svelte
@@ -532,6 +532,7 @@ function errorCallback(container: ContainerInfoUI, errorMessage: string): void {
                       status: containerGroup.status,
                       name: containerGroup.name,
                       engineId: containerGroup.engineId,
+                      engineType: containerGroup.engineType,
                       containers: [],
                     }}"
                     dropdownMenu="{true}" />

diff --git a/packages/renderer/src/lib/compose/ComposeActions.svelte b/packages/renderer/src/lib/compose/ComposeActions.svelte
@@ -70,6 +70,8 @@ if (dropdownMenu) {
 } else {
   actionsStyle = FlatMenu;
 }
+
+console.log('compose: ', compose);
 </script>
 
 <ListItemButtonIcon
@@ -102,6 +104,7 @@ if (dropdownMenu) {
     title="Deploy to Kubernetes"
     onClick="{() => deployToKubernetes()}"
     menu="{dropdownMenu}"
+    hidden="{!(compose.engineType === 'podman')}"
     detailed="{detailed}"
     icon="{faRocket}" />
   <ListItemButtonIcon

diff --git a/packages/renderer/src/lib/compose/ComposeDetails.svelte b/packages/renderer/src/lib/compose/ComposeDetails.svelte
@@ -21,6 +21,9 @@ let composeUnsubscribe: Unsubscriber;
 
 let compose: ComposeInfoUI;
 
+// Assume that the engine type is podman until we find a compose group that is docker
+let engineType: 'docker' | 'podman' = 'podman';
+
 onMount(() => {
   // We will use the containersInfos store to get every container that matches
   // the label com.docker.compose.project={composeName}
@@ -54,11 +57,17 @@ onMount(() => {
       return containerUtils.getContainerInfoUI(container);
     });
 
+    // Get the engine type from the first container in the list (if it exists)
+    if (convertedContainers.length > 0) {
+      engineType = convertedContainers[0].engineType;
+    }
+
     // Make sure we update the compose object with the name, status, engineID, containers, etc.
     // or else logging will not appear correctly when loading (it'll see empty containers..)
     compose = {
       name: composeName,
       engineId: engineId,
+      engineType: engineType,
       status: status,
       containers: convertedContainers,
     };

diff --git a/packages/renderer/src/lib/compose/ComposeInfoUI.ts b/packages/renderer/src/lib/compose/ComposeInfoUI.ts
@@ -20,6 +20,7 @@ import type { ContainerInfoUI } from '../container/ContainerInfoUI';
 
 export interface ComposeInfoUI {
   engineId: string;
+  engineType: 'podman' | 'docker';
   name: string;
   status: string;
   actionInProgress?: boolean;

diff --git a/packages/renderer/src/lib/container/ContainerInfoUI.ts b/packages/renderer/src/lib/container/ContainerInfoUI.ts
@@ -35,6 +35,7 @@ export interface ContainerGroupPartInfoUI {
   id?: string;
   engineId?: string;
   engineName?: string;
+  engineType?: 'podman' | 'docker';
   shortId?: string;
   status?: string;
   humanCreationDate?: string;

diff --git a/packages/renderer/src/lib/container/container-utils.ts b/packages/renderer/src/lib/container/container-utils.ts
@@ -157,6 +157,7 @@ export class ContainerUtils {
         name: composeProject,
         type: ContainerGroupInfoTypeUI.COMPOSE,
         engineId: containerInfo.engineId,
+        engineType: containerInfo.engineType,
       };
     }
 
@@ -169,6 +170,7 @@ export class ContainerUtils {
         id: podInfo.id,
         status: (podInfo.status || '').toUpperCase(),
         engineId: containerInfo.engineId,
+        engineType: containerInfo.engineType,
       };
     }
 
@@ -177,6 +179,7 @@ export class ContainerUtils {
       name: this.getName(containerInfo),
       type: ContainerGroupInfoTypeUI.STANDALONE,
       status: (containerInfo.Status || '').toUpperCase(),
+      engineType: containerInfo.engineType,
     };
   }
 
@@ -198,6 +201,7 @@ export class ContainerUtils {
             id: group.id,
             status: group.status,
             engineId: group.engineId,
+            engineType: group.engineType,
             containers: [],
           });
         }