Skip to content

Commit 2939393

Browse files
committed
fixes
1 parent 62ac31e commit 2939393

File tree

7 files changed

+86
-238
lines changed

7 files changed

+86
-238
lines changed

src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import { canConnectToMCP } from '../controlPlanes.ts';
2828
import { Infobox } from '../../Ui/Infobox/Infobox.tsx';
2929

3030
import { ControlPlaneCardMenu } from './ControlPlaneCardMenu.tsx';
31+
import { CreateManagedControlPlaneWizardContainer } from '../../Wizards/CreateManagedControlPlane/CreateManagedControlPlaneWizardContainer.tsx';
32+
import { EditManagedControlPlaneWizardDataLoader } from '../../Wizards/CreateManagedControlPlane/EditManagedControlPlaneWizardDataLoader.tsx';
3133

3234
interface Props {
3335
controlPlane: ListControlPlanesType;
@@ -39,7 +41,7 @@ export function ControlPlaneCard({ controlPlane, workspace, projectName }: Props
3941
const [dialogDeleteMcpIsOpen, setDialogDeleteMcpIsOpen] = useState(false);
4042
const toast = useToast();
4143
const { t } = useTranslation();
42-
44+
const [isEditManagedControlPlaneWizardOpen, setIsEditManagedControlPlaneWizardOpen] = useState(false);
4345
const { trigger: patchTrigger } = useApiResourceMutation<DeleteMCPType>(
4446
PatchMCPResourceForDeletion(controlPlane.metadata.namespace, controlPlane.metadata.name),
4547
);
@@ -79,7 +81,7 @@ export function ControlPlaneCard({ controlPlane, workspace, projectName }: Props
7981
<ControlPlaneCardMenu
8082
setDialogDeleteMcpIsOpen={setDialogDeleteMcpIsOpen}
8183
isDeleteMcpButtonDisabled={controlPlane.status?.status === ReadyStatus.InDeletion}
82-
// setIsCreateManagedControlPlaneWizardOpen={setIsCreateManagedControlPlaneWizardOpen}
84+
setIsEditManagedControlPlaneWizardOpen={setIsEditManagedControlPlaneWizardOpen}
8385
/>
8486
<FlexBox direction="Row" justifyContent="SpaceBetween" alignItems="Center" gap={10}>
8587
<YamlViewButtonWithLoader
@@ -123,6 +125,13 @@ export function ControlPlaneCard({ controlPlane, workspace, projectName }: Props
123125
toast.show(t('ControlPlaneCard.deleteConfirmationDialog'));
124126
}}
125127
/>
128+
<EditManagedControlPlaneWizardDataLoader
129+
isOpen={isEditManagedControlPlaneWizardOpen}
130+
setIsOpen={setIsEditManagedControlPlaneWizardOpen}
131+
projectName={projectName}
132+
workspaceName={namespace}
133+
resourceName={name}
134+
/>
126135
</>
127136
);
128137
}

src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCardMenu.tsx

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ import { useTranslation } from 'react-i18next';
99
type ControlPlanesListMenuProps = {
1010
setDialogDeleteMcpIsOpen: Dispatch<SetStateAction<boolean>>;
1111
isDeleteMcpButtonDisabled: boolean;
12-
// setIsCreateManagedControlPlaneWizardOpen: Dispatch<SetStateAction<boolean>>;
12+
setIsEditManagedControlPlaneWizardOpen: Dispatch<SetStateAction<boolean>>;
1313
};
1414

1515
export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
1616
setDialogDeleteMcpIsOpen,
1717
isDeleteMcpButtonDisabled,
18-
// setIsCreateManagedControlPlaneWizardOpen,
18+
setIsEditManagedControlPlaneWizardOpen,
1919
}) => {
20-
// const popoverRef = useRef<MenuDomRef>(null);
21-
2220
const buttonRef = useRef(null);
2321
const [menuIsOpen, setMenuIsOpen] = useState(false);
2422
const { t } = useTranslation();
@@ -36,7 +34,7 @@ export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
3634
onItemClick={(event) => {
3735
const action = (event.detail.item as HTMLElement).dataset.action;
3836
if (action === 'editMcp') {
39-
// setIsCreateManagedControlPlaneWizardOpen(true);
37+
setIsEditManagedControlPlaneWizardOpen(true);
4038
}
4139
if (action === 'deleteMcp') {
4240
setDialogDeleteMcpIsOpen(true);
@@ -48,12 +46,6 @@ export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
4846
setMenuIsOpen(false);
4947
}}
5048
>
51-
{/*<MenuItem*/}
52-
{/* key={'add'}*/}
53-
{/* text={t('ControlPlaneListToolbar.createNewManagedControlPlane')}*/}
54-
{/* data-action="newManagedControlPlane"*/}
55-
{/* icon="add"*/}
56-
{/*/>*/}
5749
<MenuItem
5850
key={'delete'}
5951
text={t('ControlPlaneCard.deleteMCP')}

src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export function ControlPlaneListWorkspaceGridTile({ projectName, workspace }: Pr
189189
projectName={projectNamespace}
190190
workspaceName={workspaceName}
191191
initialTemplateName={initialTemplateName}
192-
isEditMode={true}
192+
isEditMode={false}
193193
/>
194194
</>
195195
);

src/components/Dialogs/MetadataForm.tsx

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,6 @@ export function MetadataForm({
110110
<Label for="name" required>
111111
{t('CreateProjectWorkspaceDialog.nameLabel')}
112112
</Label>
113-
<Input
114-
className={styles.input}
115-
id="name"
116-
{...register('name')}
117-
valueState={errors.name ? 'Negative' : 'None'}
118-
valueStateMessage={<span>{errors.name?.message}</span>}
119-
required
120-
disabled={isEditMode}
121-
/>
122113

123114
{resolvedNamePrefix || resolvedNameSuffix ? (
124115
<div className={styles.affixRow}>
@@ -140,6 +131,7 @@ export function MetadataForm({
140131
valueState={errors.name ? 'Negative' : 'None'}
141132
valueStateMessage={<span>{errors.name?.message}</span>}
142133
required
134+
disabled={isEditMode}
143135
onInput={onNameCoreInput}
144136
/>
145137
{resolvedNameSuffix ? (
@@ -160,6 +152,7 @@ export function MetadataForm({
160152
valueState={errors.name ? 'Negative' : 'None'}
161153
valueStateMessage={<span>{errors.name?.message}</span>}
162154
required
155+
disabled={isEditMode}
163156
/>
164157
)}
165158

@@ -188,7 +181,9 @@ export function MetadataForm({
188181
/>
189182
) : null}
190183
</div>
191-
) : ( <Input id="displayName" {...register('displayName')} className={styles.input} />)}
184+
) : (
185+
<Input id="displayName" {...register('displayName')} className={styles.input} />
186+
)}
192187
<div>
193188
<Label for={'chargingTargetType'}>{t('CreateProjectWorkspaceDialog.chargingTargetTypeLabel')}</Label>
194189
</div>
@@ -197,10 +192,16 @@ export function MetadataForm({
197192
value={watch?.('chargingTargetType') ?? ''}
198193
id={'chargingTargetType'}
199194
className={styles.input}
200-
disabled={disableChargingFields} onChange={handleChargingTargetTypeChange}
195+
disabled={disableChargingFields}
196+
onChange={handleChargingTargetTypeChange}
201197
>
202198
{chargingTypes.map((option) => (
203-
<Option key={option.value} value={option.value} data-value={option.value} selected={currentChargingTargetType === option.value}>
199+
<Option
200+
key={option.value}
201+
value={option.value}
202+
data-value={option.value}
203+
selected={currentChargingTargetType === option.value}
204+
>
204205
{option.label}
205206
</Option>
206207
))}

0 commit comments

Comments
 (0)