Picker and MultiSelect fixes (#2883)

* Fixed orderBy bug

* Fixed gitch select multiple record filter

* Fixed RelationPicker search

* Fixed OrderBy type

front/src/modules/activities/notes/hooks/useNotes.ts

@@ -19,7 +19,7 @@ export const useNotes = (entity: ActivityTargetableEntity) => {
   };
   const orderBy = {
     createdAt: 'AscNullsFirst',
-  };
+  } as any; // TODO: finish typing
 
   const { records: notes } = useFindManyRecords({
     skip: !activityTargets?.length,

front/src/modules/object-metadata/hooks/useGetObjectOrderByField.ts

@@ -0,0 +1,14 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { OrderBy } from '@/object-metadata/types/OrderBy';
+import { OrderByField } from '@/object-metadata/types/OrderByField';
+import { getObjectOrderByField } from '@/object-metadata/utils/getObjectOrderByField';
+
+export const useGetObjectOrderByField = ({
+  objectMetadataItem,
+}: {
+  objectMetadataItem: ObjectMetadataItem;
+}) => {
+  return (orderBy: OrderBy): OrderByField => {
+    return getObjectOrderByField(objectMetadataItem, orderBy);
+  };
+};

front/src/modules/object-metadata/hooks/useMapToObjectRecordIdentifier.ts

@@ -1,6 +1,7 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { ObjectRecordIdentifier } from '@/object-record/types/ObjectRecordIdentifier';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { getLogoUrlFromDomainName } from '~/utils';
 
 export const useMapToObjectRecordIdentifier = ({
@@ -10,17 +11,6 @@ export const useMapToObjectRecordIdentifier = ({
 }) => {
   return (record: any): ObjectRecordIdentifier => {
     switch (objectMetadataItem.nameSingular) {
-      case CoreObjectNameSingular.WorkspaceMember:
-      case CoreObjectNameSingular.Person:
-        return {
-          id: record.id,
-          name:
-            (record.name?.firstName ?? '') +
-            ' ' +
-            (record.name?.lastName ?? ''),
-          avatarUrl: record.avatarUrl,
-          avatarType: 'rounded',
-        };
       case CoreObjectNameSingular.Opportunity:
         return {
           id: record.id,
@@ -36,9 +26,20 @@ export const useMapToObjectRecordIdentifier = ({
         field.name === 'name',
     );
 
-    const labelIdentifierFieldValue = labelIdentifierFieldMetadata
+    let labelIdentifierFieldValue = '';
-      ? record[labelIdentifierFieldMetadata.name]
+
-      : null;
+    switch (labelIdentifierFieldMetadata?.type) {
+      case FieldMetadataType.FullName: {
+        labelIdentifierFieldValue = `${record.name?.firstName ?? ''} ${
+          record.name?.lastName ?? ''
+        }`;
+        break;
+      }
+      default:
+        labelIdentifierFieldValue = labelIdentifierFieldMetadata
+          ? record[labelIdentifierFieldMetadata.name]
+          : '';
+    }
 
     const imageIdentifierFieldMetadata = objectMetadataItem.fields.find(
       (field) => field.id === objectMetadataItem.imageIdentifierFieldMetadataId,

front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts

@@ -3,6 +3,7 @@ import { useRecoilValue } from 'recoil';
 
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { ObjectMetadataItemNotFoundError } from '@/object-metadata/errors/ObjectMetadataNotFoundError';
+import { useGetObjectOrderByField } from '@/object-metadata/hooks/useGetObjectOrderByField';
 import { useMapToObjectRecordIdentifier } from '@/object-metadata/hooks/useMapToObjectRecordIdentifier';
 import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
@@ -66,6 +67,10 @@ export const useObjectMetadataItem = (
     objectMetadataItem,
   });
 
+  const getObjectOrderByField = useGetObjectOrderByField({
+    objectMetadataItem,
+  });
+
   const getRecordFromCache = useGetRecordFromCache({
     objectMetadataItem,
   });
@@ -114,5 +119,6 @@ export const useObjectMetadataItem = (
     updateOneRecordMutation,
     deleteOneRecordMutation,
     mapToObjectRecordIdentifier,
+    getObjectOrderByField,
   };
 };

front/src/modules/object-metadata/types/OrderBy.ts

@@ -0,0 +1,5 @@
+export type OrderBy =
+  | 'AscNullsLast'
+  | 'DescNullsLast'
+  | 'AscNullsFirst'
+  | 'DescNullsFirst';

front/src/modules/object-metadata/types/OrderByField.ts

@@ -0,0 +1,5 @@
+import { OrderBy } from '@/object-metadata/types/OrderBy';
+
+export type OrderByField = {
+  [fieldName: string]: OrderBy | { [subFieldName: string]: OrderBy };
+};

front/src/modules/object-metadata/utils/getObjectOrderByField.ts

@@ -0,0 +1,35 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+import { OrderBy } from '@/object-metadata/types/OrderBy';
+import { OrderByField } from '@/object-metadata/types/OrderByField';
+import { FieldMetadataType } from '~/generated-metadata/graphql';
+
+export const getObjectOrderByField = (
+  objectMetadataItem: ObjectMetadataItem,
+  orderBy: OrderBy,
+): OrderByField => {
+  const labelIdentifierFieldMetadata = objectMetadataItem.fields.find(
+    (field) =>
+      field.id === objectMetadataItem.labelIdentifierFieldMetadataId ||
+      field.name === 'name',
+  );
+
+  if (labelIdentifierFieldMetadata) {
+    switch (labelIdentifierFieldMetadata.type) {
+      case FieldMetadataType.FullName:
+        return {
+          [labelIdentifierFieldMetadata.name]: {
+            firstName: orderBy,
+            lastName: orderBy,
+          },
+        };
+      default:
+        return {
+          [labelIdentifierFieldMetadata.name]: orderBy,
+        };
+    }
+  } else {
+    return {
+      createdAt: orderBy,
+    };
+  }
+};

front/src/modules/object-record/hooks/useFindManyRecords.ts

@@ -8,6 +8,7 @@ import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimis
 import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
+import { OrderByField } from '@/object-metadata/types/OrderByField';
 import { getRecordOptimisticEffectDefinition } from '@/object-record/graphql/optimistic-effect-definition/getRecordOptimisticEffectDefinition';
 import { filterUniqueRecordEdgesByCursor } from '@/object-record/utils/filterUniqueRecordEdgesByCursor';
 import { DEFAULT_SEARCH_REQUEST_LIMIT } from '@/search/hooks/useFilteredSearchEntityQuery';
@@ -36,7 +37,7 @@ export const useFindManyRecords = <
   skip,
 }: ObjectMetadataItemIdentifier & {
   filter?: any;
-  orderBy?: any;
+  orderBy?: OrderByField;
   limit?: number;
   onCompleted?: (data: PaginatedRecordTypeResults<RecordType>) => void;
   skip?: boolean;

front/src/modules/object-record/hooks/useObjectRecordBoard.1.ts

@@ -71,7 +71,7 @@ export const useObjectRecordBoard = () => {
     skip: !savedPipelineSteps.length,
     objectNameSingular: 'opportunity',
     filter: filter,
-    orderBy: orderBy,
+    orderBy: orderBy as any, // TODO: finish typing
     onCompleted: useCallback(() => {
       setIsBoardLoaded(true);
     }, [setIsBoardLoaded]),

front/src/modules/object-record/hooks/useObjectRecordBoard.ts

@@ -71,7 +71,7 @@ export const useObjectRecordBoard = () => {
     skip: !savedPipelineSteps.length,
     objectNameSingular: 'opportunity',
     filter: filter,
-    orderBy: orderBy,
+    orderBy: orderBy as any, // TODO: finish typing
     onCompleted: useCallback(() => {
       setIsBoardLoaded(true);
     }, [setIsBoardLoaded]),

front/src/modules/object-record/hooks/useObjectRecordTable.ts

@@ -35,10 +35,12 @@ export const useObjectRecordTable = () => {
     tableFilters,
     foundObjectMetadataItem?.fields ?? [],
   );
+
+  // TODO: finish typing
   const orderBy = turnSortsIntoOrderBy(
     tableSorts,
     foundObjectMetadataItem?.fields ?? [],
-  );
+  ) as any;
 
   const { records, loading, fetchMoreRecords, queryStateIdentifier } =
     useFindManyRecords({

front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx

@@ -31,6 +31,10 @@ export const ObjectFilterDropdownRecordSelect = () => {
     recordToSelect: SelectableRecord,
     newSelectedValue: boolean,
   ) => {
+    if (loading) {
+      return;
+    }
+
     const newSelectedRecordIds = newSelectedValue
       ? [...objectFilterDropdownSelectedRecordIds, recordToSelect.id]
       : objectFilterDropdownSelectedRecordIds.filter(

front/src/modules/object-record/relation-picker/hooks/useEntitySelectSearch.ts

@@ -1,6 +1,5 @@
 import debounce from 'lodash.debounce';
 
-import { RelationPickerRecoilScopeContext } from '@/object-record/relation-picker/states/recoil-scope-contexts/RelationPickerRecoilScopeContext';
 import { relationPickerPreselectedIdScopedState } from '@/object-record/relation-picker/states/relationPickerPreselectedIdScopedState';
 import { relationPickerSearchFilterScopedState } from '@/object-record/relation-picker/states/relationPickerSearchFilterScopedState';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
@@ -8,14 +7,10 @@ import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoi
 export const useEntitySelectSearch = () => {
   const [, setRelationPickerPreselectedId] = useRecoilScopedState(
     relationPickerPreselectedIdScopedState,
-    RelationPickerRecoilScopeContext,
   );
 
   const [relationPickerSearchFilter, setRelationPickerSearchFilter] =
-    useRecoilScopedState(
+    useRecoilScopedState(relationPickerSearchFilterScopedState);
-      relationPickerSearchFilterScopedState,
-      RelationPickerRecoilScopeContext,
-    );
 
   const debouncedSetSearchFilter = debounce(
     setRelationPickerSearchFilter,

front/src/modules/object-record/select/hooks/useRecordsForSelect.ts

@@ -1,18 +1,12 @@
 import { isNonEmptyString } from '@sniptt/guards';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { SelectableRecord } from '@/object-record/select/types/SelectableRecord';
 import { getObjectFilterFields } from '@/object-record/select/utils/getObjectFilterFields';
-import { getObjectOrderByField } from '@/object-record/select/utils/getObjectOrderByField';
 import { isDefined } from '~/utils/isDefined';
 
-export type OrderBy =
-  | 'AscNullsLast'
-  | 'DescNullsLast'
-  | 'AscNullsFirst'
-  | 'DescNullsFirst';
-
 export const DEFAULT_SEARCH_REQUEST_LIMIT = 60;
 
 export const useRecordsForSelect = ({
@@ -30,9 +24,10 @@ export const useRecordsForSelect = ({
   excludeEntityIds?: string[];
   objectNameSingular: string;
 }) => {
-  const { mapToObjectRecordIdentifier } = useObjectMetadataItem({
+  const { mapToObjectRecordIdentifier, getObjectOrderByField } =
-    objectNameSingular,
+    useObjectMetadataItem({
-  });
+      objectNameSingular,
+    });
 
   const filters = [
     {
@@ -41,7 +36,7 @@ export const useRecordsForSelect = ({
     },
   ];
 
-  const orderByField = getObjectOrderByField(objectNameSingular);
+  const orderByField = getObjectOrderByField(sortOrder);
 
   const { loading: selectedRecordsLoading, records: selectedRecordsData } =
     useFindManyRecords({
@@ -50,9 +45,7 @@ export const useRecordsForSelect = ({
           in: selectedIds,
         },
       },
-      orderBy: {
+      orderBy: orderByField,
-        [orderByField]: sortOrder,
-      },
       objectNameSingular,
     });
 
@@ -103,9 +96,7 @@ export const useRecordsForSelect = ({
         },
       ],
     },
-    orderBy: {
+    orderBy: orderByField,
-      [orderByField]: sortOrder,
-    },
     objectNameSingular,
   });
 
@@ -126,9 +117,7 @@ export const useRecordsForSelect = ({
         ],
       },
       limit: limit ?? DEFAULT_SEARCH_REQUEST_LIMIT,
-      orderBy: {
+      orderBy: orderByField,
-        [orderByField]: sortOrder,
-      },
       objectNameSingular,
     });
 

front/src/modules/object-record/select/utils/getObjectOrderByField.ts

@@ -1,11 +0,0 @@
-export const getObjectOrderByField = (objectSingleName: string): string => {
-  if (objectSingleName === 'company') {
-    return 'name';
-  }
-
-  if (['workspaceMember', 'person'].includes(objectSingleName)) {
-    return 'name.firstName';
-  }
-
-  return 'createdAt';
-};

front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts

@@ -2,6 +2,7 @@ import { QueryHookOptions, QueryResult } from '@apollo/client';
 import { isNonEmptyString } from '@sniptt/guards';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { OrderBy } from '@/object-metadata/types/OrderBy';
 import { EntitiesForMultipleEntitySelect } from '@/object-record/relation-picker/components/MultipleEntitySelect';
 import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
 import { mapPaginatedRecordsToRecords } from '@/object-record/utils/mapPaginatedRecordsToRecords';
@@ -10,12 +11,6 @@ import { isDefined } from '~/utils/isDefined';
 
 type SearchFilter = { fieldNames: string[]; filter: string | number };
 
-export type OrderBy =
-  | 'AscNullsLast'
-  | 'DescNullsLast'
-  | 'AscNullsFirst'
-  | 'DescNullsFirst';
-
 export const DEFAULT_SEARCH_REQUEST_LIMIT = 60;
 
 // TODO: use this for all search queries, because we need selectedEntities and entitiesToSelect each time we want to search