From 35954de5033b8c1e62fcbf282deb73679f2e98bb Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Sat, 19 Oct 2024 00:51:53 +0200
Subject: [PATCH] FIX: display_name
---
Dockerfile | 9 +++++++--
pages/fdo/show/[prefix]/[suffix].tsx | 7 +++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 7c511c8..84298d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,8 +24,13 @@ COPY . .
ENV PORT 3000
-ENV NEXT_PUBLIC_API_URL=https://manager.testbed.pid.gwdg.de/api/v1
-ENV KEY_CLOAK_CLIENT_SECRET ""
+ARG NEXT_PUBLIC_API_URL
+ARG KEY_CLOAK_CLIENT_SECRET
+ARG NEXT_PUBLIC_HANDLE_SYSTEM_BASE_URI
+
+ENV NEXT_PUBLIC_HANDLE_SYSTEM_BASE_URI=${NEXT_PUBLIC_HANDLE_SYSTEM_BASE_URI}
+ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL:-"https://manager.testbed.pid.gwdg.de/api/v1"}
+ENV KEY_CLOAK_CLIENT_SECRET=${KEY_CLOAK_CLIENT_SECRET}
#EXPOSE 3000
#CMD ["npm", "run", "dev"]
diff --git a/pages/fdo/show/[prefix]/[suffix].tsx b/pages/fdo/show/[prefix]/[suffix].tsx
index ce5ee79..5bfc6be 100644
--- a/pages/fdo/show/[prefix]/[suffix].tsx
+++ b/pages/fdo/show/[prefix]/[suffix].tsx
@@ -29,7 +29,6 @@ import ReportIcon from '@mui/icons-material/Report'
import { JsonView, darkStyles, defaultStyles } from 'react-json-view-lite';
import { styled, ThemeProvider } from '@mui/material/styles'
import Details from '../../../../src/components/fdos/details'
-import IFdo from '../../../../src/interfaces/IFdo'
import { FDO_COMMUNITY_TYPE_EVEBS as EVEBS, FDO_COMMUNITY_MD_PROFILE_EDC as EDC, FDO_COMMUNITY_MD_PROFILE_AAS as AAS, HANDLE_SYSTEM_BASE_URI as HS_BASE_URI } from '../../../../src/constants'
import 'react-json-view-lite/dist/index.css';
@@ -105,12 +104,16 @@ const EvebsDetails = ({typePid, repository, metadataPid}) => {
});
const metadata = data?.data;
+ var displayName = metadata?.displayName
+ if(displayName) {
+ displayName = displayName[0].text
+ }
console.log(isLoading, data, repository, typePid, metadata);
return isLoading || metadataRecord.isLoading ? <Item>loading json</Item> : (
<>
<Item sx={{ width: '50%' }} >
- <Typography variant="h5" gutterBottom> {metadata?.displayName || metadata.idShort || metadata.id} </Typography> <Typography variant="subtitle1" gutterBottom > {metadata?.description[0].text} </Typography>
+ <Typography variant="h5" gutterBottom> {displayName || metadata.idShort || metadata.id} </Typography> <Typography variant="subtitle1" gutterBottom > {metadata?.description[0].text} </Typography>
<Box>
<Details rows={getEvebsDetails(typePid, repository, metadataRecord.data.data)}></Details>
</Box>
--
GitLab