Get latest status message

kyma-project · Jan 10, 2025 · de98e36 · de98e36
1 parent fefbf28
commit de98e36
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/src/components/Extensibility/components/Badge.js b/src/components/Extensibility/components/Badge.js
@@ -38,21 +38,15 @@ export function Badge({
     arrayItems,
   });
 
-  const extractMessageAndCheckValidity = description => {
-    if (!description && typeof description !== 'string') {
-      return '';
-    }
-    // Extracts a message from the string.
-    const messageArray = description.split('message');
-    // Removes the colon and blank, leaving only the value.
-    const messageValue = messageArray[messageArray.length - 1].replace(
-      /:|\s/g,
-      '',
+  const getLatestStatusMessage = (resource, defaultValue) => {
+    const getTime = date => new Date(date)?.getTime();
+    const latestStatus = resource?.status?.conditions?.reduce((prev, current) =>
+      prev &&
+      getTime(prev.lastTransitionTime) > getTime(current.lastTransitionTime)
+        ? prev
+        : current,
     );
-    // Checks if it is valid.
-    return messageValue === 'null' || messageValue === 'undefined'
-      ? ''
-      : description;
+    return latestStatus?.message ?? defaultValue;
   };
 
   const [tooltip, tooltipError] = jsonata(structure?.description);
@@ -97,7 +91,7 @@ export function Badge({
       tooltipContent={
         tooltip && !tooltipError
           ? tooltip
-          : extractMessageAndCheckValidity(structure.description)
+          : getLatestStatusMessage(originalResource, structure.description)
       }
     >
       {tExt(value)}