Skip to content

feat: secret attachment modal #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: notebooks-v2
Choose a base branch
from
+672 −123
Draft

feat: secret attachment modal #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2004531
Generate frontend client endpoints for Secrets API
thaorell Oct 29, 2025
803fe13
draft: attach modal
thaorell Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion workspaces/frontend/scripts/swagger.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4f0a29dec0d3c9f0d0f02caab4dc84101bfef8b0
be67e887ad7396cf0078edca36201564a208d1b7
7 changes: 7 additions & 0 deletions workspaces/frontend/src/app/pages/Workspaces/Form/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export const isValidDefaultMode = (mode: string): boolean => {
if (mode.length !== 3) {
return false;
}
const permissions = ['0', '4', '5', '6', '7'];
return Array.from(mode).every((char) => permissions.includes(char));
};
235 changes: 113 additions & 122 deletions ...aces/frontend/src/app/pages/Workspaces/Form/properties/WorkspaceFormPropertiesSecrets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useState } from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import { EllipsisVIcon } from '@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon';
import {
Table,
Expand All @@ -12,19 +12,17 @@ import {
import { Button } from '@patternfly/react-core/dist/esm/components/Button';
import {
Modal,
ModalBody,
ModalFooter,
ModalHeader,
ModalVariant,
} from '@patternfly/react-core/dist/esm/components/Modal';
import { ValidatedOptions } from '@patternfly/react-core/helpers';
import { TextInput } from '@patternfly/react-core/dist/esm/components/TextInput';
import { Dropdown, DropdownItem } from '@patternfly/react-core/dist/esm/components/Dropdown';
import { MenuToggle } from '@patternfly/react-core/dist/esm/components/MenuToggle';
import { Form, FormGroup } from '@patternfly/react-core/dist/esm/components/Form';
import { HelperText, HelperTextItem } from '@patternfly/react-core/dist/esm/components/HelperText';
import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
import { WorkspacesPodSecretMount } from '~/generated/data-contracts';
import { SecretsSecretListItem, WorkspacesPodSecretMount } from '~/generated/data-contracts';
import { useNotebookAPI } from '~/app/hooks/useNotebookAPI';
import { useNamespaceContext } from '~/app/context/NamespaceContextProvider';
import { SecretsAttachModal } from './secrets/SecretsAttachModal';
import { SecretsCreateModal } from './secrets/SecretsCreateModal';

interface WorkspaceFormPropertiesSecretsProps {
secrets: WorkspacesPodSecretMount[];
Expand All @@ -37,18 +35,30 @@ export const WorkspaceFormPropertiesSecrets: React.FC<WorkspaceFormPropertiesSec
secrets,
setSecrets,
}) => {
const [isModalOpen, setIsModalOpen] = useState(false);
const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
const [isAttachModalOpen, setIsAttachModalOpen] = useState(false);
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
const [formData, setFormData] = useState<WorkspacesPodSecretMount>({
secretName: '',
mountPath: '',
defaultMode: parseInt(DEFAULT_MODE_OCTAL, 8),
});
const [editingSecret, setEditingSecret] = useState<WorkspacesPodSecretMount | undefined>(
undefined,
);
const [editIndex, setEditIndex] = useState<number | null>(null);
const [defaultMode, setDefaultMode] = useState(DEFAULT_MODE_OCTAL);
const [deleteIndex, setDeleteIndex] = useState<number | null>(null);
const [isDefaultModeValid, setIsDefaultModeValid] = useState(true);
const [dropdownOpen, setDropdownOpen] = useState<number | null>(null);
const [availableSecrets, setAvailableSecrets] = useState<SecretsSecretListItem[]>([]);
const [attachedSecrets, setAttachedSecrets] = useState<WorkspacesPodSecretMount[]>([]);
const [attachedMountPath, setAttachedMountPath] = useState('');
const [attachedDefaultMode, setAttachedDefaultMode] = useState(DEFAULT_MODE_OCTAL);

const { api } = useNotebookAPI();
const { selectedNamespace } = useNamespaceContext();

useEffect(() => {
const fetchSecrets = async () => {
const secretsResponse = await api.secrets.listSecrets(selectedNamespace);
setAvailableSecrets(secretsResponse.data);
};
fetchSecrets();
}, [api.secrets, selectedNamespace]);

const openDeleteModal = useCallback((i: number) => {
setIsDeleteModalOpen(true);
Expand All @@ -57,62 +67,86 @@ export const WorkspaceFormPropertiesSecrets: React.FC<WorkspaceFormPropertiesSec

const handleEdit = useCallback(
(index: number) => {
setFormData(secrets[index]);
setDefaultMode(secrets[index].defaultMode?.toString(8) ?? DEFAULT_MODE_OCTAL);
setEditingSecret(secrets[index]);
setEditIndex(index);
setIsModalOpen(true);
setIsCreateModalOpen(true);
},
[secrets],
);

const handleDefaultModeInput = useCallback(
(val: string) => {
if (val.length <= 3) {
// 0 no permissions, 4 read only, 5 read + execute, 6 read + write, 7 all permissions
setDefaultMode(val);
const permissions = ['0', '4', '5', '6', '7'];
const isValid = Array.from(val).every((char) => permissions.includes(char));
if (val.length < 3 || !isValid) {
setIsDefaultModeValid(false);
} else {
setIsDefaultModeValid(true);
}
const decimalVal = parseInt(val, 8);
setFormData({ ...formData, defaultMode: decimalVal });
const handleAttachSecrets = useCallback(
(newSecrets: SecretsSecretListItem[], mountPath: string, mode: number) => {
const newAttachedSecrets = newSecrets.map((secret) => ({
secretName: secret.name,
mountPath,
defaultMode: mode,
}));
const oldAttachedNames = new Set(attachedSecrets.map((s) => s.secretName));
const secretsWithoutOldAttached = secrets.filter((s) => !oldAttachedNames.has(s.secretName));
const manualSecretNames = new Set(secretsWithoutOldAttached.map((s) => s.secretName));
const filteredNewAttached = newAttachedSecrets.filter(
(s) => !manualSecretNames.has(s.secretName),
);

// Update both states
setAttachedSecrets(filteredNewAttached);
setSecrets([...secretsWithoutOldAttached, ...filteredNewAttached]);
setAttachedMountPath(mountPath);
setAttachedDefaultMode(mode.toString(8));
setIsAttachModalOpen(false);
},
[attachedSecrets, secrets, setSecrets],
);

const handleCreateOrEditSubmit = useCallback(
(secret: WorkspacesPodSecretMount) => {
if (editIndex !== null) {
const updated = [...secrets];
updated[editIndex] = secret;
setSecrets(updated);
} else {
setSecrets([...secrets, secret]);
}
setEditingSecret(undefined);
setEditIndex(null);
setIsCreateModalOpen(false);
},
[setFormData, setIsDefaultModeValid, setDefaultMode, formData],
[editIndex, secrets, setSecrets],
);

const clearForm = useCallback(() => {
setFormData({ secretName: '', mountPath: '', defaultMode: 420 });
const handleCreateModalClose = useCallback(() => {
setEditingSecret(undefined);
setEditIndex(null);
setIsModalOpen(false);
setIsDefaultModeValid(true);
setIsCreateModalOpen(false);
}, []);

const handleAddOrEditSubmit = useCallback(() => {
if (!formData.secretName || !formData.mountPath) {
return;
}
if (editIndex !== null) {
const updated = [...secrets];
updated[editIndex] = formData;
setSecrets(updated);
} else {
setSecrets([...secrets, formData]);
}
clearForm();
}, [clearForm, editIndex, formData, secrets, setSecrets]);
const isAttachedSecret = useCallback(
(secretName: string) => attachedSecrets.some((s) => s.secretName === secretName),
[attachedSecrets],
);

const handleDelete = useCallback(() => {
if (deleteIndex === null) {
return;
}
const secretToDelete = secrets[deleteIndex];
setSecrets(secrets.filter((_, i) => i !== deleteIndex));

// If it's an attached secret, also remove from attachedSecrets
if (isAttachedSecret(secretToDelete.secretName)) {
const updatedAttachedSecrets = attachedSecrets.filter(
(s) => s.secretName !== secretToDelete.secretName,
);
setAttachedSecrets(updatedAttachedSecrets);
if (updatedAttachedSecrets.length === 0) {
setAttachedMountPath('');
setAttachedDefaultMode(DEFAULT_MODE_OCTAL);
}
}

setDeleteIndex(null);
setIsDeleteModalOpen(false);
}, [deleteIndex, secrets, setSecrets]);
}, [deleteIndex, secrets, setSecrets, attachedSecrets, isAttachedSecret]);

return (
<>
Expand Down Expand Up @@ -149,7 +183,9 @@ export const WorkspaceFormPropertiesSecrets: React.FC<WorkspaceFormPropertiesSec
onSelect={() => setDropdownOpen(null)}
popperProps={{ position: 'right' }}
>
<DropdownItem onClick={() => handleEdit(index)}>Edit</DropdownItem>
{!isAttachedSecret(secret.secretName) && (
<DropdownItem onClick={() => handleEdit(index)}>Edit</DropdownItem>
)}
<DropdownItem onClick={() => openDeleteModal(index)}>Remove</DropdownItem>
</Dropdown>
</Td>
Expand All @@ -159,79 +195,34 @@ export const WorkspaceFormPropertiesSecrets: React.FC<WorkspaceFormPropertiesSec
</Table>
)}
<Button
variant="primary"
icon={<PlusCircleIcon />}
onClick={() => setIsModalOpen(true)}
variant="secondary"
onClick={() => setIsAttachModalOpen(true)}
style={{ marginTop: '1rem', marginRight: '1rem', width: 'fit-content' }}
>
Attach Existing Secrets
</Button>
<Button
variant="secondary"
onClick={() => setIsCreateModalOpen(true)}
style={{ marginTop: '1rem', width: 'fit-content' }}
>
Create Secret
</Button>
<Modal isOpen={isModalOpen} onClose={clearForm} variant={ModalVariant.small}>
<ModalHeader
title={editIndex === null ? 'Create Secret' : 'Edit Secret'}
labelId="secret-modal-title"
description={
editIndex === null
? 'Add a secret to securely use API keys, tokens, or other credentials in your workspace.'
: ''
}
/>
<ModalBody id="secret-modal-box-body">
<Form onSubmit={handleAddOrEditSubmit}>
<FormGroup label="Secret Name" isRequired fieldId="secret-name">
<TextInput
name="secretName"
isRequired
type="text"
value={formData.secretName}
onChange={(_, val) => setFormData({ ...formData, secretName: val })}
id="secret-name"
/>
</FormGroup>
<FormGroup label="Mount Path" isRequired fieldId="mount-path">
<TextInput
name="mountPath"
isRequired
type="text"
value={formData.mountPath}
onChange={(_, val) => setFormData({ ...formData, mountPath: val })}
id="mount-path"
/>
</FormGroup>
<FormGroup label="Default Mode" isRequired fieldId="default-mode">
<TextInput
name="defaultMode"
isRequired
type="text"
value={defaultMode}
validated={!isDefaultModeValid ? ValidatedOptions.error : undefined}
onChange={(_, val) => handleDefaultModeInput(val)}
id="default-mode"
/>
{!isDefaultModeValid && (
<HelperText>
<HelperTextItem variant="error">
Must be a valid UNIX file system permission value (i.e. 644)
</HelperTextItem>
</HelperText>
)}
</FormGroup>
</Form>
</ModalBody>
<ModalFooter>
<Button
key="confirm"
variant="primary"
onClick={handleAddOrEditSubmit}
isDisabled={!isDefaultModeValid}
>
{editIndex !== null ? 'Save' : 'Create'}
</Button>
<Button key="cancel" variant="link" onClick={clearForm}>
Cancel
</Button>
</ModalFooter>
</Modal>
<SecretsAttachModal
availableSecrets={availableSecrets}
isOpen={isAttachModalOpen}
setIsOpen={setIsAttachModalOpen}
selectedSecrets={attachedSecrets.map((secret) => secret.secretName)}
onClose={handleAttachSecrets}
initialMountPath={attachedMountPath}
initialDefaultMode={attachedDefaultMode}
/>
<SecretsCreateModal
isOpen={isCreateModalOpen}
setIsOpen={handleCreateModalClose}
onSubmit={handleCreateOrEditSubmit}
editSecret={editingSecret}
/>
<Modal
isOpen={isDeleteModalOpen}
onClose={() => setIsDeleteModalOpen(false)}
Expand Down
Loading
Loading