diff --git a/app/scripts/modules/core/src/domain/IManagedEntity.ts b/app/scripts/modules/core/src/domain/IManagedEntity.ts index 8ca4b6c2cf6..ddcde0164d2 100644 --- 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 index 524fe2b0f7f..4945d5f98d0 100644 --- 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 && (
{message} @@ -55,7 +54,7 @@ interface HistoryEventRowProps { export const HistoryEventRow: React.FC = 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 = React.memo( hasDetails ? () => ( = React.memo( {resourceSummary.displayName} - {' '} - {viewConfigurationByEventType[type]?.displayName} + {event.displayName}
diff --git a/app/scripts/modules/core/src/managed/resourceHistory/ManagedResourceHistoryModal.less b/app/scripts/modules/core/src/managed/resourceHistory/ManagedResourceHistoryModal.less index 39aa3877cf6..fd007df0391 100644 --- 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 index 888152353c2..5103af9aa28 100644 --- 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) => ( - - ))} + {(historyEvents || []).map((event) => ( + + ))}
)} diff --git a/app/scripts/modules/core/src/managed/resourceHistory/utils.ts b/app/scripts/modules/core/src/managed/resourceHistory/utils.ts deleted file mode 100644 index ead015e4b4d..00000000000 --- a/app/scripts/modules/core/src/managed/resourceHistory/utils.ts +++ /dev/null @@ -1,69 +0,0 @@ -export const viewConfigurationByEventType = { - ResourceCreated: { - displayName: 'Created', - iconClass: 'icon-md-created', - level: 'info', - }, - ResourceUpdated: { - displayName: 'Config updated', - // Needs it's own icon - iconClass: 'icon-md-created', - level: 'info', - }, - ResourceDeleted: { - displayName: 'Deleted', - // Needs it's own icon - iconClass: 'icon-md-missing-resource', - level: 'info', - }, - ResourceMissing: { - displayName: 'Missing', - iconClass: 'icon-md-missing-resource', - level: 'info', - }, - ResourceValid: { - displayName: 'Valid', - // Needs it's own icon - iconClass: 'icon-md-delta-resolved', - level: 'info', - }, - ResourceDeltaDetected: { - displayName: 'Difference detected', - iconClass: 'icon-md-delta-detected', - level: 'info', - }, - ResourceDeltaResolved: { - displayName: 'Difference resolved', - iconClass: 'icon-md-delta-resolved', - level: 'info', - }, - ResourceActuationLaunched: { - displayName: 'Task launched', - iconClass: 'icon-md-actuation-launched', - level: 'info', - }, - ResourceCheckError: { - displayName: 'Error', - // Needs it's own icon - iconClass: 'icon-md-error', - level: 'error', - }, - ResourceCheckUnresolvable: { - displayName: 'Temporary issue', - // Needs it's own icon, but could likely be same as ResourceCheckError - iconClass: 'icon-md-error', - level: 'warning', - }, - ResourceActuationPaused: { - displayName: 'Management paused', - // Needs it's own icon - iconClass: 'icon-md-paused', - level: 'warning', - }, - ResourceActuationResumed: { - displayName: 'Management resumed', - // Needs it's own icon - iconClass: 'icon-md-resumed', - level: 'info', - }, -} as const;