Merge branch 'main' into tags-input-min-width

PrefectHQ · Dec 3, 2024 · 5df789a · 5df789a
2 parents e1a31bd + 562df0c
commit 5df789a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 47 deletions.
diff --git a/src/components/ArtifactTimeline.vue b/src/components/ArtifactTimeline.vue
@@ -126,13 +126,22 @@
     getArtifacts()
   })
 
+  type ArtifactTimelineArtifactItem = TimelineItem & {
+    data: Artifact,
+    id: string,
+    type: 'artifact',
+  }
 
-  type ArtifactTimelineItem = TimelineItem & {
-    icon?: Icon,
+  type ArtifactTimelineMessageItem = TimelineItem & {
     id: string,
-    data: Artifact | string,
-    type: 'artifact' | 'message',
+    data: string,
+    icon: Icon,
+    type: 'message',
   }
+
+  type ArtifactTimelineItem = ArtifactTimelineArtifactItem | ArtifactTimelineMessageItem
+
+
   const items = computed<ArtifactTimelineItem[]>(() => {
     const items: ArtifactTimelineItem[] = []
 

diff --git a/src/components/WorkspaceEventsTimeline.vue b/src/components/WorkspaceEventsTimeline.vue
@@ -19,15 +19,17 @@
 </template>
 
 <script lang="ts" setup>
-  import { TimelineLayout, media } from '@prefecthq/prefect-design'
+  import { TimelineItem, TimelineLayout, media } from '@prefecthq/prefect-design'
   import { computed } from 'vue'
   import WorkspaceEventIcon from '@/components/WorkspaceEventIcon.vue'
   import WorkspaceEventListItemDate from '@/components/WorkspaceEventListItemDate.vue'
   import WorkspaceEventsTimelineContent from '@/components/WorkspaceEventsTimelineContent.vue'
   import { WorkspaceEvent, isWorkspaceEvent } from '@/models/workspaceEvent'
 
+  type WorkspaceEventTimelineItem = TimelineItem & WorkspaceEvent
+
   const props = defineProps<{
-    events: WorkspaceEvent[],
+    events: WorkspaceEventTimelineItem[],
     startDate: Date,
     endDate: Date,
     layout?: TimelineLayout,

diff --git a/src/utilities/timeline.ts b/src/utilities/timeline.ts