Fixed sorting for System List on dashboard and System Status Page | W…

…P-228
TACC · Sep 20, 2023 · 83e8a1a · 83e8a1a
1 parent e1f2d37
commit 83e8a1a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/client/src/components/SystemStatus/SystemStatus.jsx b/client/src/components/SystemStatus/SystemStatus.jsx
@@ -16,16 +16,14 @@ const root = `${ROUTES.WORKBENCH}${ROUTES.SYSTEM_STATUS}`;
 const SystemStatusSidebar = ({ systemList }) => {
   var sidebarItems = [];
 
-  systemList
-    .sort((a, b) => a.display_name.localeCompare(b.display_name))
-    .forEach((system) => {
-      sidebarItems.push({
-        to: `${root}/${system.hostname}`,
-        label: `${system.display_name}`,
-        disabled: false,
-        hidden: false,
-      });
+  systemList.forEach((system) => {
+    sidebarItems.push({
+      to: `${root}/${system.hostname}`,
+      label: `${system.display_name}`,
+      disabled: false,
+      hidden: false,
     });
+  });
 
   return <Sidebar sidebarItems={sidebarItems} />;
 };

diff --git a/client/src/redux/sagas/systemMonitor.sagas.js b/client/src/redux/sagas/systemMonitor.sagas.js
@@ -7,6 +7,9 @@ function* getSystemMonitor(action) {
     const result = yield call(fetchUtil, {
       url: '/api/system-monitor/',
     });
+
+    result.sort((a, b) => a.display_name.localeCompare(b.display_name));
+
     yield put({ type: 'SYSTEM_MONITOR_SUCCESS', payload: result });
   } catch (error) {
     yield put({