diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte index 6ee1c38d3a..b6661ea994 100644 --- a/src/components/activity/ActivityDirectiveForm.svelte +++ b/src/components/activity/ActivityDirectiveForm.svelte @@ -9,7 +9,7 @@ import { createEventDispatcher } from 'svelte'; import { PlanStatusMessages } from '../../enums/planStatusMessages'; import { activityArgumentDefaultsMap } from '../../stores/activities'; - import { activityErrorRollupsMap, activityValidationErrors } from '../../stores/errors'; + import { activityErrorRollupsMap, activityValidationErrors } from '../../stores/console'; import { field } from '../../stores/form'; import { plan, planReadOnly } from '../../stores/plan'; import { plugins } from '../../stores/plugins'; @@ -27,7 +27,7 @@ ActivityDirectiveInstantiationFailure, ActivityErrorCategories, ActivityErrorRollup, - } from '../../types/errors'; + } from '../../types/console'; import type { FieldStore } from '../../types/form'; import type { Argument, ArgumentsMap, FormParameter, ParameterName } from '../../types/parameter'; import type { ActivityDirectiveTagsInsertInput, Tag, TagsChangeEvent } from '../../types/tags'; diff --git a/src/components/activity/ActivityDirectivesTable.svelte b/src/components/activity/ActivityDirectivesTable.svelte index 07038a1add..a35494ec6a 100644 --- a/src/components/activity/ActivityDirectivesTable.svelte +++ b/src/components/activity/ActivityDirectivesTable.svelte @@ -8,7 +8,7 @@ import type { ActivityDirective, ActivityDirectiveId, ActivityType } from '../../types/activity'; import type { User } from '../../types/app'; import type { DataGridColumnDef } from '../../types/data-grid'; - import type { ActivityErrorCounts, ActivityErrorRollup } from '../../types/errors'; + import type { ActivityErrorCounts, ActivityErrorRollup } from '../../types/console'; import type { Plan } from '../../types/plan'; import type { SpansMap, SpanUtilityMaps } from '../../types/simulation'; import { copyActivityDirectivesToClipboard } from '../../utilities/activities'; diff --git a/src/components/activity/ActivityDirectivesTablePanel.svelte b/src/components/activity/ActivityDirectivesTablePanel.svelte index 12efa12594..2fc3d41de8 100644 --- a/src/components/activity/ActivityDirectivesTablePanel.svelte +++ b/src/components/activity/ActivityDirectivesTablePanel.svelte @@ -14,7 +14,7 @@ import { get } from 'svelte/store'; import { InvalidDate } from '../../constants/time'; import { activityDirectivesMap, selectActivity, selectedActivityDirectiveId } from '../../stores/activities'; - import { activityErrorRollupsMap } from '../../stores/errors'; + import { activityErrorRollupsMap } from '../../stores/console'; import { maxTimeRange, plan, planModelActivityTypes, planReadOnly, viewTimeRange } from '../../stores/plan'; import { plugins } from '../../stores/plugins'; import { spansMap, spanUtilityMaps } from '../../stores/simulation'; diff --git a/src/components/console/views/ActivityErrors.svelte b/src/components/console/views/ActivityErrors.svelte index 6ac06de9a7..d35ed76463 100644 --- a/src/components/console/views/ActivityErrors.svelte +++ b/src/components/console/views/ActivityErrors.svelte @@ -5,7 +5,7 @@ import type { ICellRendererParams, IRowNode } from 'ag-grid-community'; import { getContext } from 'svelte'; import type { DataGridColumnDef } from '../../../types/data-grid'; - import type { ActivityErrorCategories, ActivityErrorCounts, ActivityErrorRollup } from '../../../types/errors'; + import type { ActivityErrorCategories, ActivityErrorCounts, ActivityErrorRollup } from '../../../types/console'; import EmptyState from '../../console/EmptyState.svelte'; import ActivityErrorsRollup from '../../ui/ActivityErrorsRollup.svelte'; import DataGrid from '../../ui/DataGrid/DataGrid.svelte'; diff --git a/src/components/console/views/ConsoleLog.svelte b/src/components/console/views/ConsoleLog.svelte index cb53da27de..5c3f1dfb59 100644 --- a/src/components/console/views/ConsoleLog.svelte +++ b/src/components/console/views/ConsoleLog.svelte @@ -4,28 +4,29 @@ import { cn } from '@nasa-jpl/stellar-svelte'; import { ChevronDown, ChevronRight } from 'lucide-svelte'; import { onMount } from 'svelte'; - import type { BaseError, LogMessage } from '../../../types/errors'; - import { isLogMessage } from '../../../utilities/errors'; + import type { ConsoleEntry, LogMessage } from '../../../types/console'; import { safeStringify } from '../../../utilities/text'; import { formatMS } from '../../../utilities/time'; - export let log: BaseError; + export let log: ConsoleEntry; export let defaultExpanded: boolean = false; export let showLevel: boolean = true; export let showTimestamp: boolean = true; export let showLongTimestamp: boolean = true; export let showType: boolean = true; + let duration: number | undefined; let expandable: boolean = false; - let leftContents: HTMLDivElement; - let open: boolean = defaultExpanded; let expansionPadding: number = 0; + let leftContents: HTMLDivElement; let level: string = ''; + let open: boolean = defaultExpanded; let renderedMessage: string = ''; $: expandable = log.data || log.trace || log.cause || log.service ? true : false; $: level = (log as LogMessage).level || ''; + $: duration = (log as LogMessage).duration; // if we have no message but we *do* have data, and row is not expanded, render data as message so row isn't empty $: renderedMessage = !log.message.trim() && log.data && !(expandable && open) ? safeStringify(log.data) : (log.message ?? ''); @@ -137,8 +138,8 @@ {renderedMessage} - {#if isLogMessage(log) && typeof log.duration === 'number'} -
({formatMS(log.duration)})
+ {#if typeof duration === 'number'} +
({formatMS(duration)})
{/if} diff --git a/src/components/console/views/ConsoleLogs.svelte b/src/components/console/views/ConsoleLogs.svelte index 19777dcdab..5e484a7c8c 100644 --- a/src/components/console/views/ConsoleLogs.svelte +++ b/src/components/console/views/ConsoleLogs.svelte @@ -3,7 +3,7 @@