Skip to content

Commit f0fe30d

Browse files
committed
Used new /type-filters-flow endpoint response structure
1 parent 1c99c63 commit f0fe30d

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

components/src/lib/types/api.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ export type TaskGroupActivityV2 = {
275275
};
276276

277277
export type TypeFiltersFlow = {
278+
workflowtask_id: number;
278279
current_type_filters: { [key: string]: bool };
279280
input_type_filters: { [key: string]: bool };
280281
output_type_filters: { [key: string]: bool };

src/lib/components/v2/workflow/RunWorkflowModal.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,11 +376,11 @@
376376
`/api/v2/project/${workflow.project_id}/workflow/${workflow.id}/type-filters-flow`
377377
);
378378
if (response.ok) {
379-
/** @type {{ [id: string]: import("fractal-components/types/api").TypeFiltersFlow }} */
379+
/** @type {Array<import("fractal-components/types/api").TypeFiltersFlow>} */
380380
const typeFiltersFlow = await response.json();
381-
if (workflowTask.id in typeFiltersFlow) {
382-
currentTypeFilters = typeFiltersFlow[workflowTask.id].current_type_filters;
383-
}
381+
currentTypeFilters =
382+
typeFiltersFlow.find((t) => t.workflowtask_id === workflowTask.id)?.current_type_filters ||
383+
{};
384384
}
385385
return {
386386
...currentTypeFilters,

src/lib/components/v2/workflow/TypeFiltersFlowModal.svelte

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
let modal;
1111
let loading = false;
1212
13-
/** @type {{ [id: string]: import("fractal-components/types/api").TypeFiltersFlow }|undefined} */
14-
let typeFiltersFlow;
13+
/** @type {Array<import("fractal-components/types/api").TypeFiltersFlow>} */
14+
let typeFiltersFlow = [];
1515
1616
export async function open() {
1717
modal.show();
@@ -36,14 +36,14 @@
3636
}
3737
3838
/**
39-
* @param {number} taskId
39+
* @param {number} workflowTaskId
4040
*/
41-
function getTaskById(taskId) {
42-
return workflow.task_list.filter((t) => t.id === taskId)[0].task;
41+
function getTaskById(workflowTaskId) {
42+
return workflow.task_list.filter((t) => t.id === workflowTaskId)[0].task;
4343
}
4444
4545
function onClose() {
46-
typeFiltersFlow = undefined;
46+
typeFiltersFlow = [];
4747
}
4848
</script>
4949

@@ -70,10 +70,10 @@
7070
<tbody>
7171
{#if !loading}
7272
<!-- eslint-disable-next-line no-unused-vars -->
73-
{#each Object.entries(typeFiltersFlow) as [taskId, filters], index}
73+
{#each typeFiltersFlow as filters}
7474
<tr>
7575
<td>
76-
{getTaskById(Number(taskId)).name}
76+
{getTaskById(Number(filters.workflowtask_id)).name}
7777
</td>
7878
<td>
7979
<TypeFiltersCell filters={filters.current_type_filters} />

0 commit comments

Comments
 (0)