fixes

Author: lucasgoral

src/components/ComponentsSelection/ComponentsSelectionContainer.tsx

@@ -16,6 +16,7 @@ export interface ComponentsSelectionProps {
   setComponentsList: (components: ComponentsListItem[]) => void;
   managedControlPlaneTemplate?: ManagedControlPlaneTemplate;
   initialSelection?: Record<string, { isSelected: boolean; version: string }>;
+  isOnMcpPage?: boolean;
 }
 
 /**
@@ -42,8 +43,13 @@ export const ComponentsSelectionContainer: React.FC<ComponentsSelectionProps> =
   componentsList,
   managedControlPlaneTemplate,
   initialSelection,
+  isOnMcpPage,
 }) => {
-  const { data: availableManagedComponentsListData, error, isLoading } = useApiResource(ListManagedComponents());
+  const {
+    data: availableManagedComponentsListData,
+    error,
+    isLoading,
+  } = useApiResource(ListManagedComponents(), undefined, !!isOnMcpPage);
   const { t } = useTranslation();
   const initialized = useRef(false);
   const [templateDefaultsError, setTemplateDefaultsError] = useState<string | null>(null);

src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCardMenu.tsx

@@ -7,10 +7,16 @@ import '@ui5/webcomponents-icons/dist/accept';
 import { useTranslation } from 'react-i18next';
 
 type ControlPlanesListMenuProps = {
+  setDialogDeleteMcpIsOpen: Dispatch<SetStateAction<boolean>>;
+  isDeleteMcpButtonDisabled: boolean;
   setIsEditManagedControlPlaneWizardOpen: Dispatch<SetStateAction<boolean>>;
 };
 
-export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({ setIsEditManagedControlPlaneWizardOpen }) => {
+export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({
+  setDialogDeleteMcpIsOpen,
+  isDeleteMcpButtonDisabled,
+  setIsEditManagedControlPlaneWizardOpen,
+}) => {
   const buttonRef = useRef(null);
   const [menuIsOpen, setMenuIsOpen] = useState(false);
   const { t } = useTranslation();
@@ -30,14 +36,30 @@ export const ControlPlaneCardMenu: FC<ControlPlanesListMenuProps> = ({ setIsEdit
           if (action === 'editMcp') {
             setIsEditManagedControlPlaneWizardOpen(true);
           }
+          if (action === 'deleteMcp') {
+            setDialogDeleteMcpIsOpen(true);
+          }
 
           setMenuIsOpen(false);
         }}
         onClose={() => {
           setMenuIsOpen(false);
         }}
       >
-        <MenuItem key={'edit'} text={t('ControlPlaneCard.editMCP')} data-action="editMcp" icon="edit" />
+        <MenuItem
+          key={'delete'}
+          text={t('ControlPlaneCard.deleteMCP')}
+          data-action="deleteMcp"
+          icon="delete"
+          disabled={isDeleteMcpButtonDisabled}
+        />
+        <MenuItem
+          key={'edit'}
+          text={t('ControlPlaneCard.editMCP')}
+          data-action="editMcp"
+          icon="edit"
+          disabled={isDeleteMcpButtonDisabled}
+        />
       </Menu>
     </>
   );

src/components/ControlPlanes/ControlPlanePageMenu.tsx

@@ -1,22 +1,12 @@
-import { Button, Menu, MenuItem } from '@ui5/webcomponents-react';
-
 import { Dispatch, FC, SetStateAction, useRef, useState } from 'react';
-import '@ui5/webcomponents-icons/dist/copy';
-import '@ui5/webcomponents-icons/dist/accept';
-
 import { useTranslation } from 'react-i18next';
+import { Button, Menu, MenuItem } from '@ui5/webcomponents-react';
 
 type ControlPlanesListMenuProps = {
-  setDialogDeleteMcpIsOpen: Dispatch<SetStateAction<boolean>>;
-  isDeleteMcpButtonDisabled: boolean;
   setIsEditManagedControlPlaneWizardOpen: Dispatch<SetStateAction<boolean>>;
 };
 
-export const ControlPlanePageeMenu: FC<ControlPlanesListMenuProps> = ({
-  setDialogDeleteMcpIsOpen,
-  isDeleteMcpButtonDisabled,
-  setIsEditManagedControlPlaneWizardOpen,
-}) => {
+export const ControlPlanePageMenu: FC<ControlPlanesListMenuProps> = ({ setIsEditManagedControlPlaneWizardOpen }) => {
   const buttonRef = useRef(null);
   const [menuIsOpen, setMenuIsOpen] = useState(false);
   const { t } = useTranslation();
@@ -36,30 +26,14 @@ export const ControlPlanePageeMenu: FC<ControlPlanesListMenuProps> = ({
           if (action === 'editMcp') {
             setIsEditManagedControlPlaneWizardOpen(true);
           }
-          if (action === 'deleteMcp') {
-            setDialogDeleteMcpIsOpen(true);
-          }
 
           setMenuIsOpen(false);
         }}
         onClose={() => {
           setMenuIsOpen(false);
         }}
       >
-        <MenuItem
-          key={'delete'}
-          text={t('ControlPlaneCard.deleteMCP')}
-          data-action="deleteMcp"
-          icon="delete"
-          disabled={isDeleteMcpButtonDisabled}
-        />
-        <MenuItem
-          key={'edit'}
-          text={t('ControlPlaneCard.editMCP')}
-          data-action="editMcp"
-          icon="edit"
-          disabled={isDeleteMcpButtonDisabled}
-        />
+        <MenuItem key={'edit'} text={t('ControlPlaneCard.editMCP')} data-action="editMcp" icon="edit" />
       </Menu>
     </>
   );

src/components/Wizards/CreateManagedControlPlane/CreateManagedControlPlaneWizardContainer.tsx

@@ -58,6 +58,7 @@ type CreateManagedControlPlaneWizardContainerProps = {
   isEditMode: boolean;
   initialTemplateName?: string;
   initialData?: ManagedControlPlaneInterface;
+  isOnMcpPage?: boolean;
 };
 
 type WizardStepType = 'metadata' | 'members' | 'componentSelection' | 'summarize' | 'success';
@@ -72,6 +73,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
   isEditMode = false,
   initialTemplateName,
   initialData,
+  isOnMcpPage = false,
 }) => {
   const { t } = useTranslation();
   const { user } = useAuthOnboarding();
@@ -123,7 +125,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
     setValue,
     reset,
     watch,
-    getValues,
+
     formState: { errors, isValid },
   } = useForm<CreateDialogProps>({
     resolver: zodResolver(validationSchemaCreateManagedControlPlane),
@@ -154,8 +156,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
 
     setMetadataFormKey((k) => k + 1);
   }, [selectedTemplate, selectedStep, setValue, normalizeChargingTargetType]);
-  console.log(getValues());
-  console.log(errors);
+
   const nextButtonText = useMemo(
     () => ({
       metadata: t('buttons.next'),
@@ -194,6 +195,8 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
   );
   const { trigger: triggerUpdate } = useApiResourceMutation<CreateManagedControlPlaneType>(
     UpdateManagedControlPlaneResource(projectName, workspaceName, initialData?.metadata?.name ?? ''),
+    undefined,
+    !!isOnMcpPage,
   );
   const componentsList = watch('componentsList');
 
@@ -571,6 +574,7 @@ export const CreateManagedControlPlaneWizardContainer: FC<CreateManagedControlPl
                 setComponentsList={setComponentsList}
                 initialSelection={initialSelection}
                 managedControlPlaneTemplate={selectedTemplate}
+                isOnMcpPage={isOnMcpPage}
               />
             )}
           </WizardStep>

src/components/Wizards/CreateManagedControlPlane/EditManagedControlPlaneWizardDataLoader.tsx

@@ -5,21 +5,24 @@ import styles from './EditManagedControlPlaneWizardDataLoader.module.css';
 
 import { CreateManagedControlPlaneWizardContainer } from './CreateManagedControlPlaneWizardContainer.tsx';
 import { PROJECT_NAME_LABEL, WORKSPACE_LABEL } from '../../../lib/api/types/shared/keyNames.ts';
-import { ManagedControlPlaneInterface } from './mcp_type.ts';
+
 import { BusyIndicator } from '@ui5/webcomponents-react';
+import { ManagedControlPlaneInterface } from '../../../lib/api/types/mcpResource.ts';
 
 export type EditManagedControlPlaneWizardDataLoaderProps = {
   workspaceName?: string;
   resourceName: string;
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
+  isOnMcpPage?: boolean;
 };
 
 export const EditManagedControlPlaneWizardDataLoader: FC<EditManagedControlPlaneWizardDataLoaderProps> = ({
   workspaceName,
   resourceName,
   isOpen,
   setIsOpen,
+  isOnMcpPage = false,
 }) => {
   const { isLoading, data, error } = useApiResource(
     ResourceObject<ManagedControlPlaneInterface>(workspaceName ?? '', 'managedcontrolplanes', resourceName),
@@ -49,6 +52,7 @@ export const EditManagedControlPlaneWizardDataLoader: FC<EditManagedControlPlane
           workspaceName={data?.metadata?.labels?.[WORKSPACE_LABEL]}
           isEditMode={true}
           initialData={data}
+          isOnMcpPage={isOnMcpPage}
         />
       ) : null}
     </>

src/lib/api/useApiResource.ts

@@ -158,6 +158,7 @@ export const useApiResourceMutation = <T>(
   resource: Resource<T>,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   config?: SWRMutationConfiguration<T, any, any, any>,
+  excludeMcpConfig?: boolean,
 ) => {
   const apiConfig = useContext(ApiConfigContext);
 
@@ -167,7 +168,13 @@ export const useApiResourceMutation = <T>(
       : [resource.path, apiConfig],
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ([path, apiConfig]: [path: string, config: ApiConfig], arg: any) =>
-      fetchApiServerJson<T>(path, apiConfig, resource.jq, resource.method, JSON.stringify(arg.arg)),
+      fetchApiServerJson<T>(
+        path,
+        excludeMcpConfig ? { ...apiConfig, mcpConfig: undefined } : apiConfig,
+        resource.jq,
+        resource.method,
+        JSON.stringify(arg.arg),
+      ),
     config,
   );
 

src/spaces/mcp/pages/McpPage.tsx

@@ -99,6 +99,7 @@ export default function McpPage() {
                       setIsOpen={setIsEditManagedControlPlaneWizardOpen}
                       workspaceName={mcp?.status?.access?.namespace}
                       resourceName={controlPlaneName}
+                      isOnMcpPage
                     />
                   </div>
                 }