Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

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))

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

deployment/opencdmp/file-transformer-rda-json/config/rda-file-transformer-test.yml

@@ -1,2 +1,2 @@
 rda-file-transformer:
-  useSharedStorage: true
+  useSharedStorage: false

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
+    has-logo: false
+    useSharedStorage: false

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';
 
 <DocCardList />

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',

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&apos;ll do the chores. Go
-        ahead and move your docs into the <code>docs</code> 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.
       </>
     ),
   },

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;
 }

docs/src/pages/index.tsx

@@ -15,14 +15,7 @@ function HomepageHeader() {
         <Heading as="h1" className="hero__title">
           {siteConfig.title}
         </Heading>
-        <p className="hero__subtitle">{siteConfig.tagline}</p>
-        <div className={styles.buttons}>
-          <Link
-            className="button button--secondary button--lg"
-            to="/docs/intro">
-            Docusaurus Tutorial - 5min ⏱️
-          </Link>
-        </div>
+        <div className="hero__subtitle">{siteConfig.tagline}</div>
       </div>
     </header>
   );