refactor

Author: lucasgoral

public/locales/en.json

@@ -235,5 +235,9 @@
     "max25chars": "Max length is 25 characters.",
     "userExists": "User with this email already exists!",
     "atLeastOneUser": "You need to have at least one member assigned."
+  },
+  "common": {
+    "close": "Close",
+    "cannotLoadData": "Cannot load data"
   }
 }

src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx

@@ -93,9 +93,8 @@ export function ControlPlaneCard({
               >
                 <YamlViewButton
                   workspaceName={controlPlane.metadata.namespace}
-                  projectName={controlPlane.metadata.name}
                   resourceName={controlPlane.metadata.name}
-                  resourceType={'managedcontrolplane'}
+                  resourceType={'managedcontrolplanes'}
                 />
                 <ConnectButton
                   disabled={controlPlane.status?.status !== ReadyStatus.Ready}

src/components/Yaml/YamlLoader.tsx

@@ -5,23 +5,22 @@ import useResource from '@lib/api/useApiResource.ts';
 import { ResourceObject } from '@lib/api/types/crate/resourceObject.ts';
 import { stringify } from 'yaml';
 import YamlViewer from '@components/Yaml/YamlViewer.tsx';
+import IllustratedError from '@components/Shared/IllustratedError.tsx';
+import { useTranslation } from 'react-i18next';
 
 export const YamlLoader: FC<ResourceProps> = ({
   workspaceName,
-  projectName,
   resourceType,
   resourceName,
 }) => {
-  // const { data, loading } = useManagedControlPlaneYamlQuery(
-  //   workspaceName,
-  //   projectName,
-  // );
-
-  const { isLoading, data } = useResource(
-    ResourceObject(projectName, workspaceName, resourceType, resourceName),
+  const { isLoading, data, error } = useResource(
+    ResourceObject(workspaceName, resourceType, resourceName),
   );
+  const { t } = useTranslation();
   if (isLoading) return <Loading />;
-  // if (!workspaceName || !projectName || !resourceName || resourceType)
-  //   return <div />;
+  if (!workspaceName || !resourceName || !resourceType || error) {
+    return <IllustratedError error={t('common.cannotLoadData')} />;
+  }
+
   return <YamlViewer yamlString={stringify(data)} />;
 };

src/components/Yaml/YamlViewButton.tsx

@@ -1,22 +1,21 @@
 import { Bar, Button, Dialog } from '@ui5/webcomponents-react';
 import { FC, useState } from 'react';
 import { YamlLoader } from './YamlLoader.tsx';
+import { useTranslation } from 'react-i18next';
 
 export type ResourceProps = {
-  projectName: string;
   workspaceName: string;
   resourceType: string;
   resourceName: string;
 };
 
 export const YamlViewButton: FC<ResourceProps> = ({
-  projectName,
   workspaceName,
   resourceType,
   resourceName,
 }) => {
   const [isOpen, setIsOpen] = useState(false);
-
+  const { t } = useTranslation();
   return (
     <>
       <Dialog
@@ -27,15 +26,14 @@ export const YamlViewButton: FC<ResourceProps> = ({
             design="Footer"
             endContent={
               <Button design="Emphasized" onClick={() => setIsOpen(false)}>
-                Close
+                {t('common.close')}
               </Button>
             }
           />
         }
       >
         <YamlLoader
           workspaceName={workspaceName}
-          projectName={projectName}
           resourceName={resourceName}
           resourceType={resourceType}
         />

src/lib/api/types/crate/resourceObject.ts

@@ -2,13 +2,11 @@ import { Resource } from '../resource.ts';
 import { ControlPlaneType } from './controlPlanes.ts';
 
 export const ResourceObject = (
-  projectName: string,
   workspaceName: string,
-  resourceType: string = 'mcp',
+  resourceType: string,
   resourceName: string,
 ): Resource<ControlPlaneType> => {
-  console.log('CP1');
   return {
-    path: `/apis/core.openmcp.cloud/v1alpha1/namespaces/project-${projectName}--ws-${workspaceName}/${resourceType}/${resourceName}`,
+    path: `/apis/core.openmcp.cloud/v1alpha1/namespaces/${workspaceName}/${resourceType}/${resourceName}`,
   };
 };

src/views/ControlPlanes/ControlPlaneView.tsx

@@ -57,7 +57,6 @@ export default function ControlPlaneView() {
     return <IllustratedError error={t('ControlPlaneView.accessError')} />;
   }
 
-  console.log(mcp);
   return (
     <McpContextProvider
       context={{
@@ -86,7 +85,6 @@ export default function ControlPlaneView() {
                   <MCPHealthPopoverButton mcpStatus={mcp?.status} />
                   <YamlViewButton
                     workspaceName={''}
-                    projectName={''}
                     resourceType={''}
                     resourceName={''}
                   />