refactor

lucasgoral · lucasgoral · commit 5eecd457c5c9 · 2025-11-12T14:37:01.000+01:00
diff --git a/src/components/ControlPlane/GitRepositories.tsx b/src/components/ControlPlane/GitRepositories.tsx
@@ -57,7 +57,6 @@ export function GitRepositories() {
             isEdit={true}
             resource={item as unknown as Resource}
             filename={`${item.kind}_${item.metadata.name}`}
-            customResourceDefinitionName={'gitrepositories'}
             onApply={async (parsed) => await handlePatch(item, parsed)}
           />
         </Fragment>,
@@ -111,7 +110,6 @@ export function GitRepositories() {
               <YamlViewButton
                 variant="resource"
                 resource={item as unknown as Resource}
-                customResourceDefinitionName={'gitrepositories'}
                 toolbarContent={
                   hasMCPAdminRights ? (
                     <Button
diff --git a/src/components/ControlPlane/Kustomizations.tsx b/src/components/ControlPlane/Kustomizations.tsx
@@ -10,12 +10,12 @@ import {
 import IllustratedError from '../Shared/IllustratedError.tsx';
 import { useApiResource } from '../../lib/api/useApiResource';
 import { FluxKustomization } from '../../lib/api/types/flux/listKustomization';
-import { CustomResourceDefinitions } from '../../lib/api/types/k8s/listCustomResourceDefinition';
+
 import { useTranslation } from 'react-i18next';
 import { formatDateAsTimeAgo } from '../../utils/i18n/timeAgo.ts';
 
 import { YamlViewButton } from '../Yaml/YamlViewButton.tsx';
-import { Fragment, useCallback, useMemo, useRef, useEffect } from 'react';
+import { Fragment, useCallback, useMemo, useRef } from 'react';
 import StatusFilter from '../Shared/StatusFilter/StatusFilter.tsx';
 import { ResourceStatusCell } from '../Shared/ResourceStatusCell.tsx';
 import { Resource } from '../../utils/removeManagedFieldsAndFilterData.ts';
@@ -34,7 +34,7 @@ export type KustomizationItem = KustomizationsResponse['items'][0] & {
 
 export function Kustomizations() {
   const { data, error, isLoading } = useApiResource(FluxKustomization); //404 if component not enabled
-  const { data: crdData } = useApiResource(CustomResourceDefinitions);
+
   const { t } = useTranslation();
   const { openInAside } = useSplitter();
   const errorDialogRef = useRef<ErrorDialogHandle>(null);
@@ -55,7 +55,6 @@ export function Kustomizations() {
       openInAside(
         <Fragment key={identityKey}>
           <YamlSidePanel
-            customResourceDefinitionName={'kustomizations'}
             isEdit={true}
             resource={item as unknown as Resource}
             filename={`${item.kind}_${item.metadata.name}`}
@@ -107,7 +106,6 @@ export function Kustomizations() {
             const item = row.original?.item;
             return item ? (
               <YamlViewButton
-                customResourceDefinitionName={'kustomizations'}
                 variant="resource"
                 resource={item as unknown as Resource}
                 toolbarContent={
@@ -186,11 +184,7 @@ export function Kustomizations() {
       header={
         <Toolbar>
           <Title>{t('common.resourcesCount', { count: rows.length })}</Title>
-          <YamlViewButton
-            variant="resource"
-            resource={data as unknown as Resource}
-            customResourceDefinitionName={'kustomizations'}
-          />
+          <YamlViewButton variant="resource" resource={data as unknown as Resource} />
           <ToolbarSpacer />
         </Toolbar>
       }
diff --git a/src/components/ControlPlane/ManagedResources.tsx b/src/components/ControlPlane/ManagedResources.tsx
@@ -110,7 +110,6 @@ export function ManagedResources() {
       openInAside(
         <Fragment key={identityKey}>
           <YamlSidePanel
-            customResourceDefinitionName={'cloudmanagements'}
             isEdit={true}
             resource={item as unknown as Resource}
             filename={`${item.kind}_${item.metadata.name}`}
@@ -186,7 +185,6 @@ export function ManagedResources() {
             const isFluxManaged = isResourceFluxManaged(original?.item);
             return original?.item ? (
               <YamlViewButton
-                customResourceDefinitionName={'cloudmanagements'}
                 variant="resource"
                 resource={original.item as unknown as Resource}
                 toolbarContent={
diff --git a/src/components/ControlPlane/Providers.tsx b/src/components/ControlPlane/Providers.tsx
@@ -105,11 +105,7 @@ export function Providers() {
         accessor: 'yaml',
         disableFilters: true,
         Cell: (cellData) => (
-          <YamlViewButton
-            variant="resource"
-            resource={cellData.cell.row.original?.item as Resource}
-            customResourceDefinitionName={'providers'}
-          />
+          <YamlViewButton variant="resource" resource={cellData.cell.row.original?.item as Resource} />
         ),
       },
     ],
diff --git a/src/components/ControlPlane/ProvidersConfig.tsx b/src/components/ControlPlane/ProvidersConfig.tsx
@@ -69,7 +69,6 @@ export function ProvidersConfig() {
             isEdit={true}
             resource={item as unknown as Resource}
             filename={`${item.kind}_${item.metadata.name}`}
-            customResourceDefinitionName={'providerconfigs'}
             onApply={async (parsed) => await handlePatch(item, parsed)}
           />
         </Fragment>,
@@ -109,7 +108,6 @@ export function ProvidersConfig() {
               <YamlViewButton
                 variant="resource"
                 resource={item as unknown as Resource}
-                customResourceDefinitionName={'providerconfigs'}
                 toolbarContent={
                   hasMCPAdminRights ? (
                     <Button
diff --git a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx
@@ -99,7 +99,6 @@ export const ControlPlaneCard = ({
                   workspaceName={controlPlane.metadata.namespace}
                   resourceName={controlPlane.metadata.name}
                   resourceType={'managedcontrolplanes'}
-                  customResourceDefinitionName={'managedcontrolplanes'}
                 />
                 {showWarningBecauseOfDisabledSystemIdentityProvider && (
                   <Infobox size="sm" variant="warning">
diff --git a/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx b/src/components/ControlPlanes/List/ControlPlaneListWorkspaceGridTile.tsx
@@ -126,7 +126,6 @@ export function ControlPlaneListWorkspaceGridTile({
                   workspaceName={workspace.metadata.namespace}
                   resourceName={workspaceName}
                   resourceType={'workspaces'}
-                  customResourceDefinitionName={'workspaces'}
                 />
                 <ControlPlanesListMenu
                   setDialogDeleteWsIsOpen={setDialogDeleteWsIsOpen}
diff --git a/src/components/Projects/ProjectsList.tsx b/src/components/Projects/ProjectsList.tsx
@@ -93,7 +93,6 @@ export default function ProjectsList() {
               variant="loader"
               resourceType={'projects'}
               resourceName={instance.cell.row.original?.projectName as string}
-              customResourceDefinitionName={'projects'}
             />
           </div>
         ),
diff --git a/src/components/Yaml/YamlSidePanel.tsx b/src/components/Yaml/YamlSidePanel.tsx
@@ -11,7 +11,7 @@ import {
 } from '@ui5/webcomponents-react';
 import IllustrationMessageType from '@ui5/webcomponents-fiori/dist/types/IllustrationMessageType.js';
 import { useTranslation } from 'react-i18next';
-import { CustomResourceDefinitionName, YamlViewerSchemaLoader } from './YamlViewerSchemaLoader.tsx';
+import { YamlViewerSchemaLoader } from './YamlViewerSchemaLoader.tsx';
 import { useSplitter } from '../Splitter/SplitterContext.tsx';
 import { useMemo, useState, useCallback, JSX } from 'react';
 import { stringify } from 'yaml';
@@ -31,19 +31,10 @@ export interface YamlSidePanelProps {
   onApply?: (parsed: unknown, yaml: string) => void | boolean | Promise<void | boolean>;
   isEdit?: boolean;
   toolbarContent?: JSX.Element;
-  customResourceDefinitionName?: CustomResourceDefinitionName;
   apiConfig?: ApiConfig;
 }
 
-export function YamlSidePanel({
-  resource,
-  filename,
-  onApply,
-  isEdit,
-  toolbarContent,
-  customResourceDefinitionName,
-  apiConfig,
-}: YamlSidePanelProps) {
+export function YamlSidePanel({ resource, filename, onApply, isEdit, toolbarContent, apiConfig }: YamlSidePanelProps) {
   const [showOnlyImportantData, setShowOnlyImportantData] = useState(true);
   const [mode, setMode] = useState<'edit' | 'review' | 'success'>('edit');
   const [editedYaml, setEditedYaml] = useState<string | null>(null);
@@ -94,6 +85,7 @@ export function YamlSidePanel({
 
   const apiGroupName = resource?.apiVersion?.split('/')[0] ?? 'core.openmcp.cloud';
   const apiVersion = resource?.apiVersion?.split('/')[1] ?? 'v1alpha1';
+  const kind = resource?.kind;
 
   return (
     <Panel
@@ -175,10 +167,10 @@ export function YamlSidePanel({
             yamlString={yamlStringToDisplay}
             filename={filename}
             isEdit={isEdit}
-            customResourceDefinitionName={customResourceDefinitionName}
             apiGroupName={apiGroupName}
             apiVersion={apiVersion}
             apiConfig={apiConfig}
+            kind={kind}
             onApply={handleApplyFromEditor}
           />
         )}
diff --git a/src/components/Yaml/YamlSidePanelWithLoader.tsx b/src/components/Yaml/YamlSidePanelWithLoader.tsx
@@ -8,23 +8,23 @@ import { Resource } from '../../utils/removeManagedFieldsAndFilterData.ts';
 import { YamlSidePanel } from './YamlSidePanel.tsx';
 import { CustomResourceDefinitionObject } from '../../lib/api/types/crate/customResourceDefinitionObject.ts';
 import { CustomResourceDefinition } from '../../types/customResourceDefinition.ts';
-import { CustomResourceDefinitionName } from './YamlViewerSchemaLoader.tsx';
+
 import { ApiConfig } from '../../lib/api/types/apiConfig.ts';
 
 export interface YamlSidePanelWithLoaderProps {
   workspaceName?: string;
   resourceType: 'projects' | 'workspaces' | 'managedcontrolplanes';
   resourceName: string;
   isEdit?: boolean;
-  customResourceDefinitionName?: CustomResourceDefinitionName;
+
   apiConfig?: ApiConfig;
 }
 export function YamlSidePanelWithLoader({
   workspaceName,
   resourceType,
   resourceName,
   isEdit = false,
-  customResourceDefinitionName,
+
   apiConfig,
 }: YamlSidePanelWithLoaderProps) {
   const { t } = useTranslation();
@@ -48,13 +48,5 @@ export function YamlSidePanelWithLoader({
 
   const filename = `${workspaceName ? `${workspaceName}_` : ''}${resourceType}_${resourceName}`;
 
-  return (
-    <YamlSidePanel
-      resource={data as Resource}
-      filename={filename}
-      isEdit={isEdit}
-      customResourceDefinitionName={customResourceDefinitionName}
-      apiConfig={apiConfig}
-    />
-  );
+  return <YamlSidePanel resource={data as Resource} filename={filename} isEdit={isEdit} apiConfig={apiConfig} />;
 }
diff --git a/src/components/Yaml/YamlViewButton.tsx b/src/components/Yaml/YamlViewButton.tsx
@@ -8,25 +8,23 @@ import { useSplitter } from '../Splitter/SplitterContext.tsx';
 import { YamlSidePanel } from './YamlSidePanel.tsx';
 import { YamlSidePanelWithLoader } from './YamlSidePanelWithLoader.tsx';
 import { JSX, useContext } from 'react';
-import { CustomResourceDefinitionName } from './YamlViewerSchemaLoader.tsx';
+
 import { ApiConfigContext } from '../Shared/k8s';
 
 export interface YamlViewButtonResourceProps {
   variant: 'resource';
   resource: Resource;
   toolbarContent?: JSX.Element;
-  customResourceDefinitionName?: CustomResourceDefinitionName;
 }
 export interface YamlViewButtonLoaderProps {
   variant: 'loader';
   workspaceName?: string;
   resourceType: 'projects' | 'workspaces' | 'managedcontrolplanes';
   resourceName: string;
-  customResourceDefinitionName?: CustomResourceDefinitionName;
 }
 export type YamlViewButtonProps = YamlViewButtonResourceProps | YamlViewButtonLoaderProps;
 
-export function YamlViewButton({ variant, customResourceDefinitionName, ...props }: YamlViewButtonProps) {
+export function YamlViewButton({ variant, ...props }: YamlViewButtonProps) {
   const { t } = useTranslation();
   const { openInAside } = useSplitter();
   const apiConfig = useContext(ApiConfigContext);
@@ -40,7 +38,6 @@ export function YamlViewButton({ variant, customResourceDefinitionName, ...props
             resource={resource}
             filename={`${resource?.kind ?? ''}${resource?.metadata?.name ? '_' : ''}${resource?.metadata?.name ?? ''}`}
             toolbarContent={toolbarContent}
-            customResourceDefinitionName={customResourceDefinitionName}
             apiConfig={apiConfig}
           />,
         );
@@ -55,7 +52,6 @@ export function YamlViewButton({ variant, customResourceDefinitionName, ...props
             workspaceName={workspaceName}
             resourceType={resourceType}
             resourceName={resourceName}
-            customResourceDefinitionName={customResourceDefinitionName}
             apiConfig={apiConfig}
           />,
         );
diff --git a/src/components/Yaml/YamlViewerSchemaLoader.tsx b/src/components/Yaml/YamlViewerSchemaLoader.tsx
@@ -7,40 +7,33 @@ import { CustomResourceDefinition } from '../../types/customResourceDefinition.t
 import openapiSchemaToJsonSchema from '@openapi-contrib/openapi-schema-to-json-schema';
 
 import { ApiConfig } from '../../lib/api/types/apiConfig.ts';
+import { getCustomResourceDefinitionPluralName } from '../../utils/getPluralName.ts';
 
 interface YamlViewerSchemaLoaderProps extends YamlViewerProps {
-  customResourceDefinitionName?: CustomResourceDefinitionName;
   apiVersion: string;
   apiGroupName: string;
   apiConfig?: ApiConfig;
+  kind?: string;
 }
 
-export type CustomResourceDefinitionName =
-  | 'workspaces'
-  | 'projects'
-  | 'managedcontrolplanes'
-  | 'providerconfigs'
-  | 'providers'
-  | 'cloudmanagements'
-  | 'gitrepositories'
-  | 'kustomizations';
 export const YamlViewerSchemaLoader: FC<YamlViewerSchemaLoaderProps> = ({
   yamlString,
   filename,
   isEdit = false,
   onApply,
-  customResourceDefinitionName,
   apiGroupName,
   apiVersion,
   apiConfig,
+  kind,
 }) => {
+  const customResourceDefinitionName = getCustomResourceDefinitionPluralName(kind);
   const { data: crdData, isLoading } = useApiResource<CustomResourceDefinition>(
     {
       path: `/apis/apiextensions.k8s.io/v1/customresourcedefinitions/${customResourceDefinitionName}.${apiGroupName}`,
     },
     undefined,
     apiConfig?.mcpConfig,
-    false,
+    !customResourceDefinitionName,
   );
 
   const schema =
diff --git a/src/lib/api/types/crate/resourceObject.ts b/src/lib/api/types/crate/resourceObject.ts
@@ -5,4 +5,3 @@ export const ResourceObject = <T>(workspaceName: string, resourceType: string, r
     path: `/apis/core.openmcp.cloud/v1alpha1/${workspaceName ? `namespaces/${workspaceName}/` : ''}${resourceType}/${resourceName}`,
   };
 };
-
diff --git a/src/spaces/mcp/pages/McpPage.tsx b/src/spaces/mcp/pages/McpPage.tsx
@@ -116,7 +116,6 @@ export default function McpPage() {
                       workspaceName={mcp?.status?.access?.namespace}
                       resourceType={'managedcontrolplanes'}
                       resourceName={controlPlaneName}
-                      customResourceDefinitionName={'managedcontrolplanes'}
                     />
                     <CopyKubeconfigButton />
                     <ControlPlanePageMenu
diff --git a/src/utils/getPluralName.ts b/src/utils/getPluralName.ts
@@ -0,0 +1,22 @@
+const mapCustomResourceDefinitionToPlural = {
+  workspace: 'workspaces',
+  project: 'projects',
+  managedcontrolplane: 'managedcontrolplanes',
+  providerconfig: 'providerconfigs',
+  provider: 'providers',
+  cloudmanagent: 'cloudmanagements',
+  gitrepository: 'gitrepositories',
+  kustomization: 'kustomizations',
+};
+
+export const getCustomResourceDefinitionPluralName = (kind?: string): string | undefined => {
+  if (!kind) {
+    return undefined;
+  }
+
+  const lowerCaseKind = kind.toLowerCase();
+  const mappedValue =
+    mapCustomResourceDefinitionToPlural[lowerCaseKind as keyof typeof mapCustomResourceDefinitionToPlural];
+
+  return mappedValue ?? `${lowerCaseKind}s`;
+};
