Merge pull request #216 from docker/cm/dd-query

Move Docker Desktop version check to query

Author: ColinMcNeil

src/extension/ui/src/components/tabs/YourEnvironment.tsx

@@ -29,13 +29,14 @@ import {
 } from '@mui/material';
 import { useEffect, useState } from 'react';
 
-import { ASSIGNED_SECRET_PLACEHOLDER, MCP_POLICY_NAME } from '../../Constants';
+import { ASSIGNED_SECRET_PLACEHOLDER, getUnsupportedSecretMessage, MCP_POLICY_NAME } from '../../Constants';
 import { useCatalogOperations } from '../../queries/useCatalog';
 import { useConfig } from '../../queries/useConfig';
 import { useSecrets } from '../../queries/useSecrets';
 import { CatalogItemRichened } from '../../types/catalog';
 import ConfigEditor from './ConfigEditor';
 import { formatName } from '../../formatName';
+import useDDInfo from '../../queries/useDDInfo';
 
 interface TabPanelProps {
   children?: React.ReactNode;
@@ -86,6 +87,8 @@ const ConfigurationModal = ({
     useCatalogOperations(client);
   const { configLoading } = useConfig(client);
 
+  const { ddInfo, ddInfoLoading } = useDDInfo(client);
+
   useEffect(() => {
     setLocalSecrets(
       catalogItem.secrets.reduce((acc, secret) => {
@@ -293,11 +296,22 @@ const ConfigurationModal = ({
               >
                 <Stack direction="column" spacing={2} >
                   <ConfigEditor catalogItem={catalogItem} client={client} />
-
-                  {catalogItem.secrets?.length > 0 && (
-                    <Stack spacing={1}>
-                      <Typography variant="subtitle2">Secrets</Typography>
-                      {catalogItem.secrets.map((secret) => {
+                  <Stack>
+                    <Typography variant="subtitle2">Secrets</Typography>
+                    {!ddInfo && !ddInfoLoading && (
+                      <Alert severity="error">
+                        Failed to get Docker Desktop version
+                      </Alert>
+                    )}
+                    {ddInfo && !ddInfo?.hasSecretSupport && (
+                      <Alert severity="error">
+                        {getUnsupportedSecretMessage(ddInfo?.parsedVersion)}
+                      </Alert>
+                    )}
+                    {ddInfo?.hasSecretSupport &&
+                      catalogItem.secrets &&
+                      catalogItem.secrets?.length > 0 ? (
+                      catalogItem.secrets.map((secret) => {
                         const secretEdited =
                           (secret.assigned &&
                             localSecrets[secret.name] !==
@@ -371,9 +385,11 @@ const ConfigurationModal = ({
                             )}
                           </Stack>
                         );
-                      })}
-                    </Stack>
-                  )}
+                      })
+                    ) : (
+                      <Typography>No secrets available.</Typography>
+                    )}
+                  </Stack>
                 </Stack>
               </Stack>
             </TabPanel>

src/extension/ui/src/components/tile/Modal.tsx

@@ -0,0 +1,42 @@
+import { v1 } from "@docker/extension-api-client-types";
+import { useQuery } from "@tanstack/react-query";
+import { useMemo } from "react";
+import { c } from "vite/dist/node/moduleRunnerTransport.d-DJ_mE5sf";
+import { DD_BUILD_WITH_SECRET_SUPPORT } from "../Constants";
+
+const parseDDVersion = (ddVersion: string) => {
+  //eg: Docker Desktop 4.40.0 (184396)
+  const [, , version, build] = ddVersion.split(" ");
+  return {
+    version,
+    build: parseInt(build.replace("(", "").replace(")", "")),
+  };
+};
+
+const useDDInfo = (client: v1.DockerDesktopClient) => {
+  const { data: ddInfo, isLoading: ddInfoLoading } = useQuery({
+    queryKey: ["ddInfo"],
+    queryFn: async () => {
+      const result = await client.docker.cli.exec("version", [
+        "--format",
+        "json",
+      ]);
+
+      const baseVersion = JSON.parse(result.stdout);
+      const parsedVersion = parseDDVersion(baseVersion.Server.Platform.Name);
+      const hasSecretSupport =
+        parsedVersion.build >= DD_BUILD_WITH_SECRET_SUPPORT;
+
+      return {
+        ...baseVersion,
+        parsedVersion,
+        hasSecretSupport,
+        version: baseVersion.Server.Version,
+      };
+    },
+  });
+
+  return { ddInfo, ddInfoLoading };
+};
+
+export default useDDInfo;