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
This commit is contained in:
Lucas Bordeau
2023-11-20 16:34:06 +01:00
committed by GitHub
parent 3ad30a0498
commit 189586830e
44 changed files with 190 additions and 239 deletions

View File

@ -3,7 +3,7 @@ import styled from '@emotion/styled';
import { CompanyBoard } from '@/companies/board/components/CompanyBoard';
import { CompanyBoardRecoilScopeContext } from '@/companies/states/recoil-scope-contexts/CompanyBoardRecoilScopeContext';
import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useUpdateOneObjectRecord } from '@/object-record/hooks/useUpdateOneObjectRecord';
import { PipelineAddButton } from '@/pipeline/components/PipelineAddButton';
import { usePipelineStages } from '@/pipeline/hooks/usePipelineStages';
@ -45,9 +45,9 @@ export const Opportunities = () => {
});
};
const opportunitiesV2MetadataId = useFindOneObjectMetadataItem({
const opportunitiesV2MetadataId = useObjectMetadataItem({
objectNameSingular: 'opportunity',
}).foundObjectMetadataItem?.id;
}).objectMetadataItem?.id;
const { setViewObjectMetadataId } = useView({
viewScopeId: 'company-board-view',

View File

@ -34,19 +34,15 @@ export const SettingsObjectDetail = () => {
const navigate = useNavigate();
const { objectSlug = '' } = useParams();
const {
disableObjectMetadataItem,
findActiveObjectMetadataItemBySlug,
loading,
} = useObjectMetadataItemForSettings();
const { disableObjectMetadataItem, findActiveObjectMetadataItemBySlug } =
useObjectMetadataItemForSettings();
const activeObjectMetadataItem =
findActiveObjectMetadataItemBySlug(objectSlug);
useEffect(() => {
if (loading) return;
if (!activeObjectMetadataItem) navigate(AppPath.NotFound);
}, [activeObjectMetadataItem, loading, navigate]);
}, [activeObjectMetadataItem, navigate]);
const { activateMetadataField, disableMetadataField, eraseMetadataField } =
useFieldMetadataItem();

View File

@ -24,7 +24,6 @@ export const SettingsObjectEdit = () => {
disableObjectMetadataItem,
editObjectMetadataItem,
findActiveObjectMetadataItemBySlug,
loading,
} = useObjectMetadataItemForSettings();
const activeObjectMetadataItem =
@ -40,8 +39,6 @@ export const SettingsObjectEdit = () => {
>({});
useEffect(() => {
if (loading) return;
if (!activeObjectMetadataItem) {
navigate(AppPath.NotFound);
return;
@ -55,7 +52,7 @@ export const SettingsObjectEdit = () => {
description: activeObjectMetadataItem.description ?? undefined,
});
}
}, [activeObjectMetadataItem, formValues, loading, navigate]);
}, [activeObjectMetadataItem, formValues, navigate]);
if (!activeObjectMetadataItem) return null;

View File

@ -24,7 +24,7 @@ export const SettingsObjectFieldEdit = () => {
const navigate = useNavigate();
const { objectSlug = '', fieldSlug = '' } = useParams();
const { findActiveObjectMetadataItemBySlug, loading } =
const { findActiveObjectMetadataItemBySlug } =
useObjectMetadataItemForSettings();
const activeObjectMetadataItem =
@ -54,8 +54,6 @@ export const SettingsObjectFieldEdit = () => {
} = useFieldMetadataForm();
useEffect(() => {
if (loading) return;
if (!activeObjectMetadataItem || !activeMetadataField) {
navigate(AppPath.NotFound);
return;
@ -79,7 +77,6 @@ export const SettingsObjectFieldEdit = () => {
activeMetadataField,
activeObjectMetadataItem,
initForm,
loading,
navigate,
relationFieldMetadataItem?.icon,
relationFieldMetadataItem?.label,

View File

@ -37,7 +37,7 @@ export const SettingsObjectNewFieldStep1 = () => {
const navigate = useNavigate();
const { objectSlug = '' } = useParams();
const { findActiveObjectMetadataItemBySlug, loading } =
const { findActiveObjectMetadataItemBySlug } =
useObjectMetadataItemForSettings();
const activeObjectMetadataItem =
@ -60,8 +60,6 @@ export const SettingsObjectNewFieldStep1 = () => {
);
useEffect(() => {
if (loading) return;
if (!activeObjectMetadataItem) {
navigate(AppPath.NotFound);
return;
@ -69,7 +67,7 @@ export const SettingsObjectNewFieldStep1 = () => {
if (!metadataFields.length)
setMetadataFields(activeObjectMetadataItem.fields);
}, [activeObjectMetadataItem, metadataFields.length, loading, navigate]);
}, [activeObjectMetadataItem, metadataFields.length, navigate]);
if (!activeObjectMetadataItem) return null;

View File

@ -29,7 +29,6 @@ export const SettingsObjectNewFieldStep2 = () => {
findActiveObjectMetadataItemBySlug,
findObjectMetadataItemById,
findObjectMetadataItemByNamePlural,
loading,
} = useObjectMetadataItemForSettings();
const activeObjectMetadataItem =
@ -45,7 +44,6 @@ export const SettingsObjectNewFieldStep2 = () => {
} = useFieldMetadataForm();
useEffect(() => {
if (loading) return;
if (!activeObjectMetadataItem) {
navigate(AppPath.NotFound);
return;
@ -61,7 +59,7 @@ export const SettingsObjectNewFieldStep2 = () => {
activeObjectMetadataItem,
findObjectMetadataItemByNamePlural,
initForm,
loading,
navigate,
]);

View File

@ -3,7 +3,7 @@ import { useNavigate } from 'react-router-dom';
import styled from '@emotion/styled';
import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
import { useFindOneObjectMetadataItem } from '@/object-metadata/hooks/useFindOneObjectMetadataItem';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { getRecordOptimisticEffectDefinition } from '@/object-record/graphql/optimistic-effect-definition/getRecordOptimisticEffectDefinition';
import { useFindManyObjectRecords } from '@/object-record/hooks/useFindManyObjectRecords';
import { objectSettingsWidth } from '@/settings/data-model/constants/objectSettings';
@ -47,7 +47,7 @@ export const SettingsDevelopersApiKeys = () => {
const { registerOptimisticEffect } = useOptimisticEffect({
objectNameSingular: 'apiKey',
});
const { foundObjectMetadataItem } = useFindOneObjectMetadataItem({
const { objectMetadataItem: foundObjectMetadataItem } = useObjectMetadataItem({
objectNameSingular: 'apiKey',
});
const filter = { revokedAt: { is: 'NULL' } };