diff --git a/Dockerfile b/Dockerfile index 7c511c845e2069f43fbaa726d73855909eb01d4c..84298d2639fd346547abdeda8fb8a333668253a7 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 ce5ee795c35012b8ddc6cba7d46e1321b4ee90f7..5bfc6beb160ad13d0a8b042014c2f6747f25b441 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>