From 2e76f680d118ea52ffe19412eae74a669cb19a61 Mon Sep 17 00:00:00 2001
From: Sean Warren <seanwarren77@gmail.com>
Date: Fri, 6 Dec 2024 16:46:20 -0500
Subject: [PATCH 1/5] added accessRestrict prop to the AddToCartButton

Co-authored-by: Shaun Ellis <sdellis@users.noreply.github.com>
---
 app/javascript/components/AddToCartButton.vue | 8 +++++++-
 app/javascript/test/addToCartButton.spec.js   | 2 +-
 spec/features/catalog_view_spec.rb            | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/javascript/components/AddToCartButton.vue b/app/javascript/components/AddToCartButton.vue
index 0cbc6a9e..d24ad6ac 100644
--- a/app/javascript/components/AddToCartButton.vue
+++ b/app/javascript/components/AddToCartButton.vue
@@ -33,6 +33,11 @@ export default {
       type: Object,
       default: () => { {} },
       required: false,
+    },
+    accessRestrict: {
+      type: String,
+      default: "",
+      required: false,
     }
   },
   methods: {
@@ -47,7 +52,8 @@ export default {
         title: this.title,
         containers: this.containers,
         location: this.location,
-        formParams: this.formParams
+        formParams: this.formParams,
+        accessRestrict: this.accessRestrict
       }
     },
     items: {
diff --git a/app/javascript/test/addToCartButton.spec.js b/app/javascript/test/addToCartButton.spec.js
index aa99911e..ef46fc8a 100644
--- a/app/javascript/test/addToCartButton.spec.js
+++ b/app/javascript/test/addToCartButton.spec.js
@@ -20,6 +20,6 @@ describe('AddToCartButton.vue', () => {
     })
     const button = getByRole('button')
     await fireEvent.click(button)
-    expect(addItemToCart).toHaveBeenCalledWith(expect.anything(), { callnumber: 'AC101', containers: '', formParams: undefined, title: 'Title' })
+    expect(addItemToCart).toHaveBeenCalledWith(expect.anything(), { accessRestrict: '', callnumber: 'AC101', containers: '', formParams: undefined, title: 'Title' })
   })
 })
diff --git a/spec/features/catalog_view_spec.rb b/spec/features/catalog_view_spec.rb
index d1046c83..da557bd5 100644
--- a/spec/features/catalog_view_spec.rb
+++ b/spec/features/catalog_view_spec.rb
@@ -69,7 +69,7 @@
         expect(page).to have_selector "td", text: /MC148_c00002/
         expect(page).to have_selector "td", text: /Box 1/
         expect(page).to have_selector "button[type='submit']", text: /Request 1 Item/
-
+        byebug
         # Click the remove item button
         find("#item-MC148_c00002 > td > button").click
       end

From d86c207d6a206420c3dc84249a2c5ef4a766c0aa Mon Sep 17 00:00:00 2001
From: Sean Warren <seanwarren77@gmail.com>
Date: Tue, 10 Dec 2024 12:15:03 -0500
Subject: [PATCH 2/5] When an item is restricted it now alerts the user in the
 request cart

Co-authored-by: Shaun Ellis <sdellis@users.noreply.github.com>
---
 app/javascript/components/AddToCartButton.vue | 8 ++++----
 app/javascript/components/RequestCart.vue     | 8 +++++++-
 app/models/solr_document.rb                   | 4 ++++
 app/views/catalog/_show_tab_panes.html.erb    | 1 +
 spec/features/catalog_view_spec.rb            | 8 +++++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/javascript/components/AddToCartButton.vue b/app/javascript/components/AddToCartButton.vue
index d24ad6ac..4c9c388f 100644
--- a/app/javascript/components/AddToCartButton.vue
+++ b/app/javascript/components/AddToCartButton.vue
@@ -34,9 +34,9 @@ export default {
       default: () => { {} },
       required: false,
     },
-    accessRestrict: {
-      type: String,
-      default: "",
+    restricted: {
+      type: Boolean,
+      default: false,
       required: false,
     }
   },
@@ -53,7 +53,7 @@ export default {
         containers: this.containers,
         location: this.location,
         formParams: this.formParams,
-        accessRestrict: this.accessRestrict
+        restricted: this.restricted
       }
     },
     items: {
diff --git a/app/javascript/components/RequestCart.vue b/app/javascript/components/RequestCart.vue
index be970697..fd6ee07f 100644
--- a/app/javascript/components/RequestCart.vue
+++ b/app/javascript/components/RequestCart.vue
@@ -78,7 +78,13 @@
               </td>
             </tr>
 
-            <tr v-if="item.location && item.location.label" class="request__location">
+            <tr v-if="item.restricted" class="request__location">
+              <td colspan="4">
+                Item may need to be reviewed by staff for access.
+              </td>
+            </tr>
+
+            <tr v-else="item.location && item.location.label" class="request__location">
               <td colspan="4">
                 <geo-icon></geo-icon>
                 View this item at the <template v-if="item.location.url"><a
diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb
index 4fb87021..267560ab 100644
--- a/app/models/solr_document.rb
+++ b/app/models/solr_document.rb
@@ -293,6 +293,10 @@ def member_of
     ]
   end
 
+  def open?
+    fetch("access_ssi", nil) == "open"
+  end
+
   def restricted?
     fetch("access_ssi", nil) == "restricted"
   end
diff --git a/app/views/catalog/_show_tab_panes.html.erb b/app/views/catalog/_show_tab_panes.html.erb
index e2deb558..4ef9235b 100644
--- a/app/views/catalog/_show_tab_panes.html.erb
+++ b/app/views/catalog/_show_tab_panes.html.erb
@@ -53,6 +53,7 @@
               <% end %>
               :location="<%= JSON.generate(@document.aeon_request.location_attributes) %>"
               :form-params="<%= JSON.generate(@document.aeon_request.form_attributes) %>"
+              :restricted="<%= !@document.open? %>"
               >
               <lux-icon-base icon-name="add-to-cart" width="20" height="20">
                 <add-to-cart-icon></add-to-cart-icon>
diff --git a/spec/features/catalog_view_spec.rb b/spec/features/catalog_view_spec.rb
index da557bd5..f0e4a61d 100644
--- a/spec/features/catalog_view_spec.rb
+++ b/spec/features/catalog_view_spec.rb
@@ -69,7 +69,8 @@
         expect(page).to have_selector "td", text: /MC148_c00002/
         expect(page).to have_selector "td", text: /Box 1/
         expect(page).to have_selector "button[type='submit']", text: /Request 1 Item/
-        byebug
+        expect(page).to have_selector ".request__location", text: /View this item at the/
+
         # Click the remove item button
         find("#item-MC148_c00002 > td > button").click
       end
@@ -84,6 +85,11 @@
         # Check that it can be closed
         expect(page).to have_selector "button.denied-button"
       end
+      visit "/catalog/AC136_c2889"
+      find(".add-to-cart-block").click
+      within(".request-cart") do
+        expect(page).to have_selector ".request__location", text: /Item may need to be reviewed by staff for access/
+      end
     end
   end
   context "with a component show page" do

From 2818a14b3b3ee6d12c971b8e289b3374839204f3 Mon Sep 17 00:00:00 2001
From: Sean Warren <seanwarren77@gmail.com>
Date: Tue, 10 Dec 2024 14:06:56 -0500
Subject: [PATCH 3/5] closed the request cart so capybara could click the add
 to cart button

Co-authored-by: Shaun Ellis <sdellis@users.noreply.github.com>
---
 spec/features/catalog_view_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/features/catalog_view_spec.rb b/spec/features/catalog_view_spec.rb
index f0e4a61d..578d1f4e 100644
--- a/spec/features/catalog_view_spec.rb
+++ b/spec/features/catalog_view_spec.rb
@@ -86,6 +86,7 @@
         expect(page).to have_selector "button.denied-button"
       end
       visit "/catalog/AC136_c2889"
+      find("button.denied-button").click
       find(".add-to-cart-block").click
       within(".request-cart") do
         expect(page).to have_selector ".request__location", text: /Item may need to be reviewed by staff for access/

From b3e132184cccebe3a2f78cdd7e2cf6bfa3e9dc90 Mon Sep 17 00:00:00 2001
From: Trey Pendragon <tpendragon@princeton.edu>
Date: Tue, 10 Dec 2024 13:45:20 -0800
Subject: [PATCH 4/5] Make smtp test more reliable.

---
 spec/requests/health_check_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/requests/health_check_spec.rb b/spec/requests/health_check_spec.rb
index d9ab79e8..b7f3f2ae 100644
--- a/spec/requests/health_check_spec.rb
+++ b/spec/requests/health_check_spec.rb
@@ -42,6 +42,7 @@
     end
 
     it "caches a success on SMTP and doesn't call it twice in a short window" do
+      SmtpStatus.next_check_timestamp = 0
       smtp_double = instance_double(Net::SMTP)
       allow(Net::SMTP).to receive(:new).and_return(smtp_double)
       allow(smtp_double).to receive(:open_timeout=)

From 4adfaaedd45c1f3d0aff64522a3e66a0983d64f5 Mon Sep 17 00:00:00 2001
From: Sean Warren <seanwarren77@gmail.com>
Date: Wed, 11 Dec 2024 11:15:18 -0500
Subject: [PATCH 5/5] fixed some JavaScript tests

Co-authored-by: Shaun Ellis <sdellis@users.noreply.github.com>
---
 app/javascript/components/RequestCart.vue   | 2 +-
 app/javascript/test/addToCartButton.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/components/RequestCart.vue b/app/javascript/components/RequestCart.vue
index fd6ee07f..7b340807 100644
--- a/app/javascript/components/RequestCart.vue
+++ b/app/javascript/components/RequestCart.vue
@@ -84,7 +84,7 @@
               </td>
             </tr>
 
-            <tr v-else="item.location && item.location.label" class="request__location">
+            <tr v-else-if="item.location && item.location.label" class="request__location">
               <td colspan="4">
                 <geo-icon></geo-icon>
                 View this item at the <template v-if="item.location.url"><a
diff --git a/app/javascript/test/addToCartButton.spec.js b/app/javascript/test/addToCartButton.spec.js
index ef46fc8a..d818232a 100644
--- a/app/javascript/test/addToCartButton.spec.js
+++ b/app/javascript/test/addToCartButton.spec.js
@@ -20,6 +20,6 @@ describe('AddToCartButton.vue', () => {
     })
     const button = getByRole('button')
     await fireEvent.click(button)
-    expect(addItemToCart).toHaveBeenCalledWith(expect.anything(), { accessRestrict: '', callnumber: 'AC101', containers: '', formParams: undefined, title: 'Title' })
+    expect(addItemToCart).toHaveBeenCalledWith(expect.anything(), { restricted: false, callnumber: 'AC101', containers: '', formParams: undefined, title: 'Title' })
   })
 })