Closes datadryad/dryad-product-roadmap#2585

datadryad · Jun 29, 2023 · d93dbc1 · d93dbc1
1 parent 44fbd9e
commit d93dbc1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/app/javascript/react/components/MetadataEntry/PrelimArticle.jsx b/app/javascript/react/components/MetadataEntry/PrelimArticle.jsx
@@ -94,7 +94,7 @@ function PrelimArticle({
                     {
                       htmlId: 'publication',
                       labelText: 'Journal name',
-                      isRequired: false,
+                      isRequired: true,
                     }
                   }
                 />

diff --git a/app/models/stash_datacite/resource/dataset_validations.rb b/app/models/stash_datacite/resource/dataset_validations.rb
@@ -88,6 +88,29 @@ def loose_errors
         err.flatten
       end
 
+      def article_id
+        err = []
+
+        if @resource.identifier.import_info != 'other' && @resource.identifier.publication_name.blank?
+          err << ErrorItem.new(message: 'Fill in the {journal of the related publication}',
+                               page: metadata_page(@resource),
+                               ids: ['publication'])
+        end
+
+        journal = " from #{@resource.identifier.publication_name}" if @resource.identifier.publication_name.present?
+
+        if @resource.identifier.import_info == 'published' && @resource.identifier.publication_article_doi.blank?
+          err << ErrorItem.new(message: "Fill in {a correctly formatted DOI} for the article#{journal}",
+                               page: metadata_page(@resource),
+                               ids: %w[primary_article_doi])
+        elsif @resource.identifier.import_info == 'manuscript' && @resource.identifier.manuscript_number.blank?
+          err << ErrorItem.new(message: "Fill in the {manuscript number} for the article#{journal}",
+                               page: metadata_page(@resource),
+                               ids: ['msId'])
+        end
+        err
+      end
+
       def title
         if @resource.title.blank?
           return ErrorItem.new(message: 'Fill in a {dataset title}',
@@ -167,23 +190,6 @@ def abstract
         []
       end
 
-      def article_id
-        return [] unless @resource.identifier.publication_name.present? &&
-          @resource.identifier.manuscript_number.blank? &&
-          @resource.identifier.publication_article_doi.blank?
-
-        if @resource.related_identifiers.where(work_type: 'primary_article').count.positive? # has primary, but not doi
-          ErrorItem.new(message: "Fill in {a correctly formatted DOI} for your article from #{@resource.identifier
-                                                                                          .publication_name}",
-                        page: metadata_page(@resource),
-                        ids: %w[primary_article_doi])
-        else
-          ErrorItem.new(message: "Fill in a {manuscript number or DOI} for the article from #{@resource.identifier.publication_name}",
-                        page: metadata_page(@resource),
-                        ids: %w[msid primary_article_doi])
-        end
-      end
-
       def s3_error_uploads
         return [] if @resource.submitted?
 

diff --git a/spec/support/helpers/dataset_helper.rb b/spec/support/helpers/dataset_helper.rb
@@ -45,6 +45,7 @@ def fill_required_metadata
     # make sure we're on the right page
     navigate_to_metadata
 
+    choose('choose_other')
     fill_in 'title', with: Faker::Lorem.sentence
     fill_in_author
     fill_in_research_domain