diff --git a/react-components/src/components/Reveal3DResources/Reveal3DResources.tsx b/react-components/src/components/Reveal3DResources/Reveal3DResources.tsx index b002b5d72da..3d154a1618b 100644 --- a/react-components/src/components/Reveal3DResources/Reveal3DResources.tsx +++ b/react-components/src/components/Reveal3DResources/Reveal3DResources.tsx @@ -37,8 +37,8 @@ export type Reveal3DResourcesStyling = { export type Reveal3DResourcesProps = { resources: AddResourceOptions[]; - fdmAssetMappingConfig: FdmAssetMappingsConfig; styling?: Reveal3DResourcesStyling; + fdmAssetMappingConfig?: FdmAssetMappingsConfig; }; export const Reveal3DResources = ({ diff --git a/react-components/src/hooks/useCalculateModelsStyling.tsx b/react-components/src/hooks/useCalculateModelsStyling.tsx index 606695b8c48..c36dcc925e1 100644 --- a/react-components/src/hooks/useCalculateModelsStyling.tsx +++ b/react-components/src/hooks/useCalculateModelsStyling.tsx @@ -20,9 +20,9 @@ import { * @returns */ export const useCalculateModelsStyling = ( - fdmAssetMappingConfig: FdmAssetMappingsConfig, models?: TypedReveal3DModel[], - styling?: Reveal3DResourcesStyling + styling?: Reveal3DResourcesStyling, + fdmAssetMappingConfig?: FdmAssetMappingsConfig, ): Array => { const stylingExternalIds = useMemo( () => styling?.groups?.flatMap((group) => group.fdmAssetExternalIds) ?? [], diff --git a/react-components/src/hooks/useFdmAssetMappings.tsx b/react-components/src/hooks/useFdmAssetMappings.tsx index d4da43214a1..3100ff7dbdd 100644 --- a/react-components/src/hooks/useFdmAssetMappings.tsx +++ b/react-components/src/hooks/useFdmAssetMappings.tsx @@ -12,24 +12,25 @@ import { DEFAULT_QUERY_STALE_TIME } from '../utilities/constants'; */ export const useFdmAssetMappings = ( fdmAssetExternalIds: CogniteExternalId[], - fdmConfig: FdmAssetMappingsConfig + fdmConfig?: FdmAssetMappingsConfig ): UseQueryResult => { const fdmSdk = useFdmSdk(); - const fdmAssetMappingFilter = { - in: { - property: ['edge', 'startNode'], - values: fdmAssetExternalIds.map((externalId) => ({ - space: fdmConfig.assetFdmSpace, - externalId - })) - } - }; - return useQuery( ['reveal', 'react-components', fdmAssetExternalIds], async () => { if (fdmAssetExternalIds?.length === 0) return []; + if (fdmConfig === undefined) throw Error('FDM config must be defined when using FDM asset mappings'); + + const fdmAssetMappingFilter = { + in: { + property: ['edge', 'startNode'], + values: fdmAssetExternalIds.map((externalId) => ({ + space: fdmConfig.assetFdmSpace, + externalId + })) + } + }; const instances = await fdmSdk.filterInstances( fdmAssetMappingFilter,