@openshift-migration-advisor/shared-components 0.28.0-9da6a7613f16 → 0.28.0-cc35dd2cf135

package/src/report/ReportExportMenu.tsx

@@ -1,5 +1,7 @@
 import {
+  Divider,
   Dropdown,
+  DropdownGroup,
   DropdownItem,
   DropdownList,
   MenuToggle,
@@ -7,13 +9,41 @@ import {
   Spinner,
 } from "@patternfly/react-core";
 import { DownloadIcon } from "@patternfly/react-icons";
-import { type FC, type Ref, useState } from "react";
+import { type FC, type ReactNode, type Ref, useMemo, useState } from "react";
 import {
   type ReportExportOption,
+  type ReportExportSection,
   type StandardReportExportHandlers,
   standardReportExportOptions,
 } from "./reportExportOptions.js";
 
+function sectionGroupKey(section?: ReportExportSection): string | undefined {
+  return section?.id;
+}
+
+function groupExportOptions(options: ReportExportOption[]): {
+  section?: ReportExportSection;
+  options: ReportExportOption[];
+}[] {
+  const groups: {
+    section?: ReportExportSection;
+    options: ReportExportOption[];
+  }[] = [];
+
+  for (const option of options) {
+    const sectionKey = sectionGroupKey(option.section);
+    const last = groups.length > 0 ? groups[groups.length - 1] : undefined;
+    const lastKey = last ? sectionGroupKey(last.section) : undefined;
+    if (last && lastKey === sectionKey) {
+      last.options.push(option);
+    } else {
+      groups.push({ section: option.section, options: [option] });
+    }
+  }
+
+  return groups;
+}
+
 export interface ReportExportMenuProps {
   options: ReportExportOption[];
   isLoading?: boolean;
@@ -31,10 +61,44 @@ export const ReportExportMenu: FC<ReportExportMenuProps> = ({
 }) => {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
 
+  const optionGroups = useMemo(() => groupExportOptions(options), [options]);
+
   if (options.length === 0) {
     return null;
   }
 
+  const menuItems: ReactNode[] = [];
+  optionGroups.forEach((group, index) => {
+    if (index > 0) {
+      const dividerKey =
+        group.section?.id ?? group.options[0]?.key ?? "ungrouped";
+      menuItems.push(
+        <Divider key={`divider-before-${dividerKey}`} component="li" />,
+      );
+    }
+
+    const items = group.options.map((option) => (
+      <DropdownItem
+        key={option.key}
+        isDisabled={option.isDisabled}
+        description={option.description}
+        onClick={option.onSelect}
+      >
+        {option.label}
+      </DropdownItem>
+    ));
+
+    if (group.section) {
+      menuItems.push(
+        <DropdownGroup key={group.section.id} label={group.section.label}>
+          {items}
+        </DropdownGroup>,
+      );
+    } else {
+      menuItems.push(...items);
+    }
+  });
+
   return (
     <Dropdown
       isOpen={isDropdownOpen}
@@ -70,18 +134,7 @@ export const ReportExportMenu: FC<ReportExportMenuProps> = ({
         </MenuToggle>
       )}
     >
-      <DropdownList>
-        {options.map((option) => (
-          <DropdownItem
-            key={option.key}
-            isDisabled={option.isDisabled}
-            description={option.description}
-            onClick={option.onSelect}
-          >
-            {option.label}
-          </DropdownItem>
-        ))}
-      </DropdownList>
+      <DropdownList>{menuItems}</DropdownList>
     </Dropdown>
   );
 };
@@ -94,6 +147,7 @@ export interface ExportReportButtonProps extends StandardReportExportHandlers {
   loadingLabel?: string | null;
   isDisabled?: boolean;
   toggleLabel?: string;
+  assessmentSectionLabel?: string;
 }
 
 export const ExportReportButton: FC<ExportReportButtonProps> = ({
@@ -101,6 +155,7 @@ export const ExportReportButton: FC<ExportReportButtonProps> = ({
   onExportPng,
   onExportHtml,
   extraOptions = [],
+  assessmentSectionLabel,
   ...menuProps
 }) => (
   <ReportExportMenu
@@ -109,6 +164,7 @@ export const ExportReportButton: FC<ExportReportButtonProps> = ({
         onExportPdf,
         onExportPng,
         onExportHtml,
+        assessmentSectionLabel,
       }),
       ...extraOptions,
     ]}

package/src/report/StorageOverview.tsx

@@ -427,6 +427,20 @@ export const StorageOverview: FC<StorageOverviewProps> = ({
       .sort((a, b) => orderIndex(a.name) - orderIndex(b.name));
   }, [diskTypes]);
 
+  const isSharedDisksViewAvailable = totalWithSharedDisks !== 0;
+
+  // Exclude the "Shared disks" view from the chart export cycle (used to
+  // build the PDF/PNG/HTML exports) when that view is disabled in the
+  // dropdown, so the exported report stays consistent with what's
+  // selectable on screen.
+  const availableExportViewLabels = useMemo(() => {
+    if (isSharedDisksViewAvailable) {
+      return VIEW_MODE_LABELS;
+    }
+    const { sharedDisks: _sharedDisks, ...rest } = VIEW_MODE_LABELS;
+    return rest;
+  }, [isSharedDisksViewAvailable]);
+
   const sharedDisksChartData = useMemo(() => {
     if (
       totalWithSharedDisks === undefined ||
@@ -489,7 +503,10 @@ export const StorageOverview: FC<StorageOverviewProps> = ({
     <ChartExportSurface
       id={CHART_ID}
       title={chartTitle}
-      exportViews={chartExportViewsFromLabels(CHART_TITLE, VIEW_MODE_LABELS)}
+      exportViews={chartExportViewsFromLabels(
+        CHART_TITLE,
+        availableExportViewLabels,
+      )}
       activeExportViewId={viewMode}
       onExportViewChange={(viewId) => {
         if (isViewMode(viewId)) {

package/src/report/VMMigrationStatus.tsx

@@ -0,0 +1,358 @@
+import { css } from "@emotion/css";
+import {
+  Card,
+  CardBody,
+  CardTitle,
+  Content,
+  Dropdown,
+  DropdownItem,
+  DropdownList,
+  Flex,
+  FlexItem,
+  MenuToggle,
+  type MenuToggleElement,
+} from "@patternfly/react-core";
+import { VirtualMachineIcon } from "@patternfly/react-icons";
+import {
+  chart_color_blue_300,
+  chart_color_purple_100,
+  chart_color_purple_300,
+  chart_color_teal_200,
+  chart_color_yellow_400,
+} from "@patternfly/react-tokens";
+import type { FC, Ref } from "react";
+import { useMemo, useState } from "react";
+import {
+  MigrationDonutChart,
+  type MigrationDonutChartLegendVariant,
+} from "../charts/MigrationDonutChart.js";
+import { CardEmptyState } from "./CardEmptyState.js";
+import { ChartHeaderActions } from "./ChartDownloadButton.js";
+import { ChartExportSurface } from "./ChartExportSurface.js";
+import { chartExportViewsFromLabels } from "./chartExport.js";
+import {
+  chartColorFailure,
+  chartColorSuccess,
+  REPORT_CARD_EMPTY_STATE_TITLES,
+} from "./constants.js";
+import { dashboardStyles } from "./dashboardStyles.js";
+
+/**
+ * VM-issue counts this card reads. agent-sdk's `IssuesBreakdown` satisfies it;
+ * each field stays optional so older or partial payloads do not throw.
+ */
+export interface IssuesBreakdownLike {
+  critical?: number;
+  error?: number;
+  warning?: number;
+  information?: number;
+  advisory?: number;
+}
+
+export interface VMMigrationStatusProps {
+  data: {
+    migratable: number;
+    nonMigratable: number;
+  };
+  issuesBreakdown?: IssuesBreakdownLike;
+  /**
+   * Donut-slice click. `true` for the migratable slice, `false` otherwise.
+   * Agent-ui maps it to a VM migration-readiness filter; ui-app omits it.
+   */
+  onReadinessSelect?: (isMigratable: boolean) => void;
+  /** Breakdown-bar click. The argument is the concern category label. */
+  onCategorySelect?: (category: string) => void;
+  /** Center-title click. Agent-ui opens the VM list with no extra filters. */
+  onTitleClick?: () => void;
+  /** `"html"` in agent-ui; ui-app passes `"chart"`. */
+  legendVariant?: MigrationDonutChartLegendVariant;
+}
+
+type ViewMode = "issuesVsNoIssues" | "issuesBreakdown";
+
+const VIEW_MODE_LABELS: Record<ViewMode, string> = {
+  issuesVsNoIssues: "No issues vs with issues",
+  issuesBreakdown: "With issues breakdown",
+};
+
+const CHART_ID = "vm-migration-status";
+const CHART_TITLE = "VM migration status";
+
+const MIGRATABLE_LABEL = "Migratable";
+const NOT_MIGRATABLE_LABEL = "Not ready for migration";
+
+const CATEGORY_ORDER: Array<{ label: string; key: keyof IssuesBreakdownLike }> =
+  [
+    { label: "Critical", key: "critical" },
+    { label: "Error", key: "error" },
+    { label: "Warning", key: "warning" },
+    { label: "Information", key: "information" },
+    { label: "Advisory", key: "advisory" },
+  ];
+
+/**
+ * Same categorical order as the previous breakdown hex palette, mapped onto
+ * PatternFly `chart_color_*` tokens (nearest token where the old hex was not
+ * itself a token).
+ */
+const CATEGORY_COLORS: Record<string, string> = {
+  Critical: chart_color_blue_300.value,
+  Error: chart_color_purple_300.value,
+  Warning: chart_color_purple_100.value,
+  Information: chart_color_teal_200.value,
+  Advisory: chart_color_yellow_400.value,
+};
+
+const menuToggleMinWidth = css`
+  min-width: 250px;
+`;
+
+const isViewMode = (value: string | number | undefined): value is ViewMode =>
+  value === "issuesVsNoIssues" || value === "issuesBreakdown";
+
+const toCount = (value: number | undefined): number =>
+  typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
+
+export const VMMigrationStatus: FC<VMMigrationStatusProps> = ({
+  data,
+  issuesBreakdown,
+  onReadinessSelect,
+  onCategorySelect,
+  onTitleClick,
+  legendVariant = "html",
+}) => {
+  const [viewMode, setViewMode] = useState<ViewMode>("issuesVsNoIssues");
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+
+  const totalVMs = data.migratable + data.nonMigratable;
+
+  const donutData = [
+    {
+      name: MIGRATABLE_LABEL,
+      count: data.migratable,
+      countDisplay: `${data.migratable} VMs`,
+      legendCategory: MIGRATABLE_LABEL,
+    },
+    {
+      name: NOT_MIGRATABLE_LABEL,
+      count: data.nonMigratable,
+      countDisplay: `${data.nonMigratable} VMs`,
+      legendCategory: NOT_MIGRATABLE_LABEL,
+    },
+  ];
+
+  const legend = {
+    [MIGRATABLE_LABEL]: chartColorSuccess,
+    [NOT_MIGRATABLE_LABEL]: chartColorFailure,
+  };
+
+  const breakdownData = useMemo(() => {
+    if (!issuesBreakdown) {
+      return [];
+    }
+    return CATEGORY_ORDER.map(({ label, key }) => ({
+      name: label,
+      count: toCount(issuesBreakdown[key]),
+    }));
+  }, [issuesBreakdown]);
+
+  const maxCount = useMemo(
+    () =>
+      breakdownData.length > 0
+        ? Math.max(...breakdownData.map((d) => d.count))
+        : 0,
+    [breakdownData],
+  );
+
+  const chartTitle = `${CHART_TITLE} — ${VIEW_MODE_LABELS[viewMode]}`;
+
+  return (
+    <ChartExportSurface
+      id={CHART_ID}
+      title={chartTitle}
+      exportViews={chartExportViewsFromLabels(CHART_TITLE, VIEW_MODE_LABELS)}
+      activeExportViewId={viewMode}
+      onExportViewChange={(viewId) => {
+        if (isViewMode(viewId)) {
+          setViewMode(viewId);
+        }
+      }}
+    >
+      <Card className={dashboardStyles.card}>
+        <CardTitle>
+          <Flex
+            alignItems={{ default: "alignItemsCenter" }}
+            justifyContent={{ default: "justifyContentSpaceBetween" }}
+          >
+            <FlexItem>
+              <VirtualMachineIcon /> VM Migration Status
+            </FlexItem>
+            <ChartHeaderActions chartId={CHART_ID} title={chartTitle}>
+              <Dropdown
+                isOpen={isDropdownOpen}
+                onSelect={(_event, value) => {
+                  if (isViewMode(value)) {
+                    setViewMode(value);
+                  }
+                  setIsDropdownOpen(false);
+                }}
+                onOpenChange={setIsDropdownOpen}
+                toggle={(toggleRef: Ref<MenuToggleElement>) => (
+                  <MenuToggle
+                    ref={toggleRef}
+                    onClick={() => setIsDropdownOpen((open) => !open)}
+                    isExpanded={isDropdownOpen}
+                    className={menuToggleMinWidth}
+                  >
+                    {VIEW_MODE_LABELS[viewMode]}
+                  </MenuToggle>
+                )}
+              >
+                <DropdownList>
+                  <DropdownItem value="issuesVsNoIssues" key="issuesVsNoIssues">
+                    {VIEW_MODE_LABELS.issuesVsNoIssues}
+                  </DropdownItem>
+                  <DropdownItem value="issuesBreakdown" key="issuesBreakdown">
+                    {VIEW_MODE_LABELS.issuesBreakdown}
+                  </DropdownItem>
+                </DropdownList>
+              </Dropdown>
+            </ChartHeaderActions>
+          </Flex>
+        </CardTitle>
+        <CardBody className={dashboardStyles.cardBodyScrollable}>
+          {viewMode === "issuesVsNoIssues" ? (
+            totalVMs === 0 ? (
+              <CardEmptyState
+                title={REPORT_CARD_EMPTY_STATE_TITLES.migrationStatus}
+              />
+            ) : (
+              <MigrationDonutChart
+                legendVariant={legendVariant}
+                data={donutData}
+                legend={legend}
+                height={300}
+                width={420}
+                donutThickness={18}
+                padAngle={1}
+                title={`${totalVMs}`}
+                subTitle="VMs"
+                subTitleColor="var(--pf-t--global--text--color--subtle)"
+                titleFontSize={34}
+                legendLabelFormatter={({ x, countDisplay }) =>
+                  `${x} (${countDisplay})`
+                }
+                onItemClick={
+                  onReadinessSelect
+                    ? (item) =>
+                        onReadinessSelect(item.name === MIGRATABLE_LABEL)
+                    : undefined
+                }
+                onTitleClick={onTitleClick}
+              />
+            )
+          ) : breakdownData.length === 0 ? (
+            <CardEmptyState
+              title={REPORT_CARD_EMPTY_STATE_TITLES.issuesBreakdown}
+            />
+          ) : (
+            <div>
+              <div className={dashboardStyles.storageChartWrapper}>
+                <Flex
+                  direction={{ default: "row" }}
+                  alignItems={{ default: "alignItemsFlexEnd" }}
+                  justifyContent={{ default: "justifyContentCenter" }}
+                  spaceItems={{ default: "spaceItemsMd" }}
+                  style={{
+                    height: "250px",
+                    width: "100%",
+                  }}
+                >
+                  {breakdownData.map((item) => {
+                    const heightPercentage =
+                      maxCount > 0 ? (item.count / maxCount) * 100 : 0;
+                    const minHeightPercentage = item.count > 0 ? 20 : 0;
+                    const finalHeightPercentage = Math.max(
+                      heightPercentage,
+                      minHeightPercentage,
+                    );
+                    const barColor =
+                      CATEGORY_COLORS[item.name] || CATEGORY_COLORS.Critical;
+
+                    return (
+                      <Flex
+                        key={item.name}
+                        direction={{ default: "column" }}
+                        alignItems={{ default: "alignItemsCenter" }}
+                        spaceItems={{ default: "spaceItemsSm" }}
+                        style={{ flex: "1", maxWidth: "120px" }}
+                      >
+                        <FlexItem
+                          style={{
+                            height: "200px",
+                            display: "flex",
+                            alignItems: "flex-end",
+                            width: "100%",
+                            justifyContent: "center",
+                          }}
+                        >
+                          <button
+                            type="button"
+                            onClick={() => onCategorySelect?.(item.name)}
+                            title={`${item.name}: ${item.count} VMs`}
+                            style={{
+                              width: "60px",
+                              height: `${finalHeightPercentage}%`,
+                              backgroundColor: barColor,
+                              transition: "height 0.3s ease",
+                              borderRadius: "4px 4px 0 0",
+                              cursor: "pointer",
+                              border: "none",
+                              padding: 0,
+                            }}
+                          />
+                        </FlexItem>
+                        <FlexItem>
+                          <Content
+                            component="small"
+                            style={{
+                              fontSize: "12px",
+                              textAlign: "center",
+                              wordBreak: "break-word",
+                              color:
+                                "var(--pf-t--global--text--color--regular)",
+                            }}
+                          >
+                            {item.name}
+                            <br />({item.count} VMs)
+                          </Content>
+                        </FlexItem>
+                      </Flex>
+                    );
+                  })}
+                </Flex>
+              </div>
+              <div>
+                <Content
+                  component="small"
+                  style={{
+                    fontSize: "12px",
+                    color: "var(--pf-t--global--text--color--subtle)",
+                    marginTop: "16px",
+                    textAlign: "center",
+                    display: "block",
+                  }}
+                >
+                  Totals may exceed the unique VM count because a VM can appear
+                  in multiple categories
+                </Content>
+              </div>
+            </div>
+          )}
+        </CardBody>
+      </Card>
+    </ChartExportSurface>
+  );
+};
+
+VMMigrationStatus.displayName = "VMMigrationStatus";

package/src/report/__tests__/StorageOverview.test.tsx

@@ -27,6 +27,23 @@ vi.mock("../../charts/MigrationDonutChart.js", () => ({
   },
 }));
 
+vi.mock("../ChartExportSurface.js", () => ({
+  ChartExportSurface: ({
+    exportViews,
+    children,
+  }: {
+    exportViews?: Array<{ id: string; title: string }>;
+    children?: React.ReactNode;
+  }): JSX.Element => (
+    <div
+      data-testid="chart-export-surface"
+      data-export-view-ids={JSON.stringify(exportViews?.map((view) => view.id))}
+    >
+      {children}
+    </div>
+  ),
+}));
+
 afterEach(() => {
   donutProps.current = null;
   cleanup();
@@ -171,6 +188,33 @@ describe("StorageOverview", () => {
     });
   });
 
+  it("excludes the shared disks view from the chart export cycle when disabled, so PDF/PNG/HTML exports stay consistent with the dropdown", () => {
+    render(<StorageOverview totalVMs={10} totalWithSharedDisks={0} />);
+
+    const exportViewIds = JSON.parse(
+      screen
+        .getByTestId("chart-export-surface")
+        .getAttribute("data-export-view-ids") || "[]",
+    ) as string[];
+
+    expect(exportViewIds).not.toContain("sharedDisks");
+    expect(exportViewIds).toEqual(
+      expect.arrayContaining(["totalSize", "vmCount", "vmCountByDiskType"]),
+    );
+  });
+
+  it("includes the shared disks view in the chart export cycle when available", () => {
+    render(<StorageOverview totalVMs={10} totalWithSharedDisks={4} />);
+
+    const exportViewIds = JSON.parse(
+      screen
+        .getByTestId("chart-export-surface")
+        .getAttribute("data-export-view-ids") || "[]",
+    ) as string[];
+
+    expect(exportViewIds).toContain("sharedDisks");
+  });
+
   it("disables the shared-disks view when no VMs have shared disks", async () => {
     const user = userEvent.setup();
     render(<StorageOverview totalVMs={10} totalWithSharedDisks={0} />);