Merge pull request #567 from CDLUC3/remove-output-types

Remove output types
CDLUC3 · Apr 9, 2024 · b01dc3c · b01dc3c
2 parents 5cd1c2a + 1db799a
commit b01dc3c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/app/controllers/api/v3/options_controller.rb b/app/controllers/api/v3/options_controller.rb
@@ -25,7 +25,7 @@ def contributor_roles
 
       # GET /api/v3/output_types
       def output_types
-        matches = ResearchOutput.output_types
+        matches = ResearchOutput.output_types.reject { |k, v| %w[event service text workflow].include?(k.downcase) }
         matches = matches.map do |key, val|
           {
             label: key.capitalize.gsub('_', ' '),

diff --git a/app/models/draft.rb b/app/models/draft.rb
@@ -145,6 +145,12 @@ def to_json_for_registration
 
       distros = dataset['distribution'].is_a?(Hash) ? dataset['distribution'].values : dataset['distribution']
       dataset['distribution'] = distros
+      dataset['distribution'].each do |distro|
+        next if distro['host'].nil? || !distro['host']['title'].nil?
+
+        repo = Repository.find_by(uri: distro['host']['url'])
+        distro['host']['title'] = repo.name
+      end
       dataset
     end
 

diff --git a/react-client/src/index.scss b/react-client/src/index.scss
@@ -494,3 +494,9 @@ dialog {
     text-decoration-thickness: 2px;
     text-decoration-skip-ink: auto;
   }
+
+  #App p.dmpui-field-help {
+    font-size: 0.9rem;
+    color: #555;
+    margin-top: -10px;
+  }
diff --git a/react-client/src/pages/plan/research-outputs/researchoutputs.js b/react-client/src/pages/plan/research-outputs/researchoutputs.js
@@ -218,7 +218,7 @@ function ResearchOutputs() {
 
           <div className="dmpdui-list dmpdui-list-research ">
             <div className="data-heading" data-colname="title">
-              Title
+              Proposed Output
             </div>
             <div className="data-heading" data-colname="personal">
               Personal information?
@@ -282,7 +282,7 @@ function ResearchOutputs() {
                 <div className="dmpui-form-cols">
                   <div className="dmpui-form-col">
                     <TextInput
-                      label="Title"
+                      label="Proposed Output"
                       type="text"
                       required="required"
                       name="title"
@@ -312,7 +312,7 @@ function ResearchOutputs() {
                 <div className="dmpui-form-cols">
                   <div className="dmpui-form-col">
                     <SizeInput
-                      label="Repository Size"
+                      label="Estimated size of data"
                       name="size"
                       id="id_size"
                       unitOptions={sizeUnits}
@@ -338,7 +338,7 @@ function ResearchOutputs() {
                     />
 
                     <TextArea
-                      label="Description"
+                      label="Repository description"
                       type="text"
                       inputValue={dataObj.repository.description}
                       onChange={handleChange}
@@ -349,7 +349,7 @@ function ResearchOutputs() {
                     />
 
                     <TextInput
-                      label="URL"
+                      label="Repository URL"
                       type="text"
                       required="required"
                       name="repository_url"
@@ -360,6 +360,7 @@ function ResearchOutputs() {
                       disabled={dataObj.repository.isLocked}
                       hidden={dataObj.repository.isLocked}
                     />
+                    <p class="dmpui-field-help">(e.g., "https://dataverse.org/")</p>
                   </div>
                 </div>