Complete Fix view work (#2272)

* Fix views

* Make view sorts and view filters functional

* Complete Company table view fix

* Fix model creation

* Start fixing board

* Complete work
This commit is contained in:
Charles Bochet
2023-10-29 16:29:00 +01:00
committed by GitHub
parent 685d342170
commit 9bab28912d
118 changed files with 1806 additions and 1413 deletions

View File

@ -4,17 +4,13 @@ import { PageAddButton } from '@/ui/layout/page/PageAddButton';
import { ActivityType } from '~/generated/graphql';
export const PageAddTaskButton = () => {
const { selectedFilters } = useFilter();
const { selectedFilter } = useFilter();
const openCreateActivity = useOpenCreateActivityDrawer();
const assigneeIdFilter = selectedFilters.find(
(filter) => filter.key === 'assigneeId',
);
const handleClick = () => {
openCreateActivity({
type: ActivityType.Task,
assigneeId: assigneeIdFilter?.value,
assigneeId: selectedFilter?.value,
});
};

View File

@ -17,12 +17,14 @@ export const useCurrentUserTaskCount = () => {
completedAt: { equals: null },
...(currentUser
? turnFilterIntoWhereClause({
key: 'assigneeId',
type: 'entity',
fieldId: 'assigneeId',
value: currentUser.id,
operand: ViewFilterOperand.Is,
displayValue: currentUser.displayName,
displayAvatarUrl: currentUser.avatarUrl ?? undefined,
definition: {
type: 'entity',
},
})
: {}),
},

View File

@ -7,7 +7,7 @@ import { ActivityType, useGetActivitiesQuery } from '~/generated/graphql';
import { parseDate } from '~/utils/date-utils';
export const useTasks = (entity?: ActivityTargetableEntity) => {
const { selectedFilters } = useFilter();
const { selectedFilter } = useFilter();
const whereFilters = entity
? {
@ -20,12 +20,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
},
},
}
: Object.assign(
{},
...selectedFilters.map((filter) => {
return turnFilterIntoWhereClause(filter);
}),
);
: Object.assign({}, turnFilterIntoWhereClause(selectedFilter));
const { data: completeTasksData } = useGetActivitiesQuery({
variables: {
@ -35,7 +30,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
...whereFilters,
},
},
skip: !entity && selectedFilters.length === 0,
skip: !entity && !selectedFilter,
});
const { data: incompleteTaskData } = useGetActivitiesQuery({
@ -46,7 +41,7 @@ export const useTasks = (entity?: ActivityTargetableEntity) => {
...whereFilters,
},
},
skip: !entity && selectedFilters.length === 0,
skip: !entity && !selectedFilter,
});
const todayOrPreviousTasks = incompleteTaskData?.findManyActivities.filter(