Add back pickers on all pages, fix command menu (#2662)

* Add back pickers on all pages, fix command menu

* Fix lint

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

@@ -30,24 +30,29 @@ export const useFindManyObjectRecords = <
   objectNamePlural,
   filter,
   orderBy,
+  limit,
   onCompleted,
   skip,
 }: Pick<ObjectMetadataItemIdentifier, 'objectNamePlural'> & {
   filter?: any;
   orderBy?: any;
+  limit?: number;
   onCompleted?: (data: PaginatedObjectTypeResults<ObjectType>) => void;
   skip?: boolean;
 }) => {
+  const findManyQueryStateIdentifier =
+    objectNamePlural + JSON.stringify(filter);
+
   const [lastCursor, setLastCursor] = useRecoilState(
-    cursorFamilyState(objectNamePlural),
+    cursorFamilyState(findManyQueryStateIdentifier),
   );
 
   const [hasNextPage, setHasNextPage] = useRecoilState(
-    hasNextPageFamilyState(objectNamePlural),
+    hasNextPageFamilyState(findManyQueryStateIdentifier),
   );
 
   const [, setIsFetchingMoreObjects] = useRecoilState(
-    isFetchingMoreObjectsFamilyState(objectNamePlural),
+    isFetchingMoreObjectsFamilyState(findManyQueryStateIdentifier),
   );
 
   const { objectMetadataItem, objectNotFoundInMetadata, findManyQuery } =
@@ -68,6 +73,7 @@ export const useFindManyObjectRecords = <
     variables: {
       filter: filter ?? {},
       orderBy: orderBy ?? {},
+      limit: limit ?? 30,
     },
     onCompleted: (data) => {
       if (objectMetadataItem) {

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

@@ -2,8 +2,8 @@ import { useRecoilValue } from 'recoil';
 
 import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { turnFiltersIntoWhereClauseV2 } from '@/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClauseV2';
-import { turnSortsIntoOrderByV2 } from '@/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderByV2';
+import { turnFiltersIntoWhereClause } from '@/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClause';
+import { turnSortsIntoOrderBy } from '@/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderBy';
 import { useRecordTableScopedStates } from '@/ui/object/record-table/hooks/internal/useRecordTableScopedStates';
 import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
 
@@ -31,11 +31,11 @@ export const useObjectRecordTable = () => {
   const tableFilters = useRecoilValue(tableFiltersState);
   const tableSorts = useRecoilValue(tableSortsState);
 
-  const filter = turnFiltersIntoWhereClauseV2(
+  const filter = turnFiltersIntoWhereClause(
     tableFilters,
     foundObjectMetadataItem?.fields ?? [],
   );
-  const orderBy = turnSortsIntoOrderByV2(
+  const orderBy = turnSortsIntoOrderBy(
     tableSorts,
     foundObjectMetadataItem?.fields ?? [],
   );

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

@@ -1,4 +1,4 @@
-import { useMutation } from '@apollo/client';
+import { useApolloClient, useMutation } from '@apollo/client';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
@@ -11,10 +11,13 @@ export const useUpdateOneObjectRecord = <T>({
     objectMetadataItem: foundObjectMetadataItem,
     objectNotFoundInMetadata,
     updateOneMutation,
+    cacheFragment,
   } = useObjectMetadataItem({
     objectNameSingular,
   });
 
+  const { cache } = useApolloClient();
+
   // TODO: type this with a minimal type at least with Record<string, any>
   const [mutate] = useMutation(updateOneMutation);
 
@@ -29,6 +32,15 @@ export const useUpdateOneObjectRecord = <T>({
       return null;
     }
 
+    const cachedRecordId = cache.identify({
+      __typename: capitalize(foundObjectMetadataItem?.nameSingular ?? ''),
+      id: idToUpdate,
+    });
+    const cachedRecord = cache.readFragment({
+      id: cachedRecordId,
+      fragment: cacheFragment,
+    });
+
     const updatedObject = await mutate({
       variables: {
         idToUpdate: idToUpdate,
@@ -38,7 +50,7 @@ export const useUpdateOneObjectRecord = <T>({
       },
       optimisticResponse: {
         [`update${capitalize(objectNameSingular)}`]: {
-          id: idToUpdate,
+          ...(cachedRecord ?? {}),
           ...input,
         },
       },