Skip to content

Commit 5095a73

Browse files
committed
Re-add missing props
1 parent 44e2811 commit 5095a73

File tree

3 files changed

+46
-25
lines changed

3 files changed

+46
-25
lines changed

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

+8
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,16 @@ export const CatalogGrid: React.FC<CatalogGridProps> = ({
216216
<Suspense fallback={<Box sx={{ display: 'flex', justifyContent: 'center', p: 4 }}><CircularProgress /></Box>}>
217217
{tab === 0 && (
218218
<ToolCatalog
219+
registryItems={registryItems}
219220
search={search}
220221
catalogItems={catalogItems}
221222
client={client}
223+
ddVersion={ddVersion}
224+
canRegister={canRegister}
225+
register={registerCatalogItem}
226+
unregister={unregisterCatalogItem}
227+
onSecretChange={loadSecrets}
228+
secrets={secrets}
222229
/>
223230
)}
224231
{tab === 1 && (
@@ -236,6 +243,7 @@ export const CatalogGrid: React.FC<CatalogGridProps> = ({
236243
<YourEnvironment
237244
secrets={secrets}
238245
ddVersion={ddVersion}
246+
config={config}
239247
/>
240248
)}
241249
</Suspense>

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

+16-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,22 @@ import { CatalogItemCard, CatalogItemWithName } from '../PromptCard';
44
import AddIcon from '@mui/icons-material/Add';
55
import { Ref } from '../../Refs';
66
import { v1 } from "@docker/extension-api-client-types";
7+
import Secrets from '../../Secrets';
78

89
interface ToolCatalogProps {
910
search: string;
1011
catalogItems: CatalogItemWithName[];
1112
client: v1.DockerDesktopClient;
13+
ddVersion: { version: string, build: number };
14+
canRegister: boolean;
15+
register: (item: CatalogItemWithName) => Promise<void>;
16+
unregister: (item: CatalogItemWithName) => Promise<void>;
17+
onSecretChange: (secret: { name: string, value: string }) => Promise<void>;
18+
secrets: Secrets.Secret[];
19+
registryItems: { [key: string]: { ref: string, config: any } };
1220
}
1321

14-
const ToolCatalog: React.FC<ToolCatalogProps> = ({ search, catalogItems, client }) => {
22+
const ToolCatalog: React.FC<ToolCatalogProps> = ({ search, catalogItems, client, ddVersion, canRegister, register, unregister, onSecretChange, secrets, registryItems }) => {
1523
const filteredCatalogItems = catalogItems.filter(item =>
1624
item.name.toLowerCase().includes(search.toLowerCase())
1725
);
@@ -27,13 +35,13 @@ const ToolCatalog: React.FC<ToolCatalogProps> = ({ search, catalogItems, client
2735
client.host.openExternal(Ref.fromRef(catalogItem.ref).toURL(true));
2836
}}
2937
item={catalogItem}
30-
ddVersion={{ version: '0.0.0', build: 0 }}
31-
canRegister={false}
32-
registered={false}
33-
register={async () => { }}
34-
unregister={async () => { }}
35-
onSecretChange={async () => { }}
36-
secrets={[]}
38+
ddVersion={ddVersion}
39+
canRegister={canRegister}
40+
registered={registryItems[catalogItem.name]?.ref !== undefined}
41+
register={register}
42+
unregister={unregister}
43+
onSecretChange={onSecretChange}
44+
secrets={secrets}
3745
/>
3846
</Grid2>
3947
))}

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

+22-17
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,37 @@ import { DD_BUILD_WITH_SECRET_SUPPORT, getUnsupportedSecretMessage } from '../..
66
interface YourEnvironmentProps {
77
secrets: Secrets.Secret[];
88
ddVersion: { version: string, build: number };
9+
config: { [key: string]: { [key: string]: any } };
910
}
1011

11-
const YourEnvironment: React.FC<YourEnvironmentProps> = ({ secrets, ddVersion }) => {
12+
const YourEnvironment: React.FC<YourEnvironmentProps> = ({ secrets, ddVersion, config }) => {
1213
const hasDDVersionWithSecretSupport = ddVersion && ddVersion.build >= DD_BUILD_WITH_SECRET_SUPPORT;
1314

1415
if (!hasDDVersionWithSecretSupport) {
1516
return <Alert severity="error" sx={{ fontSize: '1.2rem', maxWidth: 600 }}>{getUnsupportedSecretMessage(ddVersion)}</Alert>
1617
}
1718

1819
return (
19-
<List subheader={
20-
<Stack direction="column" spacing={2} alignItems="center">
21-
<Alert title="Docker Secret Management" severity="info" sx={{ fontSize: '1.2rem', maxWidth: 600 }}>
22-
Docker Secret Management is a new feature in Docker Desktop that allows you to securely inject secrets into your containers.
23-
</Alert>
24-
<Typography variant="h2">
25-
The following secrets are available to use in your prompts:
26-
</Typography>
27-
</Stack>
28-
}>
29-
{secrets.map((secret) => (
30-
<ListItem key={secret.name}>
31-
<ListItemText primary={<Typography variant="h6">{secret.name}</Typography>} />
32-
</ListItem>
33-
))}
34-
</List>
20+
<Stack direction="column" spacing={2}>
21+
<List subheader={
22+
<Stack direction="column" spacing={2} alignItems="center">
23+
<Alert title="Docker Secret Management" severity="info" sx={{ fontSize: '1.2rem', maxWidth: 600 }}>
24+
Docker Secret Management is a new feature in Docker Desktop that allows you to securely inject secrets into your containers.
25+
</Alert>
26+
<Typography variant="h2">
27+
The following secrets are available to use in your prompts:
28+
</Typography>
29+
</Stack>
30+
}>
31+
{secrets.map((secret) => (
32+
<ListItem key={secret.name}>
33+
<ListItemText primary={<Typography variant="h6">{secret.name}</Typography>} />
34+
</ListItem>
35+
))}
36+
</List>
37+
<Typography variant="h2">The following configurations are available to use in your prompts:</Typography>
38+
<pre>{JSON.stringify(config, null, 2)}</pre>
39+
</Stack>
3540
);
3641
};
3742

0 commit comments

Comments
 (0)