CONCD-1326 (#3159)

* CONCD-1326 Recent Pages Worked on filter (WiP)

* CONCD-1326 fixing an issue where dismissing the date filter was causing the page to reload with no data

* CONCD-1326 trying to fix an issue where multiple event listeners are added

* CONCD-1326 don't add a listener, unless the asset was actually reserved

Author: rasarkar

concordia/static/js/src/asset-reservation.js

@@ -91,8 +91,10 @@ function attemptToReserveAsset(reservationURL, findANewPageURL, actionType) {
                 });
             }
         });
+}
 
-    window.addEventListener('beforeunload', function () {
+window.addEventListener('beforeunload', function () {
+    if (assetReservationData.reserveAssetUrl) {
         let payload = {
             release: true,
             csrfmiddlewaretoken: $('input[name="csrfmiddlewaretoken"]').val(),
@@ -101,16 +103,20 @@ function attemptToReserveAsset(reservationURL, findANewPageURL, actionType) {
         // We'll try Beacon since that's reliable but until we can drop support for IE11 we need a fallback:
         if ('sendBeacon' in navigator) {
             navigator.sendBeacon(
-                reservationURL,
+                assetReservationData.reserveAssetUrl,
                 new Blob([$.param(payload)], {
                     type: 'application/x-www-form-urlencoded',
                 }),
             );
         } else {
-            $.ajax({url: reservationURL, type: 'POST', data: payload});
+            $.ajax({
+                url: assetReservationData.reserveAssetUrl,
+                type: 'POST',
+                data: payload,
+            });
         }
-    });
-}
+    }
+});
 
 function reserveAssetForEditing() {
     if (assetReservationData.reserveAssetUrl) {

concordia/static/js/src/recent-pages.js

@@ -7,13 +7,30 @@ export function getPages(queryString = window.location.search) {
         dataType: 'json',
         success: function (data) {
             var recentPages = document.createElement('div');
-            recentPages.setAttribute('class', 'col-md');
+            recentPages.className = 'col-md';
             recentPages.innerHTML = data.content;
             $('#recent-pages').html(recentPages);
         },
+        error: function () {
+            $('#recent-pages').html('<p>Failed to load pages.</p>');
+        },
     });
 }
 
-$('#recent-tab').on('click', function () {
-    getPages();
+$('#recent-tab').on('click', () => getPages(window.location.search));
+
+$(document).on('submit', '.date-filter', function (event) {
+    event.preventDefault();
+
+    const parameters = new URLSearchParams(new FormData(this));
+
+    getPages('?' + parameters.toString());
+});
+
+$(document).on('click', '#current-filters a', function (event) {
+    event.preventDefault();
+
+    const href = $(this).attr('href'); // e.g. "?tab=recent"
+
+    getPages(href);
 });

concordia/templates/fragments/recent-pages.html

@@ -5,7 +5,7 @@ <h2>Recent Pages Worked On</h2>
 <div class="row mt-4">
     {% include "fragments/standard-pagination.html" %}
 </div>
-<form class="container form date-filter pb-1 mb-2">
+<form class="container form date-filter pb-1 mb-2" method="get">
     <div class="d-flex flex-row">
         <span class="fw-bold me-1">Date: </span>Select Range
     </div>