feat(md): remove events white list and get info from the backend

spinnaker · Mar 3, 2021 · 378890b · 378890b
1 parent e5213a8
commit 378890b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 94 deletions.
diff --git a/app/scripts/modules/core/src/domain/IManagedEntity.ts b/app/scripts/modules/core/src/domain/IManagedEntity.ts
@@ -207,6 +207,7 @@ export type ManagedResourceEventType =
   | 'ResourceCheckError'
   | 'ResourceCheckUnresolvable'
   | 'ResourceActuationPaused'
+  | 'ResourceActuationVetoed'
   | 'ResourceActuationResumed';
 
 export interface IManagedResourceDiff {
@@ -225,6 +226,8 @@ export interface IManagedResourceEvent {
   id: string;
   application: string;
   timestamp: string;
+  displayName: string;
+  level: 'SUCCESS' | 'INFO' | 'WARNING' | 'ERROR';
   plugin?: string;
   tasks?: Array<{ id: string; name: string }>;
   delta?: IManagedResourceDiff;

diff --git a/app/scripts/modules/core/src/managed/resourceHistory/HistoryEventRow.tsx b/app/scripts/modules/core/src/managed/resourceHistory/HistoryEventRow.tsx
@@ -10,10 +10,9 @@ import { relativeTime, timestamp } from 'core/utils';
 
 import { ManagedResourceDiffTable } from './ManagedResourceDiffTable';
 import { TableCell, TableRow } from '../../presentation';
-import { viewConfigurationByEventType } from './utils';
 
 const ExpandedRowContent: React.FC<{
-  level: 'info' | 'warning' | 'error';
+  level: IManagedResourceEvent['level'];
   diff?: IManagedResourceDiff;
   tasks?: Array<{ id: string; name: string }>;
   message?: string;
@@ -24,8 +23,8 @@ const ExpandedRowContent: React.FC<{
       {message && (
         <div
           className={classNames('sp-padding-xs-yaxis', {
-            'event-warning-message': level === 'warning',
-            'event-error-message': level === 'error',
+            'event-warning-message': level === 'WARNING',
+            'event-error-message': level === 'ERROR',
           })}
         >
           {message}
@@ -55,7 +54,7 @@ interface HistoryEventRowProps {
 
 export const HistoryEventRow: React.FC<HistoryEventRowProps> = React.memo(
   ({ event, dismissModal, resourceSummary }) => {
-    const { type, timestamp: eventTimestamp, delta, tasks, message, reason, exceptionMessage } = event;
+    const { timestamp: eventTimestamp, delta, tasks, message, reason, exceptionMessage } = event;
     const eventTimestampMillis = DateTime.fromISO(eventTimestamp).toMillis();
     const hasDetails = delta || tasks || message || reason || exceptionMessage;
     return (
@@ -64,7 +63,7 @@ export const HistoryEventRow: React.FC<HistoryEventRowProps> = React.memo(
           hasDetails
             ? () => (
                 <ExpandedRowContent
-                  level={viewConfigurationByEventType[type].level}
+                  level={event.level}
                   diff={delta}
                   tasks={tasks}
                   message={message || reason || exceptionMessage}
@@ -79,13 +78,7 @@ export const HistoryEventRow: React.FC<HistoryEventRowProps> = React.memo(
           <span className="sp-margin-s-left">{resourceSummary.displayName}</span>
         </TableCell>
         <TableCell>
-          <i
-            className={classNames(
-              'event-type-icon ico ico--withLabel sp-margin-s-right',
-              viewConfigurationByEventType[type]?.iconClass,
-            )}
-          />{' '}
-          <span className="text-semibold event-type">{viewConfigurationByEventType[type]?.displayName}</span>
+          <span className="text-semibold event-type">{event.displayName}</span>
         </TableCell>
         <TableCell>
           <div className="flex-container-h middle wrap">

diff --git a/app/scripts/modules/core/src/managed/resourceHistory/ManagedResourceHistoryModal.less b/app/scripts/modules/core/src/managed/resourceHistory/ManagedResourceHistoryModal.less
@@ -1,15 +1,10 @@
 .ManagedResourceHistoryModal {
   width: 100%;
 
-  .event-type,
-  .event-type-icon {
+  .event-type {
     color: var(--color-charcoal);
   }
 
-  .event-type-icon {
-    font-size: 24px;
-  }
-
   .event-warning-message {
     color: var(--color-alert);
   }

diff --git a/app/scripts/modules/core/src/managed/resourceHistory/ManagedResourceHistoryModal.tsx b/app/scripts/modules/core/src/managed/resourceHistory/ManagedResourceHistoryModal.tsx
@@ -15,7 +15,6 @@ import {
   Table,
   usePollingData,
 } from '../../presentation';
-import { viewConfigurationByEventType } from './utils';
 
 import './ManagedResourceHistoryModal.less';
 
@@ -71,11 +70,9 @@ export const ManagedResourceHistoryModal = ({ resourceSummary, dismissModal }: I
                     delta || tasks || message || reason || exceptionMessage,
                 )}
               >
-                {(historyEvents || [])
-                  .filter(({ type }) => viewConfigurationByEventType[type])
-                  .map((event) => (
-                    <HistoryEventRow key={event.type + event.timestamp} {...{ event, resourceSummary, dismissModal }} />
-                  ))}
+                {(historyEvents || []).map((event) => (
+                  <HistoryEventRow key={event.type + event.timestamp} {...{ event, resourceSummary, dismissModal }} />
+                ))}
               </Table>
             </div>
           )}

diff --git a/app/scripts/modules/core/src/managed/resourceHistory/utils.ts b/app/scripts/modules/core/src/managed/resourceHistory/utils.ts