Merge branch 'main' into ft/tab-navigation

Author: andreaskienle

public/locales/en.json

@@ -205,6 +205,11 @@
     "kustomizationsTitle": "Kustomizations",
     "landscapersTitle": "Landscapers"
   },
+  "McpHeader": {
+    "nameLabel": "Name",
+    "createdByLabel": "Created By",
+    "createdOnLabel": "Created On"
+  },
   "ToastContext": {
     "errorMessage": "useToast must be used within a ToastProvider"
   },

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

@@ -5,8 +5,10 @@ export type ListControlPlanesType = ControlPlaneType;
 export interface Metadata {
   name: string;
   namespace: string;
-  annotations: {
-    'openmcp.cloud/display-name': string;
+  creationTimestamp: string;
+  annotations?: {
+    'openmcp.cloud/display-name'?: string;
+    'openmcp.cloud/created-by'?: string;
   };
 }
 
@@ -82,6 +84,6 @@ export const ControlPlane = (
 ): Resource<ControlPlaneType> => {
   return {
     path: `/apis/core.openmcp.cloud/v1alpha1/namespaces/project-${projectName}--ws-${workspaceName}/managedcontrolplanes/${controlPlaneName}`,
-    jq: '{ spec: .spec | {components}, metadata: .metadata | {name, namespace, annotations}, status: { conditions: [.status.conditions[] | {type: .type, status: .status, message: .message, reason: .reason, lastTransitionTime: .lastTransitionTime}],  access: .status.components.authentication.access, status: .status.status }}',
+    jq: '{ spec: .spec | {components}, metadata: .metadata | {name, namespace, creationTimestamp, annotations}, status: { conditions: [.status.conditions[] | {type: .type, status: .status, message: .message, reason: .reason, lastTransitionTime: .lastTransitionTime}],  access: .status.components.authentication.access, status: .status.status }}',
   };
 };

src/spaces/mcp/components/McpHeader.cy.tsx

@@ -0,0 +1,50 @@
+import { McpHeader } from './McpHeader';
+import { ControlPlaneType } from '../../../lib/api/types/crate/controlPlanes.ts';
+
+describe('McpHeader', () => {
+  it('renders MCP metadata', () => {
+    const mcp = {
+      metadata: {
+        name: 'my-control-plane',
+        creationTimestamp: '2024-04-15T10:30:00.000Z',
+        annotations: {
+          'openmcp.cloud/created-by': '[email protected]',
+        },
+      },
+    } as ControlPlaneType;
+
+    cy.clock(new Date('2024-04-17T10:30:00.000Z').getTime()); // 2 days after MCP creation date
+    const creationDateAsString = new Date('2024-04-15T10:30:00.000Z').toLocaleDateString(undefined, {
+      day: 'numeric',
+      month: 'long',
+      year: 'numeric',
+    });
+
+    cy.mount(<McpHeader mcp={mcp} />);
+
+    cy.contains('span', 'my-control-plane').should('be.visible');
+    cy.contains('span', '[email protected]').should('be.visible');
+    cy.contains('span', `${creationDateAsString} (2 days ago)`).should('be.visible');
+  });
+
+  it('renders with missing MCP metadata', () => {
+    const mcp = {
+      metadata: {
+        name: 'my-control-plane',
+        creationTimestamp: '2024-04-15T10:30:00.000Z',
+      },
+    } as ControlPlaneType; // missing annotations
+
+    cy.clock(new Date('2024-04-17T10:30:00.000Z').getTime()); // 2 days after MCP creation date
+    const creationDateAsString = new Date('2024-04-15T10:30:00.000Z').toLocaleDateString(undefined, {
+      day: 'numeric',
+      month: 'long',
+      year: 'numeric',
+    });
+
+    cy.mount(<McpHeader mcp={mcp} />);
+
+    cy.contains('span', 'my-control-plane').should('be.visible');
+    cy.contains('span', `${creationDateAsString} (2 days ago)`).should('be.visible');
+  });
+});

src/spaces/mcp/components/McpHeader.module.css

@@ -0,0 +1,15 @@
+.container {
+  display: flex;
+}
+
+.grid {
+  display: grid;
+  grid-template-columns: auto auto;
+  gap: 0.375rem 0.75rem;
+  align-items: center;
+  font-size: var(--sapFontSize);
+}
+
+.label {
+  color: var(--sapContent_LabelColor);
+}

src/spaces/mcp/components/McpHeader.tsx

@@ -0,0 +1,42 @@
+import { ControlPlaneType } from '../../../lib/api/types/crate/controlPlanes.ts';
+
+import styles from './McpHeader.module.css';
+import { formatDateAsTimeAgo } from '../../../utils/i18n/timeAgo.ts';
+import { useTranslation } from 'react-i18next';
+
+export interface McpHeaderProps {
+  mcp: ControlPlaneType;
+}
+
+export function McpHeader({ mcp }: McpHeaderProps) {
+  const { t } = useTranslation();
+
+  const created = new Date(mcp.metadata.creationTimestamp).toLocaleDateString(undefined, {
+    day: 'numeric',
+    month: 'long',
+    year: 'numeric',
+  });
+
+  const createdBy = mcp.metadata.annotations?.['openmcp.cloud/created-by'];
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.grid}>
+        <span className={styles.label}>{t('McpHeader.nameLabel')}</span>
+        <span>{mcp.metadata.name}</span>
+
+        <span className={styles.label}>{t('McpHeader.createdOnLabel')}</span>
+        <span>
+          {created} ({formatDateAsTimeAgo(mcp.metadata.creationTimestamp)})
+        </span>
+
+        {createdBy ? (
+          <>
+            <span className={styles.label}>{t('McpHeader.createdByLabel')}</span>
+            <span>{createdBy}</span>
+          </>
+        ) : null}
+      </div>
+    </div>
+  );
+}

src/spaces/mcp/pages/McpPage.tsx

@@ -1,6 +1,7 @@
 import {
   BusyIndicator,
   ObjectPage,
+  ObjectPageHeader,
   ObjectPageSection,
   ObjectPageSubSection,
   ObjectPageTitle,
@@ -39,6 +40,7 @@ import { DISPLAY_NAME_ANNOTATION } from '../../../lib/api/types/shared/keyNames.
 import { WizardStepType } from '../../../components/Wizards/CreateManagedControlPlane/CreateManagedControlPlaneWizardContainer.tsx';
 import { GitRepositories } from '../../../components/ControlPlane/GitRepositories.tsx';
 import { Kustomizations } from '../../../components/ControlPlane/Kustomizations.tsx';
+import { McpHeader } from '../components/McpHeader.tsx';
 
 export type McpPageSectionId = 'overview' | 'crossplane' | 'flux' | 'landscapers';
 
@@ -128,6 +130,11 @@ export default function McpPage() {
               />
             }
             selectedSectionId={selectedSectionId}
+            headerArea={
+              <ObjectPageHeader>
+                <McpHeader mcp={mcp} />
+              </ObjectPageHeader>
+            }
             onSelectedSectionChange={() => setSelectedSectionId(undefined)}
           >
             <ObjectPageSection id="overview" titleText={t('McpPage.overviewTitle')}>