Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
ibolton336 committed Jun 20, 2024
1 parent ae903b9 commit dd1090d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const defaultTaskData: TaskData = {

export const defaultTaskgroup: Taskgroup = {
name: `taskgroup.analyzer`,
addon: "analyzer",
kind: "analyzer",
data: {
...defaultTaskData,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const ApplicationsTable: React.FC = () => {
tasks.find((task: Task) => task.application?.id === application.id);

const { tasks, hasActiveTasks } = useFetchTasks(
{ addon: "analyzer" },
{ kind: "analyzer", addon: "analyzer" },
isAnalyzeModalOpen
);

Expand Down
12 changes: 11 additions & 1 deletion client/src/app/queries/tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {

interface FetchTasksFilters {
addon?: string;
kind?: string;
}

export const TasksQueryKey = "tasks";
Expand All @@ -38,7 +39,16 @@ export const useFetchTasks = (
select: (allTasks) => {
const uniqSorted = allTasks
.filter((task) =>
filters?.addon ? filters.addon === task.addon : true
// If there are any tasks with the addon field, we will still need to consider those older
// tasks that do not have the kind field. This is because the kind field was added later and is
// preferred over the addon field.

// The task manager will determine and assign the addon field when the addon is specified and addon isnt
// which will result in both being set.

filters?.kind || filters?.addon
? filters.kind === task.kind || filters.addon === task.addon
: true
)
// sort by application.id (ascending) then createTime (newest to oldest)
.sort((a, b) =>
Expand Down

0 comments on commit dd1090d

Please sign in to comment.