Rename hooks to queries, remove old config logic

Author: colinmcneil

src/extension/ui/src/App.tsx

@@ -7,11 +7,11 @@ import { CatalogGrid } from './components/CatalogGrid';
 import { POLL_INTERVAL } from './Constants';
 import ConfigurationModal from './components/tile/Modal';
 import LoadingState from './components/LoadingState';
-import { useCatalogAll } from './hooks/useCatalog';
-import { useRequiredImages } from './hooks/useRequiredImages';
-import { useMCPClient } from './hooks/useMCPClient';
-import { useConfig } from './hooks/useConfig';
-import { useSecrets } from './hooks/useSecrets';
+import { useCatalogAll } from './queries/useCatalog';
+import { useRequiredImages } from './queries/useRequiredImages';
+import { useMCPClient } from './queries/useMCPClient';
+import { useConfig } from './queries/useConfig';
+import { useSecrets } from './queries/useSecrets';
 
 export const client = createDockerDesktopClient();
 

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

@@ -3,7 +3,7 @@ import { Grid2 } from '@mui/material';
 import Tile from '../tile/Index';
 import { v1 } from "@docker/extension-api-client-types";
 import { CATALOG_LAYOUT_SX } from '../../Constants';
-import { useCatalog } from '../../hooks/useCatalog';
+import { useCatalog } from '../../queries/useCatalog';
 
 interface ToolCatalogProps {
     search: string;

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

@@ -7,7 +7,7 @@ import { v1 } from '@docker/extension-api-client-types';
 import { createDockerDesktopClient } from '@docker/extension-api-client';
 import { CatalogItemRichened } from '../../types/catalog';
 import { Secret } from '../../types/secrets';
-import { useCatalog } from '../../hooks/useCatalog';
+import { useCatalog } from '../../queries/useCatalog';
 // Initialize the Docker Desktop client
 const client = createDockerDesktopClient();
 

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

@@ -3,7 +3,7 @@ import { Alert, Stack } from "@mui/material";
 import { CatalogItemRichened } from "../../types/catalog";
 import { useEffect, useState, useCallback, useMemo } from "react";
 import * as JsonSchema from "json-schema-library";
-import { getTemplateForItem, useConfig } from "../../hooks/useConfig";
+import { getTemplateForItem, useConfig } from "../../queries/useConfig";
 import { buildObjectFromFlattenedObject, deepFlattenObject, deepSet } from "../../MergeDeep";
 import { CheckOutlined, CloseOutlined } from "@mui/icons-material";
 import { v1 } from "@docker/extension-api-client-types";

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

@@ -8,8 +8,8 @@ import Top from "./Top";
 import Center from "./Center";
 import Bottom from "./Bottom";
 import { v1 } from "@docker/extension-api-client-types";
-import { useSecrets } from "../../hooks/useSecrets";
-import { useCatalogOperations, useRegistry } from "../../hooks/useCatalog";
+import { useSecrets } from "../../queries/useSecrets";
+import { useCatalogOperations, useRegistry } from "../../queries/useCatalog";
 import { MCP_POLICY_NAME } from "../../Constants";
 
 type TileProps = {

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

@@ -5,9 +5,9 @@ import { CatalogItemRichened } from "../../types/catalog";
 import { v1 } from "@docker/extension-api-client-types";
 import { ASSIGNED_SECRET_PLACEHOLDER, CATALOG_LAYOUT_SX, MCP_POLICY_NAME, UNASSIGNED_SECRET_PLACEHOLDER } from "../../Constants";
 import ConfigEditor from "./ConfigEditor";
-import { useSecrets } from "../../hooks/useSecrets";
-import { useCatalogOperations, useRegistry } from "../../hooks/useCatalog";
-import { useConfig } from "../../hooks/useConfig";
+import { useSecrets } from "../../queries/useSecrets";
+import { useCatalogOperations, useRegistry } from "../../queries/useCatalog";
+import { useConfig } from "../../queries/useConfig";
 
 interface TabPanelProps {
     children?: React.ReactNode;

src/extension/ui/src/hooks/useCatalog.ts renamed to src/extension/ui/src/queries/useCatalog.ts

@@ -231,32 +231,6 @@ export function useCatalogOperations(client: v1.DockerDesktopClient) {
 
                     // If there's a JSON schema configuration, validate and generate default values
                     if (Array.isArray(item.config) && item.config.length > 0) {
-                        const configSchema = item.config[0];
-
-                        // Check if we have required fields from anyOf conditions
-                        if (configSchema.anyOf) {
-                            configSchema.anyOf.forEach((condition: any) => {
-                                if (condition.required) {
-                                    condition.required.forEach((field: string) => {
-                                        if (!(field in itemConfig)) {
-                                            // Generate a default value if possible
-                                            itemConfig[field] = "";
-                                        }
-                                    });
-                                }
-                            });
-                        }
-
-                        // Handle normal required fields
-                        if (configSchema.required) {
-                            configSchema.required.forEach((field: string) => {
-                                if (!(field in itemConfig)) {
-                                    // Generate a default value if possible
-                                    itemConfig[field] = "";
-                                }
-                            });
-                        }
-
                         // Use JSON schema template for any remaining defaults
                         const template = getTemplateForItem(item, itemConfig);
                         itemConfig = { ...template, ...itemConfig };