Merge branch 'main' into mcp-Visualize-members-and-status-in-header-area

lucasgoral · lucasgoral · commit b0cfb3606523 · 2025-12-04T13:24:53.000+01:00
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -15,6 +15,10 @@ vars:
   OCM_OUTPUT_DIR: '{{.ROOT_DIR}}/.ctf'
   OCM_DESCRIPTOR: '{{.ROOT_DIR}}/ocm/component-descriptor.yaml'
 
+  # Backend Image Version
+  BACKEND_IMAGE_URL: ghcr.io/openmcp-project/mcp-ui-backend
+  BACKEND_IMAGE_VERSION: v0.7.1
+
   ROOT_DIR2: '{{.ROOT_DIR | trimSuffix "/common" | trimSuffix "/hack"}}'
   LOCALBIN: '{{ env "LOCALBIN" | default ( .LOCALBIN | default (print .ROOT_DIR2 "/.bin") ) }}'
   OCM: '{{ .OCM | default (print .LOCALBIN "/ocm") }}'
@@ -39,7 +43,9 @@ tasks:
           VERSION={{.OCM_COMPONENT_VERSION}} \
           IMAGE_VERSION={{.IMAGE_VERSION}} \
           COMPONENT_NAME={{.OCM_COMPONENT_NAME}} \
-          PROVIDER={{.OCM_PROVIDER}}
+          PROVIDER={{.OCM_PROVIDER}} \
+          BACKEND_IMAGE_URL={{.BACKEND_IMAGE_URL}} \
+          BACKEND_IMAGE_VERSION={{.BACKEND_IMAGE_VERSION}}
     vars:
       IMAGE_VERSION: '{{.IMAGE_VERSION | default (print .OCM_COMPONENT_VERSION)}}'
 
diff --git a/VERSION b/VERSION
diff --git a/ocm/component-descriptor.yaml b/ocm/component-descriptor.yaml
@@ -11,3 +11,9 @@ resources:
     access:
       type: ociArtifact
       imageReference: ghcr.io/openmcp-project/mcp-ui-frontend:${IMAGE_VERSION}
+  - name: mcp-ui-backend-image
+    type: ociImage
+    version: ${BACKEND_IMAGE_VERSION}
+    access:
+      type: ociArtifact
+      imageReference: ${BACKEND_IMAGE_URL}:${BACKEND_IMAGE_VERSION}
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -524,5 +524,14 @@
     "branchTitle": "Branch",
     "gitRepositoryCreated": "Git Repository created successfully",
     "gitRepositoryCreationFailed": "Failed to create Git Repository: {{error}}"
+  },
+  "mcp": {
+    "authorization": {
+      "accessDenied": {
+        "title": "Access Denied",
+        "details": "You are not authorized to see this Managed Control Plane."
+      },
+      "backToWorkspaces": "Back to Workspaces"
+    }
   }
 }
diff --git a/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx b/src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx
@@ -100,20 +100,21 @@ export const ControlPlaneCard = ({
                   resourceName={controlPlane.metadata.name}
                   resourceType={'managedcontrolplanes'}
                 />
-                {showWarningBecauseOfDisabledSystemIdentityProvider && (
-                  <Infobox size="sm" variant="warning">
+                {showWarningBecauseOfDisabledSystemIdentityProvider ? (
+                  <Infobox size="sm" variant="warning" noMargin>
                     {t('ConnectButton.unsupportedIdP')}
                   </Infobox>
+                ) : (
+                  <ConnectButton
+                    disabled={!isConnectButtonEnabled}
+                    controlPlaneName={name}
+                    projectName={projectName}
+                    workspaceName={workspace.metadata.name ?? ''}
+                    namespace={controlPlane.status?.access?.namespace ?? ''}
+                    secretName={controlPlane.status?.access?.name ?? ''}
+                    secretKey={controlPlane.status?.access?.key ?? ''}
+                  />
                 )}
-                <ConnectButton
-                  disabled={!isConnectButtonEnabled}
-                  controlPlaneName={name}
-                  projectName={projectName}
-                  workspaceName={workspace.metadata.name ?? ''}
-                  namespace={controlPlane.status?.access?.namespace ?? ''}
-                  secretName={controlPlane.status?.access?.name ?? ''}
-                  secretKey={controlPlane.status?.access?.key ?? ''}
-                />
               </FlexBox>
             </FlexBox>
           </FlexBox>
diff --git a/src/components/Ui/Center/Center.module.css b/src/components/Ui/Center/Center.module.css
@@ -0,0 +1,12 @@
+.wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+}
+
+.textAlignCenter {
+  text-align: center;
+}
diff --git a/src/components/Ui/Center/Center.tsx b/src/components/Ui/Center/Center.tsx
@@ -0,0 +1,19 @@
+import type { PropsWithChildren, ReactNode, CSSProperties } from 'react';
+import cx from 'clsx';
+import styles from './Center.module.css';
+
+export type CenterProps = PropsWithChildren<{
+  className?: string;
+  style?: CSSProperties;
+  textAlignCenter?: boolean;
+}>;
+
+export const Center = ({ children, className, style, textAlignCenter = true }: CenterProps): ReactNode => {
+  const classes = cx(styles.wrapper, { [styles.textAlignCenter]: textAlignCenter }, className);
+
+  return (
+    <div className={classes} style={style}>
+      {children}
+    </div>
+  );
+};
diff --git a/src/components/Ui/Infobox/Infobox.module.css b/src/components/Ui/Infobox/Infobox.module.css
@@ -17,6 +17,11 @@
   margin-right: 1rem;
 }
 
+.icon-sm {
+  width: 1.25rem;
+  height: 1.25rem;
+}
+
 .content {
   flex-grow: 1;
   padding-right: 0.5rem;
@@ -29,8 +34,9 @@
 }
 
 .size-sm {
-  padding: 0.75rem 1rem;
-  font-size: 0.875rem;
+  padding: 0.5rem 0.875rem;
+  font-size: 0.75rem;
+  border-radius: 0.5rem;
 }
 
 .size-md {
@@ -67,3 +73,7 @@
   color: var(--sapBackgroundColor);
   line-height: 1.2rem;
 }
+
+.no-margin {
+  margin-bottom: 0;
+}
diff --git a/src/components/Ui/Infobox/Infobox.tsx b/src/components/Ui/Infobox/Infobox.tsx
@@ -12,6 +12,7 @@ interface LabelProps {
   fullWidth?: boolean;
   className?: string;
   icon?: string;
+  noMargin?: boolean;
 }
 
 const variantIcons = {
@@ -29,6 +30,7 @@ export const Infobox: React.FC<LabelProps> = ({
   fullWidth = false,
   className,
   icon,
+  noMargin = false,
 }) => {
   const infoboxClasses = cx(
     styles.infobox,
@@ -41,6 +43,7 @@ export const Infobox: React.FC<LabelProps> = ({
       [styles['variant-warning']]: variant === 'warning',
       [styles['variant-danger']]: variant === 'danger',
       [styles['full-width']]: fullWidth,
+      [styles['no-margin']]: noMargin,
     },
     className,
   );
@@ -49,7 +52,7 @@ export const Infobox: React.FC<LabelProps> = ({
 
   return (
     <div className={infoboxClasses} id={id}>
-      {iconName && <Icon name={iconName} className={styles.icon} />}
+      {iconName && <Icon name={iconName} className={cx(styles.icon, { [styles['icon-sm']]: size === 'sm' })} />}
       <div className={styles.content}>{children}</div>
     </div>
   );
diff --git a/src/components/Ui/NotFoundBanner/NotFoundBanner.module.css b/src/components/Ui/NotFoundBanner/NotFoundBanner.module.css
@@ -6,4 +6,4 @@
 .button {
   margin-inline: auto;
   margin-block: 2rem;
-}
+}
diff --git a/src/components/Ui/NotFoundBanner/NotFoundBanner.tsx b/src/components/Ui/NotFoundBanner/NotFoundBanner.tsx
@@ -5,6 +5,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import styles from './NotFoundBanner.module.css';
 import { Button } from '@ui5/webcomponents-react';
 import { useNavigate } from 'react-router-dom';
+import { Center } from '../Center/Center.tsx';
 
 export interface NotFoundBannerProps {
   entityType: string;
@@ -14,19 +15,21 @@ export function NotFoundBanner({ entityType }: NotFoundBannerProps) {
   const navigate = useNavigate();
 
   return (
-    <IllustratedBanner
-      illustrationName={IllustrationMessageType.PageNotFound}
-      title={t('NotFoundBanner.titleMessage', { entityType })}
-      subtitle={
-        <div className={styles.subtitleContainer}>
-          <span>
-            <Trans i18nKey="NotFoundBanner.subtitleMessage" values={{ entityType }} />
-          </span>
-          <Button className={styles.button} onClick={() => navigate('/')}>
-            {t('NotFoundBanner.navigateHome')}
-          </Button>
-        </div>
-      }
-    />
+    <Center>
+      <IllustratedBanner
+        illustrationName={IllustrationMessageType.PageNotFound}
+        title={t('NotFoundBanner.titleMessage', { entityType })}
+        subtitle={
+          <div className={styles.subtitleContainer}>
+            <span>
+              <Trans i18nKey="NotFoundBanner.subtitleMessage" values={{ entityType }} />
+            </span>
+            <Button className={styles.button} onClick={() => navigate('/')}>
+              {t('NotFoundBanner.navigateHome')}
+            </Button>
+          </div>
+        }
+      />
+    </Center>
   );
 }
diff --git a/src/lib/api/types/crossplane/CRDList.ts b/src/lib/api/types/crossplane/CRDList.ts
@@ -40,3 +40,8 @@ export type CRDResponse = {
 export const CRDRequest: Resource<CRDResponse> = {
   path: '/apis/apiextensions.k8s.io/v1/customresourcedefinitions',
 };
+
+export const CRDRequestAuthCheck: Resource<CRDResponse> = {
+  path: '/apis/apiextensions.k8s.io/v1/customresourcedefinitions',
+  jq: '{kind: .kind}',
+};
diff --git a/src/lib/shared/McpContext.tsx b/src/lib/shared/McpContext.tsx
@@ -10,7 +10,6 @@ interface Mcp {
   project: string;
   workspace: string;
   name: string;
-
   secretNamespace?: string;
   secretName?: string;
   secretKey?: string;
diff --git a/src/spaces/mcp/authorization/ManagedControlPlaneAuthorization.tsx b/src/spaces/mcp/authorization/ManagedControlPlaneAuthorization.tsx
@@ -0,0 +1,56 @@
+import { ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import IllustratedError from '../../../components/Shared/IllustratedError.tsx';
+import { BusyIndicator, Button } from '@ui5/webcomponents-react';
+import { generatePath, useNavigate, useParams } from 'react-router-dom';
+import { Routes } from '../../../Routes.ts';
+
+import { Center } from '../../../components/Ui/Center/Center.tsx';
+import { CRDRequestAuthCheck } from '../../../lib/api/types/crossplane/CRDList.ts';
+import { useApiResource } from '../../../lib/api/useApiResource.ts';
+
+export interface ManagedControlPlaneAuthorizationProps {
+  children: ReactNode;
+}
+export const ManagedControlPlaneAuthorization = ({ children }: ManagedControlPlaneAuthorizationProps) => {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+  const { projectName, workspaceName } = useParams();
+  const onBack = () => {
+    if (workspaceName) {
+      navigate(
+        generatePath(Routes.Project, {
+          projectName: projectName ?? '',
+        }),
+      );
+    } else {
+      navigate(Routes.Home);
+    }
+  };
+
+  // Check if user has access to CRDs in the MCP's cluster
+  const { error, isLoading } = useApiResource(CRDRequestAuthCheck);
+  if (isLoading) {
+    return (
+      <Center>
+        <BusyIndicator active />
+      </Center>
+    );
+  }
+  const isUserNotAuthorized = error?.status === 403 || error?.status === 401;
+  if (isUserNotAuthorized)
+    return (
+      <Center>
+        <IllustratedError
+          title={t('mcp.authorization.accessDenied.title')}
+          details={t('mcp.authorization.accessDenied.details')}
+        />
+        <Button design={'Default'} icon={'navigation-left-arrow'} onClick={onBack}>
+          {t('mcp.authorization.backToWorkspaces')}
+        </Button>
+      </Center>
+    );
+
+  return <>{children}</>;
+};
diff --git a/src/spaces/mcp/pages/McpPage.tsx b/src/spaces/mcp/pages/McpPage.tsx
