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

Replace all hardcoded core object name by enum (#3170)

Browse Source 
* Replace hardcoded core object name by enum

Signed-off-by: Florian Grabmeier <flo.grabmeier@gmail.com>

* Fix typo

Signed-off-by: Florian Grabmeier <flo.grabmeier@gmail.com>

* Fixed duplicate import

---------

Signed-off-by: Florian Grabmeier <flo.grabmeier@gmail.com>
Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
flox_x
2023-12-29 15:11:30 +01:00
committed by GitHub
parent c422045ea6
commit fd607789f4
52 changed files with 150 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
View File

@ -13,6 +13,7 @@ import { Checkbox, CheckboxShape } from '@/ui/input/components/Checkbox';
import { beautifyExactDate, hasDatePassed } from '~/utils/date-utils';
import { useCompleteTask } from '../hooks/useCompleteTask';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
const StyledContainer = styled.div`
align-items: center;
@ -81,7 +82,7 @@ export const TaskRow = ({
) ?? [];
const { records: activityTargets } = useFindManyRecords<ActivityTarget>({
objectNameSingular: 'activityTarget',
objectNameSingular: CoreObjectNameSingular.ActivityTarget,
filter: { id: { in: activityTargetIds } },
});

3
packages/twenty-front/src/modules/activities/tasks/hooks/useCompleteTask.ts
View File

@ -2,12 +2,13 @@ import { useCallback } from 'react';
import { Activity } from '@/activities/types/Activity';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
type Task = Pick<Activity, 'id' | 'completedAt'>;
export const useCompleteTask = (task: Task) => {
const { updateOneRecord: updateOneActivity } = useUpdateOneRecord<Activity>({
objectNameSingular: 'activity',
objectNameSingular: CoreObjectNameSingular.Activity,
});
const completeTask = useCallback(

3
packages/twenty-front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
View File

@ -4,12 +4,13 @@ import { useRecoilValue } from 'recoil';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { parseDate } from '~/utils/date-utils';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
export const useCurrentUserTaskCount = () => {
const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
const { records: tasks } = useFindManyRecords({
objectNameSingular: 'activity',
objectNameSingular: CoreObjectNameSingular.Activity,
filter: {
type: { eq: 'Task' },
completedAt: { is: 'NULL' },

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

@ -7,6 +7,7 @@ import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { parseDate } from '~/utils/date-utils';
import { isDefined } from '~/utils/isDefined';
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
type UseTasksProps = {
filterDropdownId?: string;
@ -21,7 +22,7 @@ export const useTasks = (props?: UseTasksProps) => {
});
const { records: activityTargets } = useFindManyRecords({
objectNameSingular: 'activityTarget',
objectNameSingular: CoreObjectNameSingular.ActivityTarget,
filter: isDefined(entity)
? {
[entity?.type === 'Company' ? 'companyId' : 'personId']: {
@ -32,7 +33,7 @@ export const useTasks = (props?: UseTasksProps) => {
});
const { records: completeTasksData } = useFindManyRecords({
objectNameSingular: 'activity',
objectNameSingular: CoreObjectNameSingular.Activity,
skip: !entity && !selectedFilter,
filter: {
completedAt: { is: 'NOT_NULL' },
@ -56,7 +57,7 @@ export const useTasks = (props?: UseTasksProps) => {
});
const { records: incompleteTaskData } = useFindManyRecords({
objectNameSingular: 'activity',
objectNameSingular: CoreObjectNameSingular.Activity,
skip: !entity && !selectedFilter,
filter: {
completedAt: { is: 'NULL' },