105 restore request this collection button for collections with no contents

app/Assets/css/extra.css

@@ -118,7 +118,7 @@
   visibility: hidden;
 }
 
-.fa-request.fa-requestable-toc {
+.fa-request.fa-requestable-collection {
     display: block;
     margin: 0 auto;
 }

app/Assets/js/requests.js

@@ -122,8 +122,8 @@ var requests = (function() {
             container = $('#' + target).attr('data-container');
             label = $('#' + target).val();
             title_pieces = [];
-            title_pieces.push(volume);
-            title_pieces.push(container);
+            if (volume) title_pieces.push(volume);
+            if (container) title_pieces.push(container);
             title = title_pieces.join(', ');
 
             item = {
@@ -639,7 +639,7 @@ var requests = (function() {
                 });
                 add_input({
                   name: "ItemTitle_" + id,
-                  value: collection_title + ': ' + folder["title"],
+                  value: collection_title + (folder["title"] ? ': ' + folder["title"] : ''),
                   root: id
                 });
                 add_input({
@@ -668,6 +668,8 @@ var requests = (function() {
             collection_title = options["title"];
             button_active = options["button_active"];
             button_inactive = options["button_inactive"];
+            var button_collection_active = options["button_collection_active"];
+            var button_collection_inactive = options["button_collection_inactive"];
 
             model.init();
             update();
@@ -717,20 +719,24 @@ var requests = (function() {
 
             $('.fa-requestable').each(function () {
                 var id = $(this).attr('id');
-                    $(this).after([
-                        '<button type="button" class="button button--ghost fa-request fa-requestable-contents fa-request__button" data-status="inactive" data-active="',
-                        button_active,
-                        '" data-inactive="',
-                        button_inactive,
-                        '" data-target="',
-                        id,
-                        '" id="',
-                        id,
-                        '-button">',
-                        button_inactive,
-                        '</button>'
-                    ].join(''));
-                //}
+                var isCollection = $(this).hasClass('fa-collection');
+                var active = isCollection ? button_collection_active : button_active;
+                var inactive = isCollection ? button_collection_inactive : button_inactive;
+                $(this).after([
+                    '<button type="button" class="button button--ghost fa-request fa-request__button ',
+                    isCollection ? 'fa-requestable-collection' : 'fa-requestable-contents',
+                    '" data-status="inactive" data-active="',
+                    active,
+                    '" data-inactive="',
+                    inactive,
+                    '" data-target="',
+                    id,
+                    '" id="',
+                    id,
+                    '-button">',
+                    inactive,
+                    '</button>'
+                ].join(''));
             });
 
             $('form.fa-request-fieldset').submit(function () {

app/Controllers/Findingaid.php

@@ -245,10 +245,9 @@ public function show()
             $repository = $model->repository();
             $requestable = ($repository === 'University of Kentucky');
 
-            $toc_component = false;
+            $collection_request = false;
             if ($requestable and ($component_count == 0)) {
-                $toc_component = [
-                    'summary' => '',
+                $collection_request = [
                     'id' => 'fa-no-components-request',
                     'container_list' => fa_brevity($model->title()),
                     'volume' => '',
@@ -262,7 +261,6 @@ public function show()
                 'entries' => $toc_entries,
                 'links' => $links,
                 'requestable' => $requestable,
-                'toc_component' => $toc_component,
             ];
 
             $toc = $m->render(
@@ -283,6 +281,7 @@ public function show()
                         'id' => $requests_config['summary']['id'],
                         'label' => fa_brevity($requests_config['summary']['label']),
                         'list_id' => $requests_config['summary']['list_id'],
+                        'collection_request' => $collection_request,
                         'title' => $this->cleanup($model->unittitle()),
                         'collection_id' => $model->id(),
                         'call_number' => $model->unitid(),

app/Views/Findingaid/requests.mustache

@@ -102,5 +102,9 @@
         <button id="fa-request-submit" class="button button--wildcat-blue" type="submit" disabled="disabled">Submit Request</button>
       </form>
     </div>
+    {{#collection_request}}{{> checkered_divider}}{{/collection_request}}
   </div>
+  {{#collection_request}}
+  <input type="hidden" class="fa-requestable fa-collection" id="{{id}}" value="{{container_list}}" data-volume="{{volume}}" data-container="{{container}}">
+  {{/collection_request}}
 </div>

app/Views/Findingaid/toc.mustache

@@ -21,7 +21,5 @@
           {{/links}}
         </ul>
     </nav>
-    {{#toc_component}}
-    {{/toc_component}}
   </div>
 </div>

app/Views/Layouts/application.mustache

@@ -54,7 +54,9 @@
   requests.init({
       title: "{{title}}",
       button_active: "Remove",
-      button_inactive: "Request"
+      button_inactive: "Request",
+      button_collection_active: "Remove Collection",
+      button_collection_inactive: "Add Collection to Request"
   });
   </script>
   {{/requestable}}

tests/CollectionRequestTest.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Tests\Unit;
+
+use Mustache_Engine;
+use PHPUnit\Framework\TestCase;
+
+class CollectionRequestTest extends TestCase
+{
+    public function testCollectionRequestRemainsAvailableOutsideTheCollapsedPanel(): void
+    {
+        $html = (new Mustache_Engine())->render(load_template('Findingaid/requests'), [
+            'collection_request' => [
+                'id' => 'fa-no-components-request',
+                'container_list' => 'Example collection',
+                'volume' => '',
+                'container' => '',
+            ],
+        ]);
+        $document = new \DOMDocument();
+        $document->loadHTML($html, LIBXML_NOERROR | LIBXML_NOWARNING);
+        $xpath = new \DOMXPath($document);
+        // These classes are the hooks requests.js uses to create the collection button.
+        $targets = $xpath->query(
+            '//input[contains(concat(" ", normalize-space(@class), " "), " fa-requestable ")]'
+            . '[contains(concat(" ", normalize-space(@class), " "), " fa-collection ")]'
+        );
+
+        $this->assertCount(1, $targets, 'The collection must have one selectable request target.');
+        $this->assertCount(0, $xpath->query(
+            'ancestor::div[contains(concat(" ", normalize-space(@class), " "), " js-accordion__panel ")]',
+            $targets->item(0)
+        ), 'Collapsing the request options must not hide the collection button.');
+    }
+
+    public function testNoCollectionRequestTargetWithoutTheFallback(): void
+    {
+        $html = (new Mustache_Engine())->render(load_template('Findingaid/requests'), [
+            'collection_request' => false,
+        ]);
+
+        $this->assertStringNotContainsString('fa-requestable', $html);
+    }
+}