From dcf488596d9cecc1ac6447ddcc03927a4e7a1bc0 Mon Sep 17 00:00:00 2001
From: DominikKawka <dkawka@redhat.com>
Date: Thu, 24 Jul 2025 15:15:01 +0100
Subject: [PATCH] resolved merge conflict

Signed-off-by: DominikKawka <dkawka@redhat.com>
---
 .../summary/WorkspaceKindSummary.tsx          | 14 +++++--------
 .../WorkspaceKindSummaryExpandableCard.tsx    | 21 ++++++++-----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/workspaces/frontend/src/app/pages/WorkspaceKinds/summary/WorkspaceKindSummary.tsx b/workspaces/frontend/src/app/pages/WorkspaceKinds/summary/WorkspaceKindSummary.tsx
index b66755e7..c1f2b94a 100644
--- a/workspaces/frontend/src/app/pages/WorkspaceKinds/summary/WorkspaceKindSummary.tsx
+++ b/workspaces/frontend/src/app/pages/WorkspaceKinds/summary/WorkspaceKindSummary.tsx
@@ -1,13 +1,9 @@
 import React, { useCallback, useRef, useState } from 'react';
-import {
-  Content,
-  ContentVariants,
-  PageSection,
-  Stack,
-  StackItem,
-  Breadcrumb,
-  BreadcrumbItem,
-} from '@patternfly/react-core';
+import { Content, ContentVariants } from '@patternfly/react-core/dist/esm/components/Content';
+import { PageSection } from '@patternfly/react-core/dist/esm/components/Page';
+import { Stack, StackItem } from '@patternfly/react-core/dist/esm/layouts/Stack';
+import { Breadcrumb } from '@patternfly/react-core/dist/esm/components/Breadcrumb';
+import { BreadcrumbItem } from '@patternfly/react-core/dist/esm/components/Breadcrumb/BreadcrumbItem';
 import { useTypedLocation, useTypedParams } from '~/app/routerHelper';
 import WorkspaceTable, {
   WorkspaceTableFilteredColumn,
diff --git a/workspaces/frontend/src/app/pages/WorkspaceKinds/summary/WorkspaceKindSummaryExpandableCard.tsx b/workspaces/frontend/src/app/pages/WorkspaceKinds/summary/WorkspaceKindSummaryExpandableCard.tsx
index 6b661298..66e4af9d 100644
--- a/workspaces/frontend/src/app/pages/WorkspaceKinds/summary/WorkspaceKindSummaryExpandableCard.tsx
+++ b/workspaces/frontend/src/app/pages/WorkspaceKinds/summary/WorkspaceKindSummaryExpandableCard.tsx
@@ -1,19 +1,16 @@
 import React, { useMemo } from 'react';
+import { Button } from '@patternfly/react-core/dist/esm/components/Button';
 import {
-  Button,
   Card,
   CardBody,
-  CardExpandableContent,
   CardHeader,
   CardTitle,
-  Content,
-  ContentVariants,
-  Divider,
-  Flex,
-  FlexItem,
-  Stack,
-  StackItem,
-} from '@patternfly/react-core';
+  CardExpandableContent,
+} from '@patternfly/react-core/dist/esm/components/Card';
+import { Content, ContentVariants } from '@patternfly/react-core/dist/esm/components/Content';
+import { Divider } from '@patternfly/react-core/dist/esm/components/Divider';
+import { Flex, FlexItem } from '@patternfly/react-core/dist/esm/layouts/Flex';
+import { Stack, StackItem } from '@patternfly/react-core/dist/esm/layouts/Stack';
 import { t_global_spacer_md as MediumPadding } from '@patternfly/react-tokens';
 import { Workspace } from '~/shared/api/backendApiTypes';
 import {
@@ -52,7 +49,7 @@ const WorkspaceKindSummaryExpandableCard: React.FC<WorkspaceKindSummaryExpandabl
     <Card isExpanded={isExpanded} variant="secondary">
       <CardHeader onExpand={onExpandToggle}>
         <CardTitle>
-          <Content component={ContentVariants.h2}>Workspaces Summary</Content>
+          <Content component={ContentVariants.h2}>Workspaces summary</Content>
         </CardTitle>
       </CardHeader>
       <CardExpandableContent>
@@ -69,7 +66,7 @@ const WorkspaceKindSummaryExpandableCard: React.FC<WorkspaceKindSummaryExpandabl
               </FlexItem>
             </SectionFlex>
             <SectionDivider />
-            <SectionFlex title="Idle GPU Workspaces">
+            <SectionFlex title="Idle GPU workspaces">
               <FlexItem>
                 <Button
                   variant="link"