From 0213921fb1fa686a7c42e8b6fd24df42ab0eb4be Mon Sep 17 00:00:00 2001
From: Thuan Vo <thvo@redhat.com>
Date: Mon, 8 May 2023 11:23:26 -0700
Subject: [PATCH] fix(topology): correct toolbar mode icon (#1019)

* fix(topology): correct toolbar mode icon

* chore(topology): localize mode icon label
---
 locales/en/public.json                       |  4 ++++
 src/app/Topology/Toolbar/TopologyToolbar.tsx | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/locales/en/public.json b/locales/en/public.json
index cb3cc5db8..771bc38d9 100644
--- a/locales/en/public.json
+++ b/locales/en/public.json
@@ -390,5 +390,9 @@
       "SELECT": "Select a timezone",
       "TYPE_AHEAD": "Search a timezone"
     }
+  },
+  "Topology": {
+    "GRAPH_VIEW": "Graph View",
+    "LIST_VIEW": "List View"
   }
 }
diff --git a/src/app/Topology/Toolbar/TopologyToolbar.tsx b/src/app/Topology/Toolbar/TopologyToolbar.tsx
index 3227a40d7..e603ddbb3 100644
--- a/src/app/Topology/Toolbar/TopologyToolbar.tsx
+++ b/src/app/Topology/Toolbar/TopologyToolbar.tsx
@@ -50,6 +50,7 @@ import { HelpButton } from './HelpButton';
 import { QuickSearchButton } from './QuickSearchButton';
 import { TopologyFilterChips } from './TopologyFilterChips';
 import { TopologyFilters } from './TopologyFilters';
+import { useTranslation } from 'react-i18next';
 
 export enum TopologyToolbarVariant {
   Graph = 'graph',
@@ -65,6 +66,7 @@ export interface TopologyToolbarProps {
 export const TopologyToolbar: React.FC<TopologyToolbarProps> = ({ variant, visualization, isDisabled, ...props }) => {
   const isGraphView = variant === TopologyToolbarVariant.Graph;
   const dispatch = useDispatch();
+  const { t } = useTranslation();
 
   const [quicksearchOpen, setQuicksearchOpen] = React.useState(false);
 
@@ -85,21 +87,21 @@ export const TopologyToolbar: React.FC<TopologyToolbarProps> = ({ variant, visua
     }
   }, [setQuicksearchOpen]);
 
-  const actionIcon = React.useMemo(
+  const modeIcon = React.useMemo(
     () => (
       <Tooltip
         entryDelay={0}
-        content={isGraphView ? 'Graph View' : 'List View'}
+        content={isGraphView ? t('Topology.LIST_VIEW') : t('Topology.GRAPH_VIEW')}
         aria="none"
         aria-live="polite"
         appendTo={portalRoot}
       >
         <Button className="topology__view-switcher" aria-label="Clipboard" variant="plain" onClick={toggleView}>
-          {isGraphView ? <TopologyIcon /> : <ListIcon />}
+          {isGraphView ? <ListIcon /> : <TopologyIcon />}
         </Button>
       </Tooltip>
     ),
-    [isGraphView, toggleView]
+    [isGraphView, toggleView, t]
   );
 
   const shortcuts = React.useMemo(() => {
@@ -192,7 +194,7 @@ export const TopologyToolbar: React.FC<TopologyToolbarProps> = ({ variant, visua
             </ToolbarItem>
           ) : null}
           {!isDisabled ? <ToolbarItem alignment={{ default: 'alignRight' }}>{shortcuts}</ToolbarItem> : null}
-          <ToolbarItem alignment={isDisabled ? { default: 'alignRight' } : undefined}>{actionIcon}</ToolbarItem>
+          <ToolbarItem alignment={isDisabled ? { default: 'alignRight' } : undefined}>{modeIcon}</ToolbarItem>
         </ToolbarContent>
       </Toolbar>
       <TopologyFilterChips className="topology__toolbar-chip-content" />