From 2fa02e2ebbac3e9a8ac06019d27b3c1080023ac5 Mon Sep 17 00:00:00 2001
From: Shekar Siri <sshekarsiri@gmail.com>
Date: Mon, 2 Jan 2023 17:54:35 +0100
Subject: [PATCH] feat(ui) - cards - cards sort

---
 .../Dashboard/components/MetricsList/MetricsList.tsx | 12 ------------
 frontend/app/mstore/metricStore.ts                   |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx b/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
index 377d45148..3f3bad3d0 100644
--- a/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
+++ b/frontend/app/components/Dashboard/components/MetricsList/MetricsList.tsx
@@ -53,18 +53,6 @@ function MetricsList({
 
   const lenth = list.length;
 
-  const sortList = () => {
-    list.sort((a, b) => {
-      const aDate = new Date(a.lastModified);
-      const bDate = new Date(b.lastModified);
-      return sortBy === 'asc'
-        ? aDate.getTime() - bDate.getTime()
-        : bDate.getTime() - aDate.getTime();
-    });
-  };
-
-  sortList();
-
   useEffect(() => {
     metricStore.updateKey('sessionsPage', 1);
   }, []);
diff --git a/frontend/app/mstore/metricStore.ts b/frontend/app/mstore/metricStore.ts
index e485a7b80..f37b79732 100644
--- a/frontend/app/mstore/metricStore.ts
+++ b/frontend/app/mstore/metricStore.ts
@@ -30,7 +30,7 @@ export default class MetricStore {
   }
 
   get sortedWidgets() {
-    return [...this.metrics].sort((a, b) => b.lastModified - a.lastModified);
+    return [...this.metrics].sort((a, b) => this.sort.by === 'desc' ? b.lastModified - a.lastModified : a.lastModified - b.lastModified)
   }
 
   // State Actions