admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Bug Tasks Page not switching tab

Browse Source
This commit is contained in:
Charles Bochet
2024-01-09 23:06:13 +01:00
parent a9ac14439f
commit 11bf03bbea
7 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts
View File

@ -23,6 +23,8 @@ export const useTasks = ({
filterDropdownId,
});
const isTargettingObjectRecords = isNonEmptyArray(targetableObjects);
const targetableObjectsFilter =
targetableObjects.reduce<LeafObjectRecordFilter>(
(aggregateFilter, targetableObject) => {
@ -44,15 +46,20 @@ export const useTasks = ({
const { records: activityTargets } = useFindManyRecords({
objectNameSingular: CoreObjectNameSingular.ActivityTarget,
filter: targetableObjectsFilter,
skip: !isTargettingObjectRecords,
});
const skipRequest = !isNonEmptyArray(activityTargets) && !selectedFilter;
const idFilter = {
id: {
in: activityTargets.map((activityTarget) => activityTarget.activityId),
},
};
const idFilter = isTargettingObjectRecords
? {
id: {
in: activityTargets.map(
(activityTarget) => activityTarget.activityId,
),
},
}
: { id: {} };
const assigneeIdFilter = selectedFilter
? {