Skip to content

feat: Implement "Create New Secret" Modal #751

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
+725 −162
Draft

feat: Implement "Create New Secret" Modal #751

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
432f941
Generate frontend client endpoints for Secrets API
thaorell Oct 29, 2025
b23fbb3
feat: implemet create new secret modal
jenny-s51 Nov 17, 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
19 changes: 11 additions & 8 deletions workspaces/frontend/src/app/pages/WorkspaceKinds/Form/EditableLabels.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { css } from '@patternfly/react-styles';
import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon';
import { TrashAltIcon } from '@patternfly/react-icons/dist/esm/icons/trash-alt-icon';
import { WorkspacekindsOptionLabel } from '~/generated/data-contracts';
import ThemeAwareFormGroupWrapper from '~/shared/components/ThemeAwareFormGroupWrapper';

interface EditableRowInterface {
data: WorkspacekindsOptionLabel;
Expand All @@ -33,14 +34,16 @@ const EditableRow: React.FC<EditableRowInterface> = ({
return (
<Tr className={css(inlineEditStyles.inlineEdit, inlineEditStyles.modifiers.inlineEditable)}>
<Td>
<TextInput
aria-label={`${columnNames.key} ${ariaLabel}`}
id={`${columnNames.key} ${ariaLabel} key`}
ref={inputRef}
value={data.key}
onChange={(e) => saveChanges({ ...data, key: (e.target as HTMLInputElement).value })}
placeholder="Enter key"
/>
<ThemeAwareFormGroupWrapper isRequired fieldId="key">
<TextInput
aria-label={`${columnNames.key} ${ariaLabel}`}
id={`${columnNames.key} ${ariaLabel} key`}
ref={inputRef}
value={data.key}
onChange={(e) => saveChanges({ ...data, key: (e.target as HTMLInputElement).value })}
placeholder="Enter key"
/>
</ThemeAwareFormGroupWrapper>
</Td>
<Td>
<TextInput
Expand Down
194 changes: 42 additions & 152 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,100 +12,49 @@ 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 } 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 ThemeAwareFormGroupWrapper from '~/shared/components/ThemeAwareFormGroupWrapper';
import { SecretsSecretListItem, WorkspacesPodSecretMount } from '~/generated/data-contracts';
import { useNotebookAPI } from '~/app/hooks/useNotebookAPI';
import { useNamespaceContext } from '~/app/context/NamespaceContextProvider';
import { SecretsApiCreateModal } from './secrets/SecretsApiCreateModal';

interface WorkspaceFormPropertiesSecretsProps {
secrets: WorkspacesPodSecretMount[];
setSecrets: (secrets: WorkspacesPodSecretMount[]) => void;
}

const DEFAULT_MODE_OCTAL = (420).toString(8);

export const WorkspaceFormPropertiesSecrets: React.FC<WorkspaceFormPropertiesSecretsProps> = ({
secrets,
setSecrets,
}) => {
const [isModalOpen, setIsModalOpen] = useState(false);
const { api } = useNotebookAPI();
const { selectedNamespace } = useNamespaceContext();

const [isApiCreateModalOpen, setIsApiCreateModalOpen] = useState(false);
const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
const [formData, setFormData] = useState<WorkspacesPodSecretMount>({
secretName: '',
mountPath: '',
defaultMode: parseInt(DEFAULT_MODE_OCTAL, 8),
});
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);
// Keep baseline secrets fetching from PR #698 for future attach functionality
const [, setAvailableSecrets] = useState<SecretsSecretListItem[]>([]);

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);
setDeleteIndex(i);
}, []);

const handleEdit = useCallback(
(index: number) => {
setFormData(secrets[index]);
setDefaultMode(secrets[index].defaultMode?.toString(8) ?? DEFAULT_MODE_OCTAL);
setEditIndex(index);
setIsModalOpen(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 });
}
},
[setFormData, setIsDefaultModeValid, setDefaultMode, formData],
);

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

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 handleDelete = useCallback(() => {
if (deleteIndex === null) {
return;
Expand All @@ -132,7 +81,7 @@ export const WorkspaceFormPropertiesSecrets: React.FC<WorkspaceFormPropertiesSec
<Tr key={index}>
<Td>{secret.secretName}</Td>
<Td>{secret.mountPath}</Td>
<Td>{secret.defaultMode?.toString(8) ?? DEFAULT_MODE_OCTAL}</Td>
<Td>{secret.defaultMode?.toString(8) ?? '644'}</Td>
<Td isActionCell>
<Dropdown
toggle={(toggleRef) => (
Expand All @@ -150,7 +99,6 @@ export const WorkspaceFormPropertiesSecrets: React.FC<WorkspaceFormPropertiesSec
onSelect={() => setDropdownOpen(null)}
popperProps={{ position: 'right' }}
>
<DropdownItem onClick={() => handleEdit(index)}>Edit</DropdownItem>
<DropdownItem onClick={() => openDeleteModal(index)}>Remove</DropdownItem>
</Dropdown>
</Td>
Expand All @@ -159,86 +107,28 @@ export const WorkspaceFormPropertiesSecrets: React.FC<WorkspaceFormPropertiesSec
</Tbody>
</Table>
)}
<Button
variant="primary"
icon={<PlusCircleIcon />}
onClick={() => setIsModalOpen(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}>
<ThemeAwareFormGroupWrapper 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"
/>
</ThemeAwareFormGroupWrapper>
<ThemeAwareFormGroupWrapper 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"
/>
</ThemeAwareFormGroupWrapper>
<ThemeAwareFormGroupWrapper
label="Default Mode"
isRequired
fieldId="default-mode"
helperTextNode={
!isDefaultModeValid ? (
<HelperText>
<HelperTextItem variant="error">
Must be a valid UNIX file system permission value (i.e. 644)
</HelperTextItem>
</HelperText>
) : null
}
>
<TextInput
name="defaultMode"
isRequired
type="text"
value={defaultMode}
validated={!isDefaultModeValid ? ValidatedOptions.error : undefined}
onChange={(_, val) => handleDefaultModeInput(val)}
id="default-mode"
/>
</ThemeAwareFormGroupWrapper>
</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>
<div style={{ display: 'flex', gap: '0.5rem', marginTop: '1rem' }}>
<Button
variant="primary"
onClick={() => setIsApiCreateModalOpen(true)}
style={{ width: 'fit-content' }}
>
Create New Secret
</Button>
</div>

{/* <SecretsAttachModal
isOpen={isAttachModalOpen}
setIsOpen={setIsAttachModalOpen}
onClose={handleAttachSecrets}
selectedSecrets={selectedSecretNames}
availableSecrets={availableSecrets}
initialMountPath={attachedMountPath}
initialDefaultMode={attachedDefaultMode}
/> */}

<SecretsApiCreateModal isOpen={isApiCreateModalOpen} setIsOpen={setIsApiCreateModalOpen} />

<Modal
isOpen={isDeleteModalOpen}
onClose={() => setIsDeleteModalOpen(false)}
Expand Down
77 changes: 77 additions & 0 deletions ...ces/frontend/src/app/pages/Workspaces/Form/properties/secrets/SecretKeyValuePairInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import React from 'react';
import { Button } from '@patternfly/react-core/dist/esm/components/Button';
import { Form } from '@patternfly/react-core/dist/esm/components/Form';
import { TextInput } from '@patternfly/react-core/dist/esm/components/TextInput';
import { Grid, GridItem } from '@patternfly/react-core/dist/esm/layouts/Grid';
import { MinusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/minus-circle-icon';
import ThemeAwareFormGroupWrapper from '~/shared/components/ThemeAwareFormGroupWrapper';
import PasswordInput from '~/shared/components/PasswordInput';

interface SecretKeyValuePairInputProps {
index: number;
keyValue: string;
valueValue: string;
onKeyChange: (value: string) => void;
onValueChange: (value: string) => void;
onRemove: () => void;
canRemove: boolean;
}

/**
* A composite component for managing a single secret key-value pair
* Handles layout and semantics for Key input, Value input, and Remove button
*/
const SecretKeyValuePairInput: React.FC<SecretKeyValuePairInputProps> = ({
index,
keyValue,
valueValue,
onKeyChange,
onValueChange,
onRemove,
canRemove,
}) => (
<>
<Grid hasGutter data-testid="key-value-pair" className="secret-key-grid">
<GridItem span={11}>
<Form>
<ThemeAwareFormGroupWrapper isRequired label="Key" fieldId={`key-${index}`}>
<TextInput
id={`key-${index}`}
data-testid="key-input"
isRequired
aria-label={`key of item ${index}`}
value={keyValue}
onChange={(_event, val) => onKeyChange(val)}
/>
</ThemeAwareFormGroupWrapper>
</Form>
</GridItem>
<GridItem span={1} className="secret-remove-button-container">
<Button
isDisabled={!canRemove}
data-testid="remove-key-value-pair"
aria-label="Remove key-value pair"
variant="plain"
icon={<MinusCircleIcon />}
onClick={onRemove}
/>
</GridItem>
</Grid>
<ThemeAwareFormGroupWrapper
isRequired
label="Value"
fieldId={`value-${index}`}
className="secret-value-indented"
>
<PasswordInput
data-testid="value-input"
isRequired
aria-label={`value of item ${index}`}
value={valueValue}
onChange={(_event, val) => onValueChange(val)}
/>
</ThemeAwareFormGroupWrapper>
</>
);

export default SecretKeyValuePairInput;
Loading
Loading