replace search resolvers by global search in front (#11086)

Done - Replace global search in multi record picker and single record picker To do - refactor SingleRecordPicker to match MultipleRecordPicker - next 1:1 - items in this issue https://github.com/twentyhq/core-team-issues/issues/643 closes https://github.com/twentyhq/core-team-issues/issues/535
2025-03-21 17:25:00 +01:00
parent da527f1780
commit e624e8deee
26 changed files with 481 additions and 651 deletions
--- a/packages/twenty-front/src/modules/object-record/hooks/useObjectRecordSearchRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useObjectRecordSearchRecords.ts
@ -0,0 +1,81 @@
+import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
+import { MAX_SEARCH_RESULTS } from '@/command-menu/constants/MaxSearchResults';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
+import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
+import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
+import { WatchQueryFetchPolicy } from '@apollo/client';
+import { useMemo } from 'react';
+import { useRecoilValue } from 'recoil';
+import { isDefined } from 'twenty-shared';
+import {
+  ObjectRecordFilterInput,
+  useGlobalSearchQuery,
+} from '~/generated/graphql';
+import { logError } from '~/utils/logError';
+
+export type UseSearchRecordsParams = ObjectMetadataItemIdentifier & {
+  limit?: number;
+  onError?: (error?: Error) => void;
+  skip?: boolean;
+  fetchPolicy?: WatchQueryFetchPolicy;
+  searchInput?: string;
+  filter?: ObjectRecordFilterInput;
+};
+
+export const useObjectRecordSearchRecords = ({
+  objectNameSingular,
+  searchInput,
+  limit,
+  skip,
+  filter,
+  fetchPolicy,
+}: UseSearchRecordsParams) => {
+  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
+  const { objectMetadataItem } = useObjectMetadataItem({
+    objectNameSingular,
+  });
+
+  const { enqueueSnackBar } = useSnackBar();
+
+  const { data, loading, error, previousData } = useGlobalSearchQuery({
+    skip:
+      skip ||
+      !objectMetadataItem ||
+      !currentWorkspaceMember ||
+      !isDefined(searchInput),
+    variables: {
+      searchInput: searchInput ?? '',
+      limit: limit ?? MAX_SEARCH_RESULTS,
+      filter: filter ?? {},
+      includedObjectNameSingulars: [objectNameSingular],
+    },
+    fetchPolicy: fetchPolicy,
+    onError: (error) => {
+      logError(
+        `useGlobalSearchRecords for "${objectMetadataItem.namePlural}" error : ` +
+          error,
+      );
+      enqueueSnackBar(
+        `Error during useGlobalSearchRecords for "${objectMetadataItem.namePlural}", ${error.message}`,
+        {
+          variant: SnackBarVariant.Error,
+        },
+      );
+    },
+  });
+
+  const effectiveData = loading ? previousData : data;
+
+  const searchRecords = useMemo(
+    () => effectiveData?.globalSearch || [],
+    [effectiveData],
+  );
+
+  return {
+    objectMetadataItem,
+    searchRecords,
+    loading,
+    error,
+  };
+};
--- a/packages/twenty-front/src/modules/object-record/hooks/useSearchRecords.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useSearchRecords.ts
@ -1,98 +0,0 @@
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
-import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';
-import { RecordGqlOperationGqlRecordFields } from '@/object-record/graphql/types/RecordGqlOperationGqlRecordFields';
-import { RecordGqlOperationSearchResult } from '@/object-record/graphql/types/RecordGqlOperationSearchResult';
-import { RecordGqlOperationVariables } from '@/object-record/graphql/types/RecordGqlOperationVariables';
-import { useSearchRecordsQuery } from '@/object-record/hooks/useSearchRecordsQuery';
-import { ObjectRecord } from '@/object-record/types/ObjectRecord';
-import { getSearchRecordsQueryResponseField } from '@/object-record/utils/getSearchRecordsQueryResponseField';
-import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
-import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { useQuery, WatchQueryFetchPolicy } from '@apollo/client';
-import { useMemo } from 'react';
-import { useRecoilValue } from 'recoil';
-import { isDefined } from 'twenty-shared';
-import { logError } from '~/utils/logError';
-
-export type UseSearchRecordsParams = ObjectMetadataItemIdentifier &
-  Pick<RecordGqlOperationVariables, 'filter' | 'limit'> & {
-    onError?: (error?: Error) => void;
-    skip?: boolean;
-    recordGqlFields?: RecordGqlOperationGqlRecordFields;
-    fetchPolicy?: WatchQueryFetchPolicy;
-    searchInput?: string;
-  };
-
-export const useSearchRecords = <T extends ObjectRecord = ObjectRecord>({
-  objectNameSingular,
-  searchInput,
-  limit,
-  skip,
-  filter,
-  recordGqlFields,
-  fetchPolicy,
-}: UseSearchRecordsParams) => {
-  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
-  const { objectMetadataItem } = useObjectMetadataItem({
-    objectNameSingular,
-  });
-  const { searchRecordsQuery } = useSearchRecordsQuery({
-    objectNameSingular,
-    recordGqlFields,
-  });
-
-  const { enqueueSnackBar } = useSnackBar();
-  const { data, loading, error, previousData } =
-    useQuery<RecordGqlOperationSearchResult>(searchRecordsQuery, {
-      skip:
-        skip ||
-        !objectMetadataItem ||
-        !currentWorkspaceMember ||
-        !isDefined(searchInput),
-      variables: {
-        search: searchInput,
-        limit: limit,
-        filter: filter,
-      },
-      fetchPolicy: fetchPolicy,
-      onError: (error) => {
-        logError(
-          `useSearchRecords for "${objectMetadataItem.namePlural}" error : ` +
-            error,
-        );
-        enqueueSnackBar(
-          `Error during useSearchRecords for "${objectMetadataItem.namePlural}", ${error.message}`,
-          {
-            variant: SnackBarVariant.Error,
-          },
-        );
-      },
-    });
-
-  const effectiveData = loading ? previousData : data;
-
-  const queryResponseField = getSearchRecordsQueryResponseField(
-    objectMetadataItem.namePlural,
-  );
-
-  const result = effectiveData?.[queryResponseField];
-
-  const records = useMemo(
-    () =>
-      result
-        ? (getRecordsFromRecordConnection({
-            recordConnection: result,
-          }) as T[])
-        : [],
-    [result],
-  );
-
-  return {
-    objectMetadataItem,
-    records: records,
-    loading,
-    error,
-  };
-};
--- a/packages/twenty-front/src/modules/object-record/hooks/useSearchRecordsQuery.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useSearchRecordsQuery.ts
@ -1,33 +0,0 @@
-import { useRecoilValue } from 'recoil';
-
-import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { RecordGqlOperationGqlRecordFields } from '@/object-record/graphql/types/RecordGqlOperationGqlRecordFields';
-import { generateSearchRecordsQuery } from '@/object-record/utils/generateSearchRecordsQuery';
-
-export const useSearchRecordsQuery = ({
-  objectNameSingular,
-  recordGqlFields,
-  computeReferences,
-}: {
-  objectNameSingular: string;
-  recordGqlFields?: RecordGqlOperationGqlRecordFields;
-  computeReferences?: boolean;
-}) => {
-  const { objectMetadataItem } = useObjectMetadataItem({
-    objectNameSingular,
-  });
-
-  const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
-
-  const searchRecordsQuery = generateSearchRecordsQuery({
-    objectMetadataItem,
-    objectMetadataItems,
-    recordGqlFields,
-    computeReferences,
-  });
-
-  return {
-    searchRecordsQuery,
-  };
-};