From d5dc592956be4bdd98c8a87dad59b2642f8a8565 Mon Sep 17 00:00:00 2001 From: NilsXitaso Date: Thu, 11 Jul 2024 10:32:39 +0200 Subject: [PATCH] MNES-1071 Added .env check for submodel registry --- .../viewer/_components/SubmodelsOverviewCard.tsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/[locale]/viewer/_components/SubmodelsOverviewCard.tsx b/src/app/[locale]/viewer/_components/SubmodelsOverviewCard.tsx index df6084b..338371e 100644 --- a/src/app/[locale]/viewer/_components/SubmodelsOverviewCard.tsx +++ b/src/app/[locale]/viewer/_components/SubmodelsOverviewCard.tsx @@ -12,6 +12,8 @@ import { MobileModal } from 'components/basics/MobileModal'; import { useApis } from 'components/azureAuthentication/ApiProvider'; import { useRegistryAasState } from 'components/contexts/CurrentAasContext'; import { getSubmodelFromSubmodelDescriptor } from 'lib/searchUtilActions/search'; +import { useEnv } from 'app/env/provider'; + export type SubmodelsOverviewCardProps = { readonly smReferences?: Reference[]; readonly isLoading?: boolean }; @@ -28,6 +30,7 @@ export function SubmodelsOverviewCard(props: SubmodelsOverviewCardProps) { const [open, setOpen] = useState(false); const isMobile = useIsMobile(); const firstSubmodelIdShort = 'Nameplate'; + const env = useEnv(); useAsyncEffect(async () => { if (!props.smReferences) return; @@ -45,7 +48,7 @@ export function SubmodelsOverviewCard(props: SubmodelsOverviewCardProps) { } else { for (const reference of props.smReferences as Reference[]) { try { - const submodelFromRegistry = await submodelRegistryServiceClient.getSubmodelDescriptorsById(reference.keys[0].value) + const submodelFromRegistry = env.SUBMODEL_REGISTRY_API_URL ? await submodelRegistryServiceClient.getSubmodelDescriptorsById(reference.keys[0].value) : null if (submodelFromRegistry) { submodels.push({ id: submodelFromRegistry.id, @@ -62,7 +65,6 @@ export function SubmodelsOverviewCard(props: SubmodelsOverviewCardProps) { } } - if (submodels) { submodels.sort(function (x, y) { return x.label == firstSubmodelIdShort ? -1 : y.label == firstSubmodelIdShort ? 1 : 0; @@ -87,13 +89,14 @@ export function SubmodelsOverviewCard(props: SubmodelsOverviewCardProps) { if (selectedSubmodel.endpoint) { try { fetchedSubmodel = await getSubmodelFromSubmodelDescriptor(selectedSubmodel.endpoint); - } catch(e) { + } catch (e) { console.error(e); } - } if (!registryAasData) { + } + if (!registryAasData) { try { fetchedSubmodel = await submodelClient.getSubmodelById(selectedSubmodel?.id ?? ''); - } catch(e) { + } catch (e) { console.error(e); } }