Merge pull request #629 from CDLUC3/bug/narrative-pdf-is-not-removed-…

…from-upload-plan Bug/narrative pdf is not removed from upload plan
CDLUC3 · Jul 10, 2024 · 66d9be9 · 66d9be9
2 parents c6c3297 + 5a1540b
commit 66d9be9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/controllers/api/v3/drafts_controller.rb b/app/controllers/api/v3/drafts_controller.rb
@@ -121,9 +121,13 @@ def update_narrative
         dmp.narrative.purge if (create_params[:narrative].present? || create_params[:remove_narrative].present?) &&
                                dmp.narrative.attached?
 
+        # Remove the narrative from the metadata if it was purged
+        dmp.metadata.fetch('dmp', {})['draft_data']['narrative'] = {} if dmp.metadata.fetch('dmp', {})['draft_data'].present? && create_params[:remove_narrative].present?
+
         # Attach the narrative PDF if applicable
         dmp.metadata.fetch('dmp', {})['title'] = create_params[:title] if create_params[:title].present?
         dmp.narrative.attach(create_params[:narrative]) if create_params[:narrative].present?
+
         if dmp.save
           @drafts = [dmp]
           render json: render_to_string(template: '/api/v3/drafts/index'), status: :ok

diff --git a/react-client/src/pages/plan/setup/setup.js b/react-client/src/pages/plan/setup/setup.js
@@ -154,7 +154,7 @@ function DmpSetup() {
 
                   <div className="dmpui-field-fileinput-group">
                     <div>
-                      {dmp.narrative && (
+                      {dmp.narrative?.url && (
                         <>
                           <p>
                             <a href={dmp.narrative?.url} target="_blank">{dmp.narrative?.file_name}</a>