Refactored useFindOneObjectMetadataItem and useFindManyObjectMetadataItems (#2600)

* Refactored useFindOneObjectMetadataItem and useFindManyObjectMetadataItems to rely on a recoil family selector

* Removed console.log

* Cleaned

* Removed unused hook

* Fixed seeds

front/src/modules/object-record/components/RecordShowPage.tsx

@@ -3,7 +3,7 @@ import { DateTime } from 'luxon';
 import { useRecoilState } from 'recoil';
 
 import { useFavorites } from '@/favorites/hooks/useFavorites';
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
 import { filterAvailableFieldMetadataItem } from '@/object-record/utils/filterAvailableFieldMetadataItem';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
@@ -35,7 +35,7 @@ export const RecordShowPage = () => {
     objectMetadataId: string;
   }>();
 
-  const { foundObjectMetadataItem } = useFindOneObjectMetadataItem({
+  const { objectMetadataItem: foundObjectMetadataItem } = useObjectMetadataItem({
     objectNameSingular,
   });
 

front/src/modules/object-record/components/RecordTableContainer.tsx

@@ -2,7 +2,7 @@ import styled from '@emotion/styled';
 import { useRecoilCallback } from 'recoil';
 
 import { useComputeDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useComputeDefinitionsFromFieldMetadata';
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
 import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
 import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
@@ -32,7 +32,7 @@ export const RecordTableContainer = ({
 }: {
   objectNamePlural: string;
 }) => {
-  const { foundObjectMetadataItem } = useFindOneObjectMetadataItem({
+  const { objectMetadataItem: foundObjectMetadataItem } = useObjectMetadataItem({
     objectNamePlural,
   });
   const { columnDefinitions } = useComputeDefinitionsFromFieldMetadata(

front/src/modules/object-record/components/RecordTableEffect.tsx

@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 
 import { useComputeDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useComputeDefinitionsFromFieldMetadata';
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { useObjectMainIdentifier } from '@/object-metadata/hooks/useObjectMainIdentifier';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useRecordTableContextMenuEntries } from '@/object-record/hooks/useRecordTableContextMenuEntries';
 import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailableTableColumns';
 import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
@@ -17,7 +17,7 @@ export const RecordTableEffect = () => {
     setObjectMetadataConfig,
   } = useRecordTable();
 
-  const { foundObjectMetadataItem } = useFindOneObjectMetadataItem({
+  const { objectMetadataItem } = useObjectMetadataItem({
     objectNamePlural,
   });
 
@@ -25,10 +25,10 @@ export const RecordTableEffect = () => {
     mainIdentifierMapper,
     basePathToShowPage,
     mainIdentifierFieldMetadataId,
-  } = useObjectMainIdentifier(foundObjectMetadataItem);
+  } = useObjectMainIdentifier(objectMetadataItem);
 
   const { columnDefinitions, filterDefinitions, sortDefinitions } =
-    useComputeDefinitionsFromFieldMetadata(foundObjectMetadataItem);
+    useComputeDefinitionsFromFieldMetadata(objectMetadataItem);
 
   const {
     setAvailableSortDefinitions,
@@ -53,17 +53,17 @@ export const RecordTableEffect = () => {
     }
   }, [
     basePathToShowPage,
-    foundObjectMetadataItem,
+    objectMetadataItem,
     mainIdentifierFieldMetadataId,
     mainIdentifierMapper,
     setObjectMetadataConfig,
   ]);
 
   useEffect(() => {
-    if (!foundObjectMetadataItem) {
+    if (!objectMetadataItem) {
       return;
     }
-    setViewObjectMetadataId?.(foundObjectMetadataItem.id);
+    setViewObjectMetadataId?.(objectMetadataItem.id);
     setViewType?.(ViewType.Table);
 
     setAvailableSortDefinitions?.(sortDefinitions);
@@ -82,7 +82,7 @@ export const RecordTableEffect = () => {
     setAvailableSortDefinitions,
     setAvailableFilterDefinitions,
     setAvailableFieldDefinitions,
-    foundObjectMetadataItem,
+    objectMetadataItem,
     sortDefinitions,
     filterDefinitions,
     setAvailableTableColumns,

front/src/modules/object-record/components/RecordTablePage.tsx

@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { PageAddButton } from '@/ui/layout/page/PageAddButton';
@@ -31,26 +31,25 @@ export type RecordTablePageProps = Pick<
 export const RecordTablePage = () => {
   const objectNamePlural = useParams().objectNamePlural ?? '';
 
-  const { objectNotFoundInMetadata, loading, foundObjectMetadataItem } =
-    useFindOneObjectMetadataItem({
+  const { objectNotFoundInMetadata, objectMetadataItem } =
+    useObjectMetadataItem({
       objectNamePlural,
     });
 
   const navigate = useNavigate();
 
   useEffect(() => {
-    if (!loading && objectNotFoundInMetadata) {
+    if (objectNotFoundInMetadata) {
       navigate('/');
     }
-  }, [objectNotFoundInMetadata, loading, navigate]);
+  }, [objectNotFoundInMetadata, navigate]);
 
   const { createOneObject } = useCreateOneObjectRecord({
-    objectNameSingular: foundObjectMetadataItem?.nameSingular,
+    objectNameSingular: objectMetadataItem?.nameSingular,
   });
 
   const handleAddButtonClick = async () => {
-    const createdObject = await createOneObject?.({});
-    console.log(createdObject);
+    await createOneObject?.({});
   };
 
   return (

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

@@ -2,7 +2,7 @@ import { useMutation } from '@apollo/client';
 import { v4 } from 'uuid';
 
 import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { capitalize } from '~/utils/string/capitalize';
 
@@ -14,10 +14,10 @@ export const useCreateOneObjectRecord = <T>({
   });
 
   const {
-    foundObjectMetadataItem,
+    objectMetadataItem: foundObjectMetadataItem,
     objectNotFoundInMetadata,
     createOneMutation,
-  } = useFindOneObjectMetadataItem({
+  } = useObjectMetadataItem({
     objectNameSingular,
   });
 

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

@@ -1,7 +1,7 @@
 import { useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { capitalize } from '~/utils/string/capitalize';
 
@@ -9,11 +9,11 @@ export const useDeleteOneObjectRecord = <T>({
   objectNameSingular,
 }: Pick<ObjectMetadataItemIdentifier, 'objectNameSingular'>) => {
   const {
-    foundObjectMetadataItem,
+    objectMetadataItem: foundObjectMetadataItem,
     objectNotFoundInMetadata,
     findManyQuery,
     deleteOneMutation,
-  } = useFindOneObjectMetadataItem({
+  } = useObjectMetadataItem({
     objectNameSingular,
   });
 

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

@@ -4,7 +4,7 @@ import { isNonEmptyArray } from '@apollo/client/utilities';
 import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilState } from 'recoil';
 
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar';
 import { logError } from '~/utils/logError';
@@ -48,8 +48,8 @@ export const useFindManyObjectRecords = <
     isFetchingMoreObjectsFamilyState(objectNamePlural),
   );
 
-  const { foundObjectMetadataItem, objectNotFoundInMetadata, findManyQuery } =
-    useFindOneObjectMetadataItem({
+  const { objectMetadataItem: foundObjectMetadataItem, objectNotFoundInMetadata, findManyQuery } =
+    useObjectMetadataItem({
       objectNamePlural,
       skip,
     });

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

@@ -1,6 +1,6 @@
 import { useQuery } from '@apollo/client';
 
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 
 export const useFindOneObjectRecord = <
@@ -15,8 +15,8 @@ export const useFindOneObjectRecord = <
   onCompleted?: (data: ObjectType) => void;
   skip?: boolean;
 }) => {
-  const { foundObjectMetadataItem, objectNotFoundInMetadata, findOneQuery } =
-    useFindOneObjectMetadataItem({
+  const { objectMetadataItem: foundObjectMetadataItem, objectNotFoundInMetadata, findOneQuery } =
+    useObjectMetadataItem({
       objectNameSingular,
     });
 

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

@@ -1,7 +1,7 @@
 import { useRecoilValue } from 'recoil';
 
 import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+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 { useRecordTableScopedStates } from '@/ui/object/record-table/hooks/internal/useRecordTableScopedStates';
@@ -14,7 +14,7 @@ import { useFindManyObjectRecords } from './useFindManyObjectRecords';
 export const useObjectRecordTable = () => {
   const { scopeId: objectNamePlural } = useRecordTable();
 
-  const { foundObjectMetadataItem } = useFindOneObjectMetadataItem({
+  const { objectMetadataItem: foundObjectMetadataItem } = useObjectMetadataItem({
     objectNamePlural,
   });
 

front/src/modules/object-record/hooks/useRecordTableContextMenuEntries.tsx

@@ -3,7 +3,7 @@ import { isNonEmptyString } from '@sniptt/guards';
 import { useRecoilCallback, useRecoilValue, useSetRecoilState } from 'recoil';
 
 import { useFavorites } from '@/favorites/hooks/useFavorites';
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useDeleteOneObjectRecord } from '@/object-record/hooks/useDeleteOneObjectRecord';
 import {
   IconCheckbox,
@@ -29,7 +29,7 @@ export const useRecordTableContextMenuEntries = () => {
   const { scopeId: objectNamePlural, resetTableRowSelection } =
     useRecordTable();
 
-  const { foundObjectMetadataItem } = useFindOneObjectMetadataItem({
+  const { objectMetadataItem: foundObjectMetadataItem } = useObjectMetadataItem({
     objectNamePlural,
   });
 

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

@@ -1,6 +1,6 @@
 import { useMutation } from '@apollo/client';
 
-import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 import { capitalize } from '~/utils/string/capitalize';
 
@@ -8,10 +8,10 @@ export const useUpdateOneObjectRecord = <T>({
   objectNameSingular,
 }: Pick<ObjectMetadataItemIdentifier, 'objectNameSingular'>) => {
   const {
-    foundObjectMetadataItem,
+    objectMetadataItem: foundObjectMetadataItem,
     objectNotFoundInMetadata,
     updateOneMutation,
-  } = useFindOneObjectMetadataItem({
+  } = useObjectMetadataItem({
     objectNameSingular,
   });
 

front/src/modules/object-record/utils/generateCreateOneObjectMutation.ts

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { capitalize } from '~/utils/string/capitalize';
 
@@ -23,7 +23,7 @@ export const useGenerateCreateOneObjectMutation = ({
       create${capitalizedObjectName}(data: $input) {
         id
         ${objectMetadataItem.fields
-          .map(mapFieldMetadataToGraphQLQuery)
+          .map((field) => mapFieldMetadataToGraphQLQuery(field))
           .join('\n')}
       }
     }

front/src/modules/object-record/utils/useGenerateDeleteOneObjectMutation.ts

@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client';
 
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
+import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { capitalize } from '~/utils/string/capitalize';
 

front/src/modules/object-record/utils/useGenerateFindManyCustomObjectsQuery.ts

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
-import { EMPTY_QUERY } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
+import { EMPTY_QUERY } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { capitalize } from '~/utils/string/capitalize';
 

front/src/modules/object-record/utils/useGenerateFindOneCustomObjectQuery.ts

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
-import { EMPTY_QUERY } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
+import { EMPTY_QUERY } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
 export const useGenerateFindOneCustomObjectQuery = ({

front/src/modules/object-record/utils/useGenerateUpdateOneObjectMutation.ts

@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 
-import { EMPTY_MUTATION } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
 import { useMapFieldMetadataToGraphQLQuery } from '@/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery';
+import { EMPTY_MUTATION } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { capitalize } from '~/utils/string/capitalize';
 
@@ -36,7 +36,7 @@ export const useGenerateUpdateOneObjectMutation = ({
        ${graphQLFieldForUpdateOneObjectMutation}(id: $idToUpdate, data: $input) {
         id
         ${objectMetadataItem.fields
-          .map(mapFieldMetadataToGraphQLQuery)
+          .map((field) => mapFieldMetadataToGraphQLQuery(field))
           .join('\n')}
       }
     }