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

Improve viewbar api (#2233)

Browse Source 
* create scopes

* fix import bug

* add useView hook

* wip

* wip

* currentViewId is now retrieved via useView

* working on sorts with useView

* refactor in progress

* refactor in progress

* refactor in progress

* refactor in progress

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* fix code

* fix code

* wip

* push

* Fix issue dependencies

* Fix resize

---------

Co-authored-by: bosiraphael <raphael.bosi@gmail.com>
This commit is contained in:
Charles Bochet
2023-10-27 10:52:26 +02:00
committed by GitHub
parent 6a72c14af3
commit 5ba68e997d
205 changed files with 3092 additions and 3249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
front/src/modules/activities/tasks/components/PageAddTaskButton.tsx
View File

@ -1,19 +1,13 @@
import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext';
import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState';
import { useFilter } from '@/ui/data/filter/hooks/useFilter';
import { PageAddButton } from '@/ui/layout/page/PageAddButton';
import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
import { ActivityType } from '~/generated/graphql';
export const PageAddTaskButton = () => {
const { selectedFilters } = useFilter();
const openCreateActivity = useOpenCreateActivityDrawer();
const filters = useRecoilScopedValue(
filtersScopedState,
TasksRecoilScopeContext,
);
const assigneeIdFilter = filters.find(
const assigneeIdFilter = selectedFilters.find(
(filter) => filter.key === 'assigneeId',
);

2
front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
View File

@ -2,7 +2,7 @@ import { DateTime } from 'luxon';
import { useRecoilState } from 'recoil';
import { currentUserState } from '@/auth/states/currentUserState';
import { turnFilterIntoWhereClause } from '@/ui/data/view-bar/utils/turnFilterIntoWhereClause';
import { turnFilterIntoWhereClause } from '@/ui/data/filter/utils/turnFilterIntoWhereClause';
import {
ActivityType,
useGetActivitiesQuery,

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

@ -1,18 +1,13 @@
import { DateTime } from 'luxon';
import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext';
import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity';
import { filtersScopedState } from '@/ui/data/view-bar/states/filtersScopedState';
import { turnFilterIntoWhereClause } from '@/ui/data/view-bar/utils/turnFilterIntoWhereClause';
import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
import { useFilter } from '@/ui/data/filter/hooks/useFilter';
import { turnFilterIntoWhereClause } from '@/ui/data/filter/utils/turnFilterIntoWhereClause';
import { ActivityType, useGetActivitiesQuery } from '~/generated/graphql';
import { parseDate } from '~/utils/date-utils';
export const useTasks = (entity?: ActivityTargetableEntity) => {
const [filters] = useRecoilScopedState(
filtersScopedState,
TasksRecoilScopeContext,
);
const { selectedFilters } = useFilter();
const whereFilters = entity
? {
@ -27,7 +22,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
}
: Object.assign(
{},
...filters.map((filter) => {
...selectedFilters.map((filter) => {
return turnFilterIntoWhereClause(filter);
}),
);
@ -40,7 +35,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
...whereFilters,
},
},
skip: !entity && filters.length === 0,
skip: !entity && selectedFilters.length === 0,
});
const { data: incompleteTaskData } = useGetActivitiesQuery({
@ -51,7 +46,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
...whereFilters,
},
},
skip: !entity && filters.length === 0,
skip: !entity && selectedFilters.length === 0,
});
const todayOrPreviousTasks = incompleteTaskData?.findManyActivities.filter(