From 9f9e6f6db963b6e84e60984349e1ccc3edf39fb1 Mon Sep 17 00:00:00 2001 From: amentis Date: Tue, 14 May 2024 11:49:43 +0300 Subject: [PATCH 1/3] external identifier fix for description finalization --- .../model/persist/descriptionproperties/FieldPersist.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/FieldPersist.java b/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/FieldPersist.java index c80917440..0ffead771 100644 --- a/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/FieldPersist.java +++ b/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/FieldPersist.java @@ -170,7 +170,7 @@ public class FieldPersist { .over(item.getReference()) .using(() -> this.validatorFactory.validator(ReferencePersist.ReferenceWithoutTypePersistValidator.class)), this.refSpec() - .iff(() -> FieldType.isExternalIdentifierType(fieldType) && !this.isNull(item.getExternalIdentifier())) + .iff(() -> FieldType.isExternalIdentifierType(fieldType) && !this.isNull(item.getExternalIdentifier()) && DescriptionStatus.Finalized.equals(this.status) && isVisible && required) .on(FieldPersist._externalIdentifier) .over(item.getExternalIdentifier()) .using(() -> this.validatorFactory.validator(ExternalIdentifierPersist.PersistValidator.class)) From 52129b787729bc2574f4398e0a5d0c2a894da595 Mon Sep 17 00:00:00 2001 From: amandilaras Date: Tue, 14 May 2024 12:00:49 +0300 Subject: [PATCH 2/3] config updates for dpeloyment --- deployment/opencdmp/backend/config/security-test.yml | 2 +- .../config/rda-file-transformer-test.yml | 2 +- deployment/opencdmp/zenodo/config/zenodo-test.yml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deployment/opencdmp/backend/config/security-test.yml b/deployment/opencdmp/backend/config/security-test.yml index 018d37802..5776031be 100644 --- a/deployment/opencdmp/backend/config/security-test.yml +++ b/deployment/opencdmp/backend/config/security-test.yml @@ -2,7 +2,7 @@ web: security: enabled: true authorized-endpoints: [ api ] - allowed-endpoints: [ api/public, api/dmp/public, api/description/public, api/supportive-material/public, api/language/public, api/contact-support/public, api/dashboard/public, api/deposit/public ] + allowed-endpoints: [ api/public, api/dmp/public, api/description/public, /api/supportive-material/public, api/language/public, api/contact-support/public, api/dashboard/public, prometheus, health, metrics ] idp: api-key: enabled: false diff --git a/deployment/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml b/deployment/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml index aa371faba..4becc02f9 100644 --- a/deployment/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml +++ b/deployment/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml @@ -1,2 +1,2 @@ rda-file-transformer: - useSharedStorage: true + useSharedStorage: false diff --git a/deployment/opencdmp/zenodo/config/zenodo-test.yml b/deployment/opencdmp/zenodo/config/zenodo-test.yml index bd1a1b1b9..d6549d7f6 100644 --- a/deployment/opencdmp/zenodo/config/zenodo-test.yml +++ b/deployment/opencdmp/zenodo/config/zenodo-test.yml @@ -14,4 +14,5 @@ zenodo: repository-client-id: ${ZENODO_CLIENT_ID} repository-client-secret: ${ZENODO_CLIENT_SECRET} redirect-uri: http://host.docker.internal:8081/login/external/zenodo - has-logo: false \ No newline at end of file + has-logo: false + useSharedStorage: false \ No newline at end of file From d62b4f839b6413d5283fc1e3b48765c04ca68e47 Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Tue, 14 May 2024 12:50:33 +0300 Subject: [PATCH 3/3] Docs homepage fix, small layout adjustments, added services root docs --- .../documentation/supplementary-services/index.md | 4 ++++ docs/docusaurus.config.ts | 8 ++++---- docs/src/components/HomepageFeatures/index.tsx | 15 ++++++--------- docs/src/css/custom.css | 4 ++++ docs/src/pages/index.tsx | 9 +-------- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/docs/docs/documentation/supplementary-services/index.md b/docs/docs/documentation/supplementary-services/index.md index 46dfdd3aa..be7c69868 100644 --- a/docs/docs/documentation/supplementary-services/index.md +++ b/docs/docs/documentation/supplementary-services/index.md @@ -1,5 +1,9 @@ # Supplementary Services +There are four supplementary services directly integrated into this platform. They are used to extend it's functionality and improve the user experience. In this section of the docs, we will dive into each one of them, and see how they contribute to the overall usage of the platform. + +Follow the links below, to find out more information about them respectively. + import DocCardList from '@theme/DocCardList'; \ No newline at end of file diff --git a/docs/docusaurus.config.ts b/docs/docusaurus.config.ts index 512611be6..e99a9820d 100644 --- a/docs/docusaurus.config.ts +++ b/docs/docusaurus.config.ts @@ -37,15 +37,15 @@ const config: Config = { sidebarPath: './sidebars.ts', // Please change this to your repo. // Remove this to remove the "edit this page" links. - editUrl: - 'https://github.com/facebook/docusaurus/tree/main/packages/create-docusaurus/templates/shared/', + // editUrl: + // 'https://github.com/facebook/docusaurus/tree/main/packages/create-docusaurus/templates/shared/', }, blog: { showReadingTime: true, // Please change this to your repo. // Remove this to remove the "edit this page" links. - editUrl: - 'https://github.com/facebook/docusaurus/tree/main/packages/create-docusaurus/templates/shared/', + // editUrl: + // 'https://github.com/facebook/docusaurus/tree/main/packages/create-docusaurus/templates/shared/', }, theme: { customCss: './src/css/custom.css', diff --git a/docs/src/components/HomepageFeatures/index.tsx b/docs/src/components/HomepageFeatures/index.tsx index 50a9e6f4c..c0c316f3a 100644 --- a/docs/src/components/HomepageFeatures/index.tsx +++ b/docs/src/components/HomepageFeatures/index.tsx @@ -10,32 +10,29 @@ type FeatureItem = { const FeatureList: FeatureItem[] = [ { - title: 'Easy to Use', + title: 'Produce Plan outputs', Svg: require('@site/static/img/undraw_docusaurus_mountain.svg').default, description: ( <> - Docusaurus was designed from the ground up to be easily installed and - used to get your website up and running quickly. + Close the data management planning lifecycle by publishing your DMPs in a FAIR manner. Assign licenses, PIDs and publish DMPs in a repository of your choice. ), }, { - title: 'Focus on What Matters', + title: 'Update Plans', Svg: require('@site/static/img/undraw_docusaurus_tree.svg').default, description: ( <> - Docusaurus lets you focus on your docs, and we'll do the chores. Go - ahead and move your docs into the docs directory. + Treat Plans as living documents. Secure their provenance and continue work in new versions (new DOIs assigned). ), }, { - title: 'Powered by React', + title: 'Re-use desriptions & templates', Svg: require('@site/static/img/undraw_docusaurus_react.svg').default, description: ( <> - Extend or customize your website layout by reusing React. Docusaurus can - be extended while reusing the same header and footer. + Identify descriptions to be re-used in your Plan. Copy or clone descriptions to other Plans. ), }, diff --git a/docs/src/css/custom.css b/docs/src/css/custom.css index e34952506..4ccccfa1d 100644 --- a/docs/src/css/custom.css +++ b/docs/src/css/custom.css @@ -29,6 +29,10 @@ --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.3); } +p { + text-align: justify; +} + .outer-tab { margin-left: 1rem; } diff --git a/docs/src/pages/index.tsx b/docs/src/pages/index.tsx index 400a3e19a..787cf46bb 100644 --- a/docs/src/pages/index.tsx +++ b/docs/src/pages/index.tsx @@ -15,14 +15,7 @@ function HomepageHeader() { {siteConfig.title} -

{siteConfig.tagline}

-
- - Docusaurus Tutorial - 5min ⏱️ - -
+
{siteConfig.tagline}
);