From a60bc30a48145c439e2b94a0bf40ee2f20a6a7b6 Mon Sep 17 00:00:00 2001 From: xkyue Date: Mon, 13 Jul 2026 14:50:11 +0100 Subject: [PATCH 1/2] Ensure it is instrument.fullName not instrument.name for ISIS --- .../views/landing/isis/isisInvestigationLanding.component.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/datagateway-dataview/src/views/landing/isis/isisInvestigationLanding.component.tsx b/packages/datagateway-dataview/src/views/landing/isis/isisInvestigationLanding.component.tsx index c65d1f26d..3b057b7ef 100644 --- a/packages/datagateway-dataview/src/views/landing/isis/isisInvestigationLanding.component.tsx +++ b/packages/datagateway-dataview/src/views/landing/isis/isisInvestigationLanding.component.tsx @@ -293,7 +293,9 @@ const CommonLandingPage = ( icon: , }, { - content: () => data.investigationInstruments?.[0]?.instrument?.name, + content: () => + data.investigationInstruments?.[0]?.instrument?.fullName ?? + data.investigationInstruments?.[0]?.instrument?.name, label: t('investigations.instrument'), icon: , }, From b322ac5990eab2b0164933ba530805f2119cc0e7 Mon Sep 17 00:00:00 2001 From: xkyue Date: Thu, 16 Jul 2026 14:59:31 +0100 Subject: [PATCH 2/2] Changed the instrument name on breadcrumb to instrument full name --- .../src/page/breadcrumbs.component.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/datagateway-dataview/src/page/breadcrumbs.component.tsx b/packages/datagateway-dataview/src/page/breadcrumbs.component.tsx index 00567410f..569d72ea2 100644 --- a/packages/datagateway-dataview/src/page/breadcrumbs.component.tsx +++ b/packages/datagateway-dataview/src/page/breadcrumbs.component.tsx @@ -71,7 +71,7 @@ const fetchEntityInformation = async ( }) .then((response) => { // Return the property in the data received. - return response.data[entityField]; + return response.data[entityField] ?? response.data['name']; }); return entityName; @@ -116,8 +116,10 @@ const useEntityInformation = ( entity === 'investigation' ? 'title' : entity === 'dataPublication' - ? 'title' - : 'name'; + ? 'title' + : entity === 'instrument' + ? 'fullName' + : 'name'; // this is the field we use to lookup the relevant entity in ICAT - it's usually ID // but for DLS proposals this will be name