Fixed V2 typing in DatasetHistoryModal

Author: zonia3000

src/lib/components/v2/projects/datasets/DatasetHistoryModal.svelte

@@ -7,7 +7,7 @@
 	/**
 	 * Returns the dataset history formatted in JSON hiding some values.
 	 *
-	 * @param {import('$lib/types').DatasetHistoryItem} historyItem
+	 * @param {import('$lib/types-v2').DatasetHistoryItemV2} historyItem
 	 * @returns {string}
 	 */
 	function formatDatasetHistory(historyItem) {
@@ -16,12 +16,29 @@
 				...historyItem,
 				workflowtask: {
 					...historyItem.workflowtask,
-					task: {
-						...historyItem.workflowtask.task,
-						args_schema: historyItem.workflowtask.task.args_schema ? '[HIDDEN]' : undefined,
-						docs_info: historyItem.workflowtask.task.docs_info ? '[HIDDEN]' : undefined,
-						docs_link: historyItem.workflowtask.task.docs_link ? '[HIDDEN]' : undefined
-					}
+					task: historyItem.workflowtask.is_legacy_task
+						? null
+						: {
+								...historyItem.workflowtask.task,
+								args_schema_non_parallel: historyItem.workflowtask.task.args_schema_non_parallel
+									? '[HIDDEN]'
+									: undefined,
+								args_schema_parallel: historyItem.workflowtask.task.args_schema_parallel
+									? '[HIDDEN]'
+									: undefined,
+								docs_info: historyItem.workflowtask.task.docs_info ? '[HIDDEN]' : undefined,
+								docs_link: historyItem.workflowtask.task.docs_link ? '[HIDDEN]' : undefined
+						  },
+					task_legacy: historyItem.workflowtask.is_legacy_task
+						? {
+								...historyItem.workflowtask.task_legacy,
+								args_schema: historyItem.workflowtask.task_legacy.args_schema
+									? '[HIDDEN]'
+									: undefined,
+								docs_info: historyItem.workflowtask.task_legacy.docs_info ? '[HIDDEN]' : undefined,
+								docs_link: historyItem.workflowtask.task_legacy.docs_link ? '[HIDDEN]' : undefined
+						  }
+						: null
 				}
 			},
 			null,
@@ -40,7 +57,9 @@
 				{#each Object.entries(dataset.history) as [_, value]}
 					<li class="list-group-item text-bg-light">
 						<span>
-							Task "{value.workflowtask.task.name}", status "{value.status}"
+							Task "{value.workflowtask.is_legacy_task
+								? value.workflowtask.task_legacy.name
+								: value.workflowtask.task.name}", status "{value.status}"
 						</span>
 					</li>
 					<li class="list-group-item text-break">

src/lib/types-v2.d.ts

@@ -12,7 +12,7 @@ export type DatasetV2 = {
   name: string
   project_id: number
   project: ProjectV2
-  history: Array<DatasetHistoryItem> | null
+  history: Array<DatasetHistoryItemV2> | null
   zarr_dir: string
   filters: {
     attributes: { [key: string]: string | number | boolean }
@@ -21,6 +21,12 @@ export type DatasetV2 = {
   timestamp_created: string
 }
 
+export type DatasetHistoryItemV2 = {
+  workflowtask: WorkflowTaskV2
+  status: string
+  parallelization: object
+}
+
 export type ImagePage = {
   total_count: number
   page_size: number