From 1890e2f8bb7d7fc4b899f662a269893e7d74073a Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Mon, 21 Oct 2024 10:09:02 +0200 Subject: [PATCH] ENH: make cordra handle configurable --- Dockerfile | 2 ++ pages/fdo/show/[prefix]/[suffix].tsx | 4 ++-- src/constants.js | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86bf4b3..c1fd64a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,7 @@ ARG NEXT_PUBLIC_HANDLE_SYSTEM_BASE_URI ARG NEXT_PUBLIC_HANDLE_SYSTEM_DOWNLOAD_PROXY ARG NEXTAUTH_URL ARG NEXTAUTH_URL_INTERNAL +ARG NEXT_PUBLIC_CORDRA_HANDLE ENV KEY_CLOAK_ISSUER=${KEY_CLOAK_ISSUER} ENV KEY_CLOAK_CLIENT_SECRET=${KEY_CLOAK_CLIENT_SECRET} @@ -42,6 +43,7 @@ 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 NEXTAUTH_URL=${NEXTAUTH_URL} ENV NEXTAUTH_URL_INTERNAL=${NEXTAUTH_URL_INTERNAL} +ENV NEXT_PUBLIC_CORDRA_HANDLE=${NEXT_PUBLIC_CORDRA_HANDLE} RUN npm run build diff --git a/pages/fdo/show/[prefix]/[suffix].tsx b/pages/fdo/show/[prefix]/[suffix].tsx index d6b24b5..47add0b 100644 --- a/pages/fdo/show/[prefix]/[suffix].tsx +++ b/pages/fdo/show/[prefix]/[suffix].tsx @@ -29,7 +29,7 @@ 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 { 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, HANDLE_SYSTEM_DOWNLOAD_PROXY as HS_PROXY } from '../../../../src/constants' +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, HANDLE_SYSTEM_DOWNLOAD_PROXY as HS_PROXY, CORDRA_HANDLE as CORDRA } from '../../../../src/constants' import 'react-json-view-lite/dist/index.css'; const resolvePid = (pid: string) => `${HS_BASE_URI}/${pid}` @@ -79,7 +79,7 @@ const getEvebsDetails = (typePid, repository, metadataRecord) => { return [ row('Type', <Link href={resolvePid(typePid)}>{ "EVEBS-FDO" }</Link>, ''), row('Repository', <Link href="#">{repository}</Link>, - repository.toLowerCase().indexOf("cordra") > -1 ? "/images/cordra-primary-blue.png" : "/images/la_logo.png"), + repository == CORDRA ? "/images/cordra-primary-blue.png" : "/images/la_logo.png"), row('Dataspace', dataspaceInfo, dataspaceLogo), row('Technology', techInfo, techLogo), diff --git a/src/constants.js b/src/constants.js index 9e9c51f..7212196 100644 --- a/src/constants.js +++ b/src/constants.js @@ -6,3 +6,4 @@ export const FDO_COMMUNITY_MD_PROFILE_AAS = process.env.NEXT_PUBLIC_FDO_COMMUNIT export const FDO_COMMUNITY_MD_PROFILE_EDC = process.env.NEXT_PUBLIC_FDO_COMMUNITY_MD_PROFILE_EDC || "21.T11966/3f1cfd3bb60bee84c22b" export const HANDLE_SYSTEM_BASE_URI = process.env.NEXT_PUBLIC_HANDLE_SYSTEM_BASE_URI || "https://hdl.handle.net" export const HANDLE_SYSTEM_DOWNLOAD_PROXY = process.env.NEXT_PUBLIC_HANDLE_SYSTEM_DOWNLOAD_PROXY || HANDLE_SYSTEM_BASE_URI +export const CORDRA_HANDLE = process.env.NEXT_PUBLIC_CORDRA_HANDLE || "21.T11967/service" -- GitLab