From 50c111acec2b7629cbc19b57a22fffd8026815f0 Mon Sep 17 00:00:00 2001 From: Alessandro Gasperini Date: Wed, 17 Apr 2024 14:48:31 +0200 Subject: [PATCH 01/29] DIGG-389 : Link to MQA catalog --- .../content/Entryscape/DataSetPage/index.tsx | 18 ++++++++++++++++-- locales/en/pages.json | 3 ++- locales/sv/pages.json | 3 ++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/components/content/Entryscape/DataSetPage/index.tsx b/components/content/Entryscape/DataSetPage/index.tsx index efcbe43eb..607e1c5d8 100644 --- a/components/content/Entryscape/DataSetPage/index.tsx +++ b/components/content/Entryscape/DataSetPage/index.tsx @@ -16,6 +16,7 @@ import { import { Container } from "@/components/layout/Container"; import { Heading } from "@/components/global/Typography/Heading"; import { Preamble } from "@/components/global/Typography/Preamble"; +import Link from "next/link"; const filterCatalogProperties = [ "dcat:keyword", @@ -124,7 +125,7 @@ export const DataSetPage: React.FC = () => { ? env.ENTRYSCAPE_DATASETS_PATH : "admin.dataportal.se" }\/store' - }; + }; function getApiExploreUrl(entryid,apientryid) { @@ -494,6 +495,19 @@ export const DataSetPage: React.FC = () => { > {t("pages|datasetpage$catalog")} + {entry.publisher && ( + <> +

+ {t("pages|datasetpage$mqa-catalog")} +

+ + {entry.publisher} + + + )}
{/* Catalog */} @@ -523,7 +537,7 @@ export const DataSetPage: React.FC = () => { data-entryscape-block="template" dangerouslySetInnerHTML={{ __html: ` - +
diff --git a/locales/en/pages.json b/locales/en/pages.json index 1f423664e..6af3b8f8a 100644 --- a/locales/en/pages.json +++ b/locales/en/pages.json @@ -160,7 +160,8 @@ "category": "Categories", "contact-publisher": "Do you have questions or comments?", "contact-publisher-text": "Contact the publishing organization for questions, comments and requests regarding the information on this page. ", - "contact-publisher-text2": "You can also go to the data portal " + "contact-publisher-text2": "You can also go to the data portal ", + "download-metadata-as": "Download metadata as" }, "dataservicepage": { "api": "About API" diff --git a/locales/sv/pages.json b/locales/sv/pages.json index cfff8f40f..35ba27b48 100644 --- a/locales/sv/pages.json +++ b/locales/sv/pages.json @@ -160,7 +160,8 @@ "category": "Kategori", "contact-publisher": "Har du frågor eller synpunkter?", "contact-publisher-text": "Kontakta publicerande organisation för frågor, synpunkter och önskemål kring informationen på den här sidan. ", - "contact-publisher-text2": "Du kan även vända dig till dataportalens " + "contact-publisher-text2": "Du kan även vända dig till dataportalens ", + "download-metadata-as": "Ladda ner metadata som" }, "dataservicepage": { "api": "Om API" diff --git a/styles/entryscape.css b/styles/entryscape.css index 44a78f00b..6dc7d2189 100644 --- a/styles/entryscape.css +++ b/styles/entryscape.css @@ -640,7 +640,7 @@ .entryscape a:not(.noUnderline), .entryscape a:not(.nostyle), .information-container a { - @apply block w-fit break-all text-sm text-green-600 underline; + @apply block w-fit break-all text-sm text-green-600 underline hover:text-brown-900; } .entryscape a:hover, From 0e5b0d4e66144f6992beb85bec6e7af8429432a7 Mon Sep 17 00:00:00 2001 From: Alessandro Gasperini Date: Thu, 18 Apr 2024 13:30:41 +0200 Subject: [PATCH 06/29] DIGG-392 : Access to download metadata on conceptpage --- .../content/Entryscape/ConceptPage/index.tsx | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/components/content/Entryscape/ConceptPage/index.tsx b/components/content/Entryscape/ConceptPage/index.tsx index 9828f25d2..2ba9dd84c 100644 --- a/components/content/Entryscape/ConceptPage/index.tsx +++ b/components/content/Entryscape/ConceptPage/index.tsx @@ -464,44 +464,47 @@ export const ConceptPage: FC<{ curi?: string; scheme?: string }> = ({ + {/* Download formats */}