Merge pull request #3203 from sul-dlss/submit-draft

Start tracking drafts vs completed requests in the forms

Author: hudajkhan

app/components/accordion_step_component.html.erb

@@ -18,13 +18,15 @@
 
         <% if submit? %>
           <div class="mt-3 form-group d-flex justify-content-end gap-1">
+            <%= footer %>
             <% if cancel? %>
               <%= link_to 'Cancel', new_patron_request_path(instance_hrid:, origin_location_code:), class: 'btn btn-outline-primary', data: { action: 'analytics#send', 'analytics-category-param': 'Request', 'analytics-action-param': 'Cancel' } %>
             <% end %>
             <%= submit_tag submit_text, class: 'btn btn-primary', data: { 'next-step-button': true, action: 'analytics#send', 'analytics-category-param': 'Request', 'analytics-action-param': 'Submit' } %>
           </div>
         <% else %>
           <div class="mt-3 d-flex justify-content-end gap-1">
+            <%= footer %>
             <button class="btn btn-primary" type="button" data-action="click->accordion-form#nextStep analytics#send" data-analytics-category-param="Accordion" data-analytics-action-param="Continue" data-next-step-button="true">Continue</button>
           </div>
         <% end %>

app/components/accordion_step_component.rb

@@ -4,6 +4,7 @@
 class AccordionStepComponent < ViewComponent::Base
   renders_one :title
   renders_one :body
+  renders_one :footer
 
   attr_reader :step_index, :id, :classes, :data, :patron_request_data, :form_id, :request
 

app/components/aeon/appointment_form_item_component.html.erb

@@ -12,7 +12,7 @@
       <%= f.select :appointment_id,
           appointment_options_for_select,
           { prompt: placeholder },
-          { class: 'form-select appt_dropdown', required: true, data: { controller: 'appointment-select' } } %>
+          { class: 'form-select appt_dropdown', data: { controller: 'appointment-select', 'required-for-submit': true } } %>
       <span class="create-appointment-section">
         <span class="fw-semibold mx-2">OR</span>
         <%= link_to new_appointment_path, class: 'btn btn-primary btn-sm', data: { action: 'modal#open' } do %>

app/components/aeon/digitization_form_item_component.html.erb

@@ -13,7 +13,7 @@
       <div class="accordion-body">
         <div class="mb-3">
           <%= f.label :requested_pages, class: 'form-label fw-semibold redesign-required-label' %>
-          <%= f.text_field :requested_pages, placeholder: 'e.g. 100-150, 167, 170-180 or Chapter 5', class: 'form-control', required: true %>
+          <%= f.text_field :requested_pages, placeholder: 'e.g. 100-150, 167, 170-180 or Chapter 5', class: 'form-control', data: { 'required-for-submit': true } %>
         </div>
 
         <div class="mb-3">

app/javascript/controllers/index.js

@@ -45,3 +45,6 @@ application.register("modal", ModalController)
 
 import SelectedItemFormController from "./selected_item_form_controller"
 application.register("selected-item-form", SelectedItemFormController)
+
+import StatusCounterController from "./status_counter_controller"
+application.register("status-counter", StatusCounterController)

app/javascript/controllers/selected_item_form_controller.js

@@ -3,13 +3,22 @@ import { Collapse } from "bootstrap"
 
 export default class extends Controller {
   static targets = ["status", "nextButton", "charCounter"]
+  static values = { status: String }
 
   connect() {
     this.updateStatus();
   }
 
   updateStatus() {
     if (this.emptyFields()) {
+      this.statusValue = 'incomplete';
+    } else {
+      this.statusValue = 'complete';
+    }
+  }
+
+  statusValueChanged() {
+    if (this.statusValue === 'incomplete') {
       this.statusTarget.classList.remove('bi-check2-circle', 'text-green');
       this.statusTarget.classList.add('bi-circle');
       if (this.hasNextButtonTarget) this.nextButtonTarget.disabled = true;
@@ -18,6 +27,8 @@ export default class extends Controller {
       this.statusTarget.classList.add('bi-check2-circle', 'text-green');
       if (this.hasNextButtonTarget) this.nextButtonTarget.disabled = false;
     }
+
+    this.dispatch('status-changed', { detail: { status: this.statusValue } });
   }
 
   updateCharCounter(event) {
@@ -30,7 +41,7 @@ export default class extends Controller {
 
   emptyFields() {
     const formData = new FormData(this.element.closest('form'));
-    return Array.from(this.element.querySelectorAll('[required],[data-required]')).find(x => formData.getAll(x.name).every(x => !x))
+    return Array.from(this.element.querySelectorAll('[required],[data-required],[data-required-for-submit]')).find(x => formData.getAll(x.name).every(x => !x))
   }
 
   nextItem(event) {

app/javascript/controllers/status_counter_controller.js

@@ -0,0 +1,16 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ['counter']
+
+  connect() {
+    this.update();
+  }
+
+  update(event) {
+    const completeCount = this.element.querySelectorAll('[data-selected-item-form-status-value="complete"]').length;
+    const draftCount =this.element.querySelectorAll('[data-selected-item-form-status-value="incomplete"]').length;
+
+    this.counterTarget.innerHTML = `${completeCount} complete · ${draftCount} drafts`;
+  }
+}

app/jobs/submit_aeon_patron_request_job.rb

@@ -35,7 +35,7 @@ def as_aeon_create_ead_request_data(patron_request, volume_params) # rubocop:dis
     AeonClient::RequestData.with_defaults.with(
       call_number: "#{patron_request.ead_doc.identifier} #{volume_params['series']}",
       ead_number: patron_request.ead_doc.identifier,
-      appointment_id: volume_params['appointment_id'].to_i,
+      appointment_id: volume_params['appointment_id'].presence&.to_i,
       for_publication: volume_params['for_publication'] == 'yes',
       item_author: patron_request.ead_doc.author,
       item_info1: patron_request.ead_doc.item_url,
@@ -56,7 +56,7 @@ def as_aeon_create_ead_request_data(patron_request, volume_params) # rubocop:dis
   # and reading room id.
   def as_aeon_create_request_data(patron_request, folio_item, volume_params) # rubocop:disable Metrics/AbcSize
     AeonClient::RequestData.with_defaults.with(
-      appointment_id: volume_params['appointment_id'].to_i,
+      appointment_id: volume_params['appointment_id'].presence&.to_i,
       call_number: folio_item.callnumber,
       document_type: 'Monograph',
       format: nil,
@@ -78,6 +78,23 @@ def as_aeon_create_request_data(patron_request, folio_item, volume_params) # rub
   # rubocop:enable Metrics/MethodLength
 
   def submit_aeon_request(aeon_payload)
-    AeonClient.new.create_request(aeon_payload)
+    response = aeon_client.create_request(aeon_payload)
+
+    return response if complete?(aeon_payload)
+
+    aeon_client.update_request_route(transaction_number: response.transaction_number,
+                                     status: Settings.aeon.queue_names.draft.transaction.first)
+  end
+
+  def aeon_client
+    @aeon_client ||= AeonClient.new
+  end
+
+  def complete?(payload)
+    if payload.shipping_option == 'Electronic Delivery'
+      payload.item_info5.present?
+    else
+      payload.appointment_id.present?
+    end
   end
 end

app/views/patron_requests/new.html+aeonredesign.erb

@@ -87,20 +87,32 @@
 
 <!-- aeon reading room request -->
 <!-- removed any 'can do this' part for both -->
-<%= render AccordionStepComponent.new(request: f.object, id: 'reading', classes: ['d-none'], step_index: (scan_or_pickup_step ||= step_enum.next), form_id: f.id, data: { 'patronrequest-forRequestType': 'pickup' }, submit: true) do |c| %>
+<%= render AccordionStepComponent.new(request: f.object, id: 'reading', classes: ['d-none'], step_index: (scan_or_pickup_step ||= step_enum.next), form_id: f.id, data: { controller: 'status-counter', action: 'selected-item-form:status-changed->status-counter#update', 'patronrequest-forRequestType': 'pickup' }, submit: true) do |c| %>
   <% c.with_title.with_content('Reading room') %>
   <% c.with_body do %>
     <%= render 'reading_options', f: %>
   <% end %>
+  <% c.with_footer do %>
+    <span class="px-2 py-1" data-status-counter-target="counter">
+      0 complete
+      0 drafts
+    </span>
+  <% end %>
 <% end %>
 
 <!-- aeon digitization request -->
 
-<%= render AccordionStepComponent.new(request: f.object, id: 'digitization', classes: ['d-none'], step_index: (scan_or_pickup_step ||= step_enum.next), form_id: f.id, data: { 'patronrequest-forRequestType': 'scan' }, submit: true) do |c| %>
+<%= render AccordionStepComponent.new(request: f.object, id: 'digitization', classes: ['d-none'], step_index: (scan_or_pickup_step ||= step_enum.next), form_id: f.id, data: { controller: 'status-counter', action: 'selected-item-form:status-changed->status-counter#update', 'patronrequest-forRequestType': 'scan' }, submit: true) do |c| %>
   <% c.with_title.with_content('Digitization') %>
   <% c.with_body do %>
     <%= render 'digitization_options', f: %>
   <% end %>
+  <% c.with_footer do %>
+    <span class="px-2 py-1" data-status-counter-target="counter">
+      0 complete
+      0 drafts
+    </span>
+  <% end %>
 <% end %>
 
 <% end %>

spec/jobs/submit_aeon_patron_request_job_spec.rb

@@ -12,7 +12,7 @@
                           origin_location_code: 'SPEC-STACKS', data:, user: build(:sso_user))
   end
   let(:folio_instance) { build(:special_collections_single_holding) }
-  let(:stub_aeon_client) { instance_double(AeonClient, find_user: stub_aeon_user, create_request: {}) }
+  let(:stub_aeon_client) { instance_double(AeonClient, find_user: stub_aeon_user, create_request: Aeon::Request.new, update_request_route: nil) }
   let(:stub_aeon_user) { instance_double(Aeon::User, username: 'aeon_user') }
 
   before do