From ebcd5184237e5d68ab64dc176656e331c451b998 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

---
 .../notebookController/screens/server/StartServerModal.tsx    | 2 +-
 frontend/src/pages/projects/notebook/StartNotebookModal.tsx   | 4 ++--
 2 files changed, 3 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..e611166a35 100644
--- a/frontend/src/pages/notebookController/screens/server/StartServerModal.tsx
+++ b/frontend/src/pages/notebookController/screens/server/StartServerModal.tsx
@@ -220,7 +220,7 @@ const StartServerModal: React.FC<StartServerModalProps> = ({ open, spawnInProgre
       <List isPlain isBordered tabIndex={0}>
         {events
           .slice()
-          .reverse()
+          .toSorted((a, b) => getEventTimestamp(b).localeCompare(getEventTimestamp(a)))
           .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..636c7e4f6c 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,7 @@ const StartNotebookModal: React.FC<StartNotebookModalProps> = ({
             <List isPlain isBordered data-id="event-logs">
               {events
                 .slice()
-                .reverse()
+                .toSorted((a, b) => getEventTimestamp(b).localeCompare(getEventTimestamp(a)))
                 .map((event, index) => (
                   <ListItem key={`notebook-event-${event.metadata.uid ?? index}`}>
                     {getEventFullMessage(event)}