mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix/object record and metadata naming (#2763)

Browse Source 
* Fixed object-record and object-metadata naming

* Fix post merge

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Lucas Bordeau
2023-11-29 13:45:57 +01:00
committed by GitHub
parent 3617abb0e6
commit d855a42eca
99 changed files with 614 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import { undefined } from 'zod';
import { Activity } from '@/activities/types/Activity';
import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity';
import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { parseDate } from '~/utils/date-utils';
import { isDefined } from '~/utils/isDefined';
@ -21,7 +21,7 @@ export const useTasks = (props?: UseTasksProps) => {
filterDropdownId: filterDropdownId,
});
const { objects: activityTargets } = useFindManyObjectRecords({
const { records: activityTargets } = useFindManyRecords({
objectNamePlural: 'activityTargets',
filter: isDefined(entity)
? {
@ -32,7 +32,7 @@ export const useTasks = (props?: UseTasksProps) => {
: undefined,
});
const { objects: completeTasksData } = useFindManyObjectRecords({
const { records: completeTasksData } = useFindManyRecords({
objectNamePlural: 'activities',
skip: !entity && !selectedFilter,
filter: {
@ -56,7 +56,7 @@ export const useTasks = (props?: UseTasksProps) => {
},
});
const { objects: incompleteTaskData } = useFindManyObjectRecords({
const { records: incompleteTaskData } = useFindManyRecords({
objectNamePlural: 'activities',
skip: !entity && !selectedFilter,
filter: {