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

* 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>
2023-12-29 15:11:30 +01:00
parent c422045ea6
commit fd607789f4
52 changed files with 150 additions and 82 deletions
--- a/packages/twenty-front/src/modules/activities/components/ActivityBodyEditor.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityBodyEditor.tsx
@ -11,6 +11,7 @@ import { BlockEditor } from '@/ui/input/editor/components/BlockEditor';
 import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import { FileFolder, useUploadFileMutation } from '~/generated/graphql';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 const StyledBlockNoteStyledContainer = styled.div`
  width: 100%;
@ -27,7 +28,7 @@ export const ActivityBodyEditor = ({
 }: ActivityBodyEditorProps) => {
  const [body, setBody] = useState<string | null>(null);
  const { updateOneRecord } = useUpdateOneRecord({
-    objectNameSingular: 'activity',
+    objectNameSingular: CoreObjectNameSingular.Activity,
  });

  useEffect(() => {
--- a/packages/twenty-front/src/modules/activities/components/ActivityComments.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityComments.tsx
@ -14,6 +14,7 @@ import {
  AutosizeTextInputVariant,
 } from '@/ui/input/components/AutosizeTextInput';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 const StyledThreadItemListContainer = styled.div`
  align-items: flex-start;
@ -61,13 +62,13 @@ export const ActivityComments = ({
  scrollableContainerRef,
 }: ActivityCommentsProps) => {
  const { createOneRecord: createOneComment } = useCreateOneRecord({
-    objectNameSingular: 'comment',
+    objectNameSingular: CoreObjectNameSingular.Comment,
  });

  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);

  const { records: comments } = useFindManyRecords({
-    objectNameSingular: 'comment',
+    objectNameSingular: CoreObjectNameSingular.Comment,
    filter: {
      activityId: {
        eq: activity?.id ?? '',
--- a/packages/twenty-front/src/modules/activities/components/ActivityEditor.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityEditor.tsx
@ -9,6 +9,7 @@ import { Activity } from '@/activities/types/Activity';
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { Comment } from '@/activities/types/Comment';
 import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFieldContext } from '@/object-record/hooks/useFieldContext';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
@ -81,11 +82,11 @@ export const ActivityEditor = ({

  const containerRef = useRef<HTMLDivElement>(null);
  const { updateOneRecord: updateOneActivity } = useUpdateOneRecord<Activity>({
-    objectNameSingular: 'activity',
+    objectNameSingular: CoreObjectNameSingular.Activity,
  });

  const { FieldContextProvider: DueAtFieldContextProvider } = useFieldContext({
-    objectNameSingular: 'activity',
+    objectNameSingular: CoreObjectNameSingular.Activity,
    objectRecordId: activity.id,
    fieldMetadataName: 'dueAt',
    fieldPosition: 0,
@ -93,7 +94,7 @@ export const ActivityEditor = ({

  const { FieldContextProvider: AssigneeFieldContextProvider } =
    useFieldContext({
-      objectNameSingular: 'activity',
+      objectNameSingular: CoreObjectNameSingular.Activity,
      objectRecordId: activity.id,
      fieldMetadataName: 'assignee',
      fieldPosition: 1,
--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx
@ -14,6 +14,7 @@ import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { IconCalendar } from '@/ui/display/icon';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import { formatToHumanReadableDate } from '~/utils';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 const StyledRow = styled.div`
  align-items: center;
@ -63,7 +64,7 @@ export const AttachmentRow = ({ attachment }: { attachment: Attachment }) => {

  const { deleteOneRecord: deleteOneAttachment } =
    useDeleteOneRecord<Attachment>({
-      objectNameSingular: 'attachment',
+      objectNameSingular: CoreObjectNameSingular.Attachment,
    });

  const handleDelete = () => {
--- a/packages/twenty-front/src/modules/activities/files/components/Attachments.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/Attachments.tsx
@ -12,6 +12,7 @@ import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { IconPlus } from '@/ui/display/icon';
 import { Button } from '@/ui/input/button/components/Button';
 import { FileFolder, useUploadFileMutation } from '~/generated/graphql';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 const StyledTaskGroupEmptyContainer = styled.div`
  align-items: center;
@ -67,7 +68,7 @@ export const Attachments = ({

  const { createOneRecord: createOneAttachment } =
    useCreateOneRecord<Attachment>({
-      objectNameSingular: 'attachment',
+      objectNameSingular: CoreObjectNameSingular.Attachment,
    });

  const handleFileChange = (e: ChangeEvent<HTMLInputElement>) => {
--- a/packages/twenty-front/src/modules/activities/files/hooks/useAttachments.tsx
+++ b/packages/twenty-front/src/modules/activities/files/hooks/useAttachments.tsx
@ -2,11 +2,12 @@ import { Attachment } from '@/activities/files/types/Attachment';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';

 import { ActivityTargetableEntity } from '../../types/ActivityTargetableEntity';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 // do we need to test this?
 export const useAttachments = (entity: ActivityTargetableEntity) => {
  const { records: attachments } = useFindManyRecords({
-    objectNameSingular: 'attachment',
+    objectNameSingular: CoreObjectNameSingular.Attachment,
    filter: {
      [entity.type === 'Company' ? 'companyId' : 'personId']: { eq: entity.id },
    },
--- a/packages/twenty-front/src/modules/activities/hooks/useHandleCheckableActivityTargetChange.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useHandleCheckableActivityTargetChange.ts
@ -1,4 +1,5 @@
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';

@ -11,10 +12,10 @@ export const useHandleCheckableActivityTargetChange = ({
 }) => {
  const { createOneRecord: createOneActivityTarget } =
    useCreateOneRecord<ActivityTarget>({
-      objectNameSingular: 'activityTarget',
+      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
    });
  const { deleteOneRecord: deleteOneActivityTarget } = useDeleteOneRecord({
-    objectNameSingular: 'activityTarget',
+    objectNameSingular: CoreObjectNameSingular.ActivityTarget,
  });

  return async (
--- a/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
+++ b/packages/twenty-front/src/modules/activities/hooks/useOpenCreateActivityDrawer.ts
@ -15,15 +15,16 @@ import { activityTargetableEntityArrayState } from '../states/activityTargetable
 import { viewableActivityIdState } from '../states/viewableActivityIdState';
 import { ActivityTargetableEntity } from '../types/ActivityTargetableEntity';
 import { getTargetableEntitiesWithParents } from '../utils/getTargetableEntitiesWithParents';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 export const useOpenCreateActivityDrawer = () => {
  const { openRightDrawer } = useRightDrawer();
  const { createOneRecord: createOneActivityTarget } =
    useCreateOneRecord<ActivityTarget>({
-      objectNameSingular: 'activityTarget',
+      objectNameSingular: CoreObjectNameSingular.ActivityTarget,
    });
  const { createOneRecord: createOneActivity } = useCreateOneRecord<Activity>({
-    objectNameSingular: 'activity',
+    objectNameSingular: CoreObjectNameSingular.Activity,
  });
  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
  const setHotkeyScope = useSetHotkeyScope();
--- a/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx
+++ b/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx
@ -11,6 +11,7 @@ import { MultipleEntitySelect } from '@/object-record/relation-picker/components
 import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
 import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
 import { assertNotNull } from '~/utils/assert';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 type ActivityTargetInlineCellEditModeProps = {
  activityId: string;
@ -56,12 +57,12 @@ export const ActivityTargetInlineCellEditMode = ({
  );

  const { findManyRecordsQuery: findManyPeopleQuery } = useObjectMetadataItem({
-    objectNameSingular: 'person',
+    objectNameSingular: CoreObjectNameSingular.Person,
  });

  const { findManyRecordsQuery: findManyCompaniesQuery } =
    useObjectMetadataItem({
-      objectNameSingular: 'company',
+      objectNameSingular: CoreObjectNameSingular.Company,
    });

  const useFindManyPeopleQuery = (options: any) =>
@ -87,7 +88,7 @@ export const ActivityTargetInlineCellEditMode = ({
    orderByField: 'createdAt',
    mappingFunction: (record: any) => identifiersMapper?.(record, 'person'),
    selectedIds: initialPeopleIds,
-    objectNameSingular: 'person',
+    objectNameSingular: CoreObjectNameSingular.Person,
    limit: 3,
  });

@ -102,7 +103,7 @@ export const ActivityTargetInlineCellEditMode = ({
    orderByField: 'createdAt',
    mappingFunction: (record: any) => identifiersMapper?.(record, 'company'),
    selectedIds: initialCompanyIds,
-    objectNameSingular: 'company',
+    objectNameSingular: CoreObjectNameSingular.Company,
    limit: 3,
  });

--- a/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
+++ b/packages/twenty-front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
@ -2,6 +2,7 @@ import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips
 import { ActivityTargetInlineCellEditMode } from '@/activities/inline-cell/components/ActivityTargetInlineCellEditMode';
 import { ActivityTarget } from '@/activities/types/ActivityTarget';
 import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { RecordInlineCellContainer } from '@/object-record/record-inline-cell/components/RecordInlineCellContainer';
 import { FieldRecoilScopeContext } from '@/object-record/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
@ -28,7 +29,7 @@ export const ActivityTargetsInlineCell = ({
    ) ?? [];

  const { records: activityTargets } = useFindManyRecords<ActivityTarget>({
-    objectNameSingular: 'activityTarget',
+    objectNameSingular: CoreObjectNameSingular.ActivityTarget,
    filter: { id: { in: activityTargetIds } },
  });

--- a/packages/twenty-front/src/modules/activities/notes/hooks/useNotes.ts
+++ b/packages/twenty-front/src/modules/activities/notes/hooks/useNotes.ts
@ -3,10 +3,11 @@ import { OrderByField } from '@/object-metadata/types/OrderByField';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';

 import { ActivityTargetableEntity } from '../../types/ActivityTargetableEntity';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 export const useNotes = (entity: ActivityTargetableEntity) => {
  const { records: activityTargets } = useFindManyRecords({
-    objectNameSingular: 'activityTarget',
+    objectNameSingular: CoreObjectNameSingular.ActivityTarget,
    filter: {
      [entity.type === 'Company' ? 'companyId' : 'personId']: { eq: entity.id },
    },
@ -24,7 +25,7 @@ export const useNotes = (entity: ActivityTargetableEntity) => {

  const { records: notes } = useFindManyRecords({
    skip: !activityTargets?.length,
-    objectNameSingular: 'activity',
+    objectNameSingular: CoreObjectNameSingular.Activity,
    filter,
    orderBy,
  });
--- a/packages/twenty-front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx
+++ b/packages/twenty-front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx
@ -4,6 +4,7 @@ import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
 import { IconTrash } from '@/ui/display/icon';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { isRightDrawerOpenState } from '@/ui/layout/right-drawer/states/isRightDrawerOpenState';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 type ActivityActionBarProps = {
  activityId: string;
@ -12,7 +13,7 @@ type ActivityActionBarProps = {
 export const ActivityActionBar = ({ activityId }: ActivityActionBarProps) => {
  const [, setIsRightDrawerOpen] = useRecoilState(isRightDrawerOpenState);
  const { deleteOneRecord: deleteOneActivity } = useDeleteOneRecord({
-    objectNameSingular: 'activity',
+    objectNameSingular: CoreObjectNameSingular.Activity,
    refetchFindManyQuery: true,
  });

--- a/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
+++ b/packages/twenty-front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
@ -8,6 +8,7 @@ import { entityFieldsFamilyState } from '@/object-record/field/states/entityFiel
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';

 import '@blocknote/core/style.css';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 const StyledContainer = styled.div`
  box-sizing: border-box;
@ -35,7 +36,7 @@ export const RightDrawerActivity = ({
  );

  const { record: activity } = useFindOneRecord({
-    objectNameSingular: 'activity',
+    objectNameSingular: CoreObjectNameSingular.Activity,
    objectRecordId: activityId,
    skip: !activityId,
    onCompleted: (activity: Activity) => {
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
@ -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 } },
  });

--- a/packages/twenty-front/src/modules/activities/tasks/hooks/useCompleteTask.ts
+++ b/packages/twenty-front/src/modules/activities/tasks/hooks/useCompleteTask.ts
@ -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(
--- a/packages/twenty-front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
+++ b/packages/twenty-front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
@ -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' },
--- a/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts
+++ b/packages/twenty-front/src/modules/activities/tasks/hooks/useTasks.ts
@ -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' },
--- a/packages/twenty-front/src/modules/activities/timeline/components/Timeline.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline/components/Timeline.tsx
@ -9,6 +9,7 @@ import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';

 import { TimelineItemsContainer } from './TimelineItemsContainer';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';

 const StyledMainContainer = styled.div`
  align-items: flex-start;
@ -49,7 +50,7 @@ const StyledEmptyTimelineSubTitle = styled.div`

 export const Timeline = ({ entity }: { entity: ActivityTargetableEntity }) => {
  const { records: activityTargets, loading } = useFindManyRecords({
-    objectNameSingular: 'activityTarget',
+    objectNameSingular: CoreObjectNameSingular.ActivityTarget,
    filter: {
      [entity.type === 'Company' ? 'companyId' : 'personId']: { eq: entity.id },
    },
@ -57,7 +58,7 @@ export const Timeline = ({ entity }: { entity: ActivityTargetableEntity }) => {

  const { records: activities } = useFindManyRecords({
    skip: !activityTargets?.length,
-    objectNameSingular: 'activity',
+    objectNameSingular: CoreObjectNameSingular.Activity,
    filter: {
      id: {
        in: activityTargets?.map((activityTarget) => activityTarget.activityId),