Merge branch 'main' into remove-link

Author: andreaskienle

frontend-config.json

@@ -8,4 +8,4 @@
     "issuerUrl": "issuer-url",
     "scopes": []
   }
-}
+}

package-lock.json

@@ -53,7 +53,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.13.5",
     "@types/react": "^19.0.10",
-    "@types/react-dom": "19.1.2",
+    "@types/react-dom": "19.1.3",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@ui5/webcomponents-cypress-commands": "^2.7.2",
     "@vitejs/plugin-react": "^4.3.4",

package.json

@@ -47,6 +47,9 @@
     "permissionErrorMessageSubtitle": "Ask a workspace admin to grant you access.",
     "loadingErrorMessage": "Failed to list mcps in workspace"
   },
+  "ControlPlaneCard": {
+    "deleteConfirmationDialog": "MCP deletion triggered. The list will refresh automatically once completed."
+  },
   "ControlPlaneListAllWorkspaces": {
     "emptyListTitleMessage": "No Workspaces created yet",
     "emptyListSubtitleMessage": "Create a workspace to get started"
@@ -59,7 +62,14 @@
     "typeHeader": "Type",
     "messageHeader": "Message",
     "reasonHeader": "Reason",
-    "transitionHeader": "Last transition time"
+    "transitionHeader": "Last transition time",
+    "createSupportTicketButton": "Create Support Ticket",
+    "supportTicketTitleReady": "MCP Ready",
+    "supportTicketTitleNotReady": "MCP Not Ready",
+    "supportTicketTitleDeletion": "MCP in Deletion",
+    "supportTicketTitleIssues": "Issues with Control Plane",
+    "statusDetailsLabel": "MCP Status",
+    "detailsLabel": "Details:"
   },
   "CopyKubeconfigButton": {
     "copiedMessage": "Copied to Clipboard",

public/locales/en.json

@@ -1,4 +1,11 @@
-import { AnalyticalTable, Icon, Popover } from '@ui5/webcomponents-react';
+import {
+  AnalyticalTable,
+  Icon,
+  Popover,
+  FlexBox,
+  FlexBoxJustifyContent,
+  Button,
+} from '@ui5/webcomponents-react';
 import { AnalyticalTableColumnDefinition } from '@ui5/webcomponents-react/wrappers';
 import PopoverPlacement from '@ui5/webcomponents/dist/types/PopoverPlacement.js';
 import '@ui5/webcomponents-icons/dist/copy';
@@ -10,14 +17,21 @@ import {
 import ReactTimeAgo from 'react-time-ago';
 import { AnimatedHoverTextButton } from '../Helper/AnimatedHoverTextButton.tsx';
 import { useTranslation } from 'react-i18next';
-
+import { useFrontendConfig } from '../../context/FrontendConfigContext.tsx';
 export default function MCPHealthPopoverButton({
   mcpStatus,
+  projectName,
+  workspaceName,
+  mcpName,
 }: {
   mcpStatus: ControlPlaneStatusType | undefined;
+  projectName: string;
+  workspaceName: string;
+  mcpName: string;
 }) {
   const popoverRef = useRef(null);
   const [open, setOpen] = useState(false);
+  const { links } = useFrontendConfig();
 
   const { t } = useTranslation();
 
@@ -31,6 +45,46 @@ export default function MCPHealthPopoverButton({
     }
   };
 
+  const getTicketTitle = () => {
+    switch (mcpStatus?.status) {
+      case ReadyStatus.Ready:
+        return t('MCPHealthPopoverButton.supportTicketTitleReady');
+      case ReadyStatus.NotReady:
+        return t('MCPHealthPopoverButton.supportTicketTitleNotReady');
+      case ReadyStatus.InDeletion:
+        return t('MCPHealthPopoverButton.supportTicketTitleDeletion');
+      default:
+        return t('MCPHealthPopoverButton.supportTicketTitleIssues');
+    }
+  };
+
+  const constructGithubIssuesLink = () => {
+    const clusterDetails = `${projectName}/${workspaceName}/${mcpName}`;
+
+    const statusDetails = mcpStatus?.conditions
+      ? `${t('MCPHealthPopoverButton.statusDetailsLabel')}: ${mcpStatus.status}\n\n${t('MCPHealthPopoverButton.detailsLabel')}\n` +
+        mcpStatus.conditions
+          .map((condition) => {
+            let text = `- ${condition.type}: ${condition.status}\n`;
+            if (condition.reason)
+              text += `  - ${t('MCPHealthPopoverButton.reasonHeader')}: ${condition.reason}\n`;
+            if (condition.message)
+              text += `  - ${t('MCPHealthPopoverButton.messageHeader')}: ${condition.message}\n`;
+            return text;
+          })
+          .join('')
+      : '';
+
+    const params = new URLSearchParams({
+      template: '1-mcp_issue.yml',
+      title: `[${clusterDetails}]: ${getTicketTitle()}`,
+      'cluster-link': clusterDetails,
+      'what-happened': statusDetails,
+    });
+
+    return `${links.COM_PAGE_SUPPORT_GITHUB_ISSUE}?${params}`;
+  };
+
   const statusTableColumns: AnalyticalTableColumnDefinition[] = [
     {
       Header: t('MCPHealthPopoverButton.statusHeader'),
@@ -77,7 +131,13 @@ export default function MCPHealthPopoverButton({
         onClick={handleOpenerClick}
       />
       <Popover ref={popoverRef} open={open} placement={PopoverPlacement.Bottom}>
-        {<StatusTable status={mcpStatus} tableColumns={statusTableColumns} />}
+        {
+          <StatusTable
+            status={mcpStatus}
+            tableColumns={statusTableColumns}
+            githubIssuesLink={constructGithubIssuesLink()}
+          />
+        }
       </Popover>
     </div>
   );
@@ -86,10 +146,14 @@ export default function MCPHealthPopoverButton({
 function StatusTable({
   status,
   tableColumns,
+  githubIssuesLink,
 }: {
   status: ControlPlaneStatusType | undefined;
   tableColumns: AnalyticalTableColumnDefinition[];
+  githubIssuesLink: string;
 }) {
+  const { t } = useTranslation();
+
   return (
     <div style={{ width: 600 }}>
       <AnalyticalTable
@@ -101,6 +165,16 @@ function StatusTable({
           }) ?? []
         }
       />
+      <FlexBox
+        justifyContent={FlexBoxJustifyContent.End}
+        style={{ marginTop: '0.5rem' }}
+      >
+        <a href={githubIssuesLink} target="_blank" rel="noreferrer">
+          <Button>
+            {t('MCPHealthPopoverButton.createSupportTicketButton')}
+          </Button>
+        </a>
+      </FlexBox>
     </div>
   );
 }

src/components/ControlPlane/MCPHealthPopoverButton.tsx

@@ -6,6 +6,7 @@ import ConnectButton from '../ConnectButton.tsx';
 
 import TitleLevel from '@ui5/webcomponents/dist/types/TitleLevel.js';
 import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { DeleteConfirmationDialog } from '../../Dialogs/DeleteConfirmationDialog.tsx';
 import MCPHealthPopoverButton from '../../ControlPlane/MCPHealthPopoverButton.tsx';
@@ -23,7 +24,9 @@ import {
   PatchMCPResourceForDeletion,
   PatchMCPResourceForDeletionBody,
 } from '../../../lib/api/types/crate/deleteMCP.ts';
+
 import { YamlViewButton } from '../../Yaml/YamlViewButton.tsx';
+import { useToast } from '../../../context/ToastContext.tsx';
 
 interface Props {
   controlPlane: ListControlPlanesType;
@@ -37,6 +40,8 @@ export function ControlPlaneCard({
   projectName,
 }: Props) {
   const [dialogDeleteMcpIsOpen, setDialogDeleteMcpIsOpen] = useState(false);
+  const toast = useToast();
+  const { t } = useTranslation();
 
   const { trigger: patchTrigger } = useApiResourceMutation<DeleteMCPType>(
     PatchMCPResourceForDeletion(
@@ -82,7 +87,12 @@ export function ControlPlaneCard({
               alignItems="Center"
               className={styles.row}
             >
-              <MCPHealthPopoverButton mcpStatus={controlPlane.status} />
+              <MCPHealthPopoverButton
+                mcpStatus={controlPlane.status}
+                projectName={projectName}
+                workspaceName={workspace.metadata.name ?? ''}
+                mcpName={controlPlane.metadata.name}
+              />
               <FlexBox
                 direction="Row"
                 justifyContent="SpaceBetween"
@@ -122,6 +132,7 @@ export function ControlPlaneCard({
         onDeletionConfirmed={async () => {
           await patchTrigger(PatchMCPResourceForDeletionBody);
           await deleteTrigger();
+          toast.show(t('ControlPlaneCard.deleteConfirmationDialog'));
         }}
       />
     </>

src/components/ControlPlanes/ControlPlaneCard/ControlPlaneCard.tsx

@@ -1,5 +1,5 @@
 import { ReactNode, createContext, use } from 'react';
-import { DocLinkCreator } from '../lib/shared/links';
+import { LinkCreator } from '../lib/shared/links';
 import { z } from 'zod';
 
 export enum Landscape {
@@ -11,7 +11,7 @@ export enum Landscape {
 }
 
 interface FrontendConfigContextType extends FrontendConfig {
-  links: DocLinkCreator;
+  links: LinkCreator;
 }
 
 export const FrontendConfigContext =
@@ -29,7 +29,10 @@ export function FrontendConfigProvider({
   children,
 }: FrontendConfigProviderProps) {
   const config = use(fetchPromise);
-  const docLinks = new DocLinkCreator(config.documentationBaseUrl);
+  const docLinks = new LinkCreator(
+    config.documentationBaseUrl,
+    config.githubBaseUrl,
+  );
   const value: FrontendConfigContextType = {
     links: docLinks,
     ...config,
@@ -61,6 +64,7 @@ const FrontendConfigSchema = z.object({
   backendUrl: z.string(),
   gatewayUrl: z.string(),
   documentationBaseUrl: z.string(),
+  githubBaseUrl: z.string(),
   oidcConfig: OidcConfigSchema,
   landscape: z.optional(z.nativeEnum(Landscape)),
 });

src/context/FrontendConfigContext.tsx

@@ -1,13 +1,19 @@
-export class DocLinkCreator {
+export class LinkCreator {
   private baseUrl: string;
+  private githubBaseUrl: string;
 
-  constructor(baseUrl: string) {
+  constructor(baseUrl: string, githubBaseUrl?: string) {
     this.baseUrl = baseUrl;
+    this.githubBaseUrl = githubBaseUrl || baseUrl;
   }
   private createLink(path: string) {
     return `${this.baseUrl}${path}`;
   }
 
+  private createGithubLink(path: string) {
+    return `${this.githubBaseUrl}${path}`;
+  }
+
   public get COMMUNITY_PAGE(): string {
     return this.createLink('/');
   }
@@ -26,4 +32,7 @@ export class DocLinkCreator {
       '/docs/managed-control-planes/get-started/get-started-mcp#5-create-managedcontrolplane',
     );
   }
+  public get COM_PAGE_SUPPORT_GITHUB_ISSUE(): string {
+    return this.createGithubLink('/support/issues/new');
+  }
 }

src/lib/shared/links.ts

@@ -1,4 +1,4 @@
-import { DocLinkCreator } from '../lib/shared/links.ts';
+import { LinkCreator } from '../lib/shared/links.ts';
 import { Landscape } from '../context/FrontendConfigContext.tsx';
 
 export const isInTestingMode: boolean = !!window.Cypress;
@@ -7,5 +7,5 @@ export const mockedFrontendConfig = {
   backendUrl: 'http://localhost:3000',
   landscape: Landscape.Local,
   documentationBaseUrl: 'http://localhost:3000',
-  links: new DocLinkCreator(documentationBaseUrl),
+  links: new LinkCreator(documentationBaseUrl),
 };

src/utils/testing.ts

@@ -81,7 +81,12 @@ export default function ControlPlaneView() {
                     justifyContent: 'space-between',
                   }}
                 >
-                  <MCPHealthPopoverButton mcpStatus={mcp?.status} />
+                  <MCPHealthPopoverButton
+                    mcpStatus={mcp?.status}
+                    projectName={projectName}
+                    workspaceName={workspaceName ?? ''}
+                    mcpName={controlPlaneName}
+                  />
 
                   <CopyKubeconfigButton />
                 </div>