Skip to content

Commit b2ec939

Browse files
authored
Merge pull request #242 from docker/remove-pull-image
Remove Busy box pull
2 parents 86ae209 + 1d08f15 commit b2ec939

File tree

4 files changed

+9
-71
lines changed

4 files changed

+9
-71
lines changed

src/extension/ui/src/App.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import LoadingState from './components/LoadingState';
66
import { useCatalogAll } from './queries/useCatalog';
77
import { useConfig } from './queries/useConfig';
88
import { useMCPClient } from './queries/useMCPClient';
9-
import { useRequiredImages } from './queries/useRequiredImages';
109
import { useSecrets } from './queries/useSecrets';
1110
import { syncRegistryWithConfig } from './Registry';
1211
export const client = createDockerDesktopClient();
@@ -18,7 +17,6 @@ const MemoizedLoadingState = memo(LoadingState);
1817
export function App() {
1918
// Use hooks directly in the component
2019
const catalogAll = useCatalogAll(client);
21-
const requiredImages = useRequiredImages(client);
2220
const config = useConfig(client);
2321
const secrets = useSecrets(client);
2422
const mcpClient = useMCPClient(client);
@@ -32,7 +30,6 @@ export function App() {
3230

3331
// Create a context-like combined props object to pass to children
3432
const appProps = {
35-
imagesLoading: requiredImages.imagesLoading,
3633
configLoading: config.configLoading,
3734
secretsLoading: secrets.isLoading,
3835
catalogLoading: catalogAll.catalogLoading,
@@ -45,7 +42,6 @@ export function App() {
4542
};
4643

4744
const isLoading =
48-
requiredImages.imagesLoading ||
4945
config.configLoading ||
5046
secrets.isLoading ||
5147
catalogAll.catalogLoading ||

src/extension/ui/src/components/CatalogGrid.tsx

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ import {
77
Box,
88
Button,
99
CircularProgress,
10-
FormControlLabel,
1110
FormGroup,
1211
IconButton,
1312
Menu,
1413
MenuItem,
1514
OutlinedInput,
1615
Stack,
17-
Switch,
1816
Tab,
1917
Tabs,
2018
Typography,
@@ -23,9 +21,9 @@ import React, { Suspense, useMemo, useState } from 'react';
2321

2422
import { CATALOG_LAYOUT_SX } from '../Constants';
2523
import { CatalogItemRichened } from '../types/catalog';
26-
import YourClients from './tabs/YourClients';
2724
import OAuthProviders from './tabs/OAuthProviders';
2825
import ToolCatalog from './tabs/ToolCatalog';
26+
import YourClients from './tabs/YourClients';
2927

3028
// Initialize the Docker Desktop client
3129
const client = createDockerDesktopClient();
@@ -45,9 +43,7 @@ export const CatalogGrid: React.FC<CatalogGridProps> = ({ appProps }) => {
4543
}>({
4644
'demo-customized-menu': { anchorEl: null, open: false },
4745
});
48-
const [sort, setSort] = useState<'name-asc' | 'name-desc'>(
49-
'name-asc'
50-
);
46+
const [sort, setSort] = useState<'name-asc' | 'name-desc'>('name-asc');
5147

5248
// Only calculate hasOutOfCatalog when relevant data changes
5349
const hasOutOfCatalog = useMemo(() => {
@@ -82,7 +78,8 @@ export const CatalogGrid: React.FC<CatalogGridProps> = ({ appProps }) => {
8278
>
8379
<Typography variant="h3">Docker MCP Toolkit</Typography>
8480
<Typography sx={{ color: 'text.secondary' }}>
85-
Browse the Docker MCP Catalog and connect Dockerized MCP servers to your favorite MCP Client
81+
Browse the Docker MCP Catalog and connect Dockerized MCP servers to
82+
your favorite MCP Client
8683
</Typography>
8784
</Stack>
8885
{hasOutOfCatalog && (
@@ -226,11 +223,7 @@ export const CatalogGrid: React.FC<CatalogGridProps> = ({ appProps }) => {
226223
}
227224
>
228225
{tab === 0 && (
229-
<ToolCatalog
230-
search={search}
231-
client={client}
232-
sort={sort}
233-
/>
226+
<ToolCatalog search={search} client={client} sort={sort} />
234227
)}
235228
{tab === 1 && <YourClients appProps={appProps} />}
236229
</Suspense>

src/extension/ui/src/components/LoadingState.tsx

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,14 @@ interface LoadingStateProps {
1414
}
1515

1616
const LoadingState: React.FC<LoadingStateProps> = ({ appProps }) => {
17-
const {
18-
imagesLoading,
19-
configLoading,
20-
secretsLoading,
21-
catalogLoading,
22-
registryLoading,
23-
} = appProps;
17+
const { configLoading, secretsLoading, catalogLoading, registryLoading } =
18+
appProps;
2419
const [progress, setProgress] = useState(0);
2520
const isLoading =
26-
imagesLoading ||
27-
configLoading ||
28-
secretsLoading ||
29-
catalogLoading ||
30-
registryLoading;
21+
configLoading || secretsLoading || catalogLoading || registryLoading;
3122

3223
useEffect(() => {
3324
const progress = [
34-
imagesLoading ? 0 : 100,
3525
configLoading ? 0 : 100,
3626
secretsLoading ? 0 : 100,
3727
catalogLoading ? 0 : 100,
@@ -43,18 +33,11 @@ const LoadingState: React.FC<LoadingStateProps> = ({ appProps }) => {
4333
);
4434

4535
setProgress(progressPercent);
46-
}, [
47-
imagesLoading,
48-
configLoading,
49-
secretsLoading,
50-
catalogLoading,
51-
registryLoading,
52-
]);
36+
}, [configLoading, secretsLoading, catalogLoading, registryLoading]);
5337

5438
if (!isLoading) return null;
5539

5640
const getLoadingText = () => {
57-
if (imagesLoading) return 'Loading required Docker images';
5841
if (configLoading) return 'Loading configuration';
5942
if (secretsLoading) return 'Loading secrets';
6043
if (catalogLoading) return 'Loading catalog';

src/extension/ui/src/queries/useRequiredImages.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)