From 65d13c8d0eb54f64d2a0c1c82df222deb15f14b5 Mon Sep 17 00:00:00 2001
From: pnaik1 <pnaik@redhat.com>
Date: Wed, 25 Sep 2024 19:16:26 +0530
Subject: [PATCH] Events are in correct order in workbench status progress

---
 .../screens/server/StartServerModal.tsx                   | 5 ++++-
 .../src/pages/projects/notebook/StartNotebookModal.tsx    | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/notebookController/screens/server/StartServerModal.tsx b/frontend/src/pages/notebookController/screens/server/StartServerModal.tsx
index 08c85be5e3..fb0d04dc94 100644
--- a/frontend/src/pages/notebookController/screens/server/StartServerModal.tsx
+++ b/frontend/src/pages/notebookController/screens/server/StartServerModal.tsx
@@ -220,7 +220,10 @@ const StartServerModal: React.FC<StartServerModalProps> = ({ open, spawnInProgre
       <List isPlain isBordered tabIndex={0}>
         {events
           .slice()
-          .reverse()
+          .toSorted(
+            (a, b) =>
+              new Date(getEventTimestamp(b)).getTime() - new Date(getEventTimestamp(a)).getTime(),
+          )
           .map((event, index) => (
             <ListItem key={`notebook-event-${event.metadata.uid ?? index}`}>
               {`${getEventTimestamp(event)} [${event.type}] ${event.message}`}
diff --git a/frontend/src/pages/projects/notebook/StartNotebookModal.tsx b/frontend/src/pages/projects/notebook/StartNotebookModal.tsx
index 6cd4f6ce32..43288cb40c 100644
--- a/frontend/src/pages/projects/notebook/StartNotebookModal.tsx
+++ b/frontend/src/pages/projects/notebook/StartNotebookModal.tsx
@@ -19,7 +19,7 @@ import { EventStatus, NotebookStatus } from '~/types';
 import { EventKind } from '~/k8sTypes';
 import NotebookRouteLink from './NotebookRouteLink';
 import { NotebookState } from './types';
-import { getEventFullMessage } from './utils';
+import { getEventFullMessage, getEventTimestamp } from './utils';
 
 type StartNotebookModalProps = {
   isOpen: boolean;
@@ -164,7 +164,11 @@ const StartNotebookModal: React.FC<StartNotebookModalProps> = ({
             <List isPlain isBordered data-id="event-logs">
               {events
                 .slice()
-                .reverse()
+                .toSorted(
+                  (a, b) =>
+                    new Date(getEventTimestamp(b)).getTime() -
+                    new Date(getEventTimestamp(a)).getTime(),
+                )
                 .map((event, index) => (
                   <ListItem key={`notebook-event-${event.metadata.uid ?? index}`}>
                     {getEventFullMessage(event)}