@inveniosoftware/react-invenio-app-ils 1.2.0 → 1.3.0

package/CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+Version 1.3.0 (released 2024-06-04)
+
+- closures: disabled closed dates in Backoffice LoanUpdateDates calendar
+- backoffice: fix relations table only showing items on the first page
+- ui: Button to extend all loans is disabled instead of hidden
+
 Version 1.2.0 (released 2024-11-19)
 
 - self-checkout: integrate new dedicate endpoints

package/dist/cjs/index.js

@@ -2456,7 +2456,7 @@ const serializer$9 = {
 };
 
 const documentRequestURL = '/document-requests/';
-const apiPaths$2 = {
+const apiPaths$3 = {
   accept: `${documentRequestURL}:docReqPid/accept`,
   item: `${documentRequestURL}:docReqPid`,
   list: documentRequestURL,
@@ -2465,12 +2465,12 @@ const apiPaths$2 = {
   provider: `${documentRequestURL}:docReqPid/provider`
 };
 const create$8 = async data => {
-  const response = await http.post(apiPaths$2.list, data);
+  const response = await http.post(apiPaths$3.list, data);
   response.data = serializer$9.fromJSON(response.data);
   return response;
 };
 const update$8 = async (docRequestPid, data) => {
-  const path = reactRouterDom.generatePath(apiPaths$2.item, {
+  const path = reactRouterDom.generatePath(apiPaths$3.item, {
     docReqPid: docRequestPid
   });
   const response = await http.put(path, data);
@@ -2478,7 +2478,7 @@ const update$8 = async (docRequestPid, data) => {
   return response;
 };
 const get$c = async docRequestPid => {
-  const path = reactRouterDom.generatePath(apiPaths$2.item, {
+  const path = reactRouterDom.generatePath(apiPaths$3.item, {
     docReqPid: docRequestPid
   });
   const response = await http.get(path);
@@ -2486,7 +2486,7 @@ const get$c = async docRequestPid => {
   return response;
 };
 const del$8 = async docRequestPid => {
-  const path = reactRouterDom.generatePath(apiPaths$2.item, {
+  const path = reactRouterDom.generatePath(apiPaths$3.item, {
     docReqPid: docRequestPid
   });
   const response = await http.delete(path);
@@ -2498,19 +2498,19 @@ const performAction = async (urlPath, data) => {
   return response;
 };
 const accept = async docRequestPid => {
-  const urlPath = reactRouterDom.generatePath(apiPaths$2.accept, {
+  const urlPath = reactRouterDom.generatePath(apiPaths$3.accept, {
     docReqPid: docRequestPid
   });
   return performAction(urlPath);
 };
 const addDocument$1 = async (docReqPid, data) => {
-  const url = reactRouterDom.generatePath(apiPaths$2.document, {
+  const url = reactRouterDom.generatePath(apiPaths$3.document, {
     docReqPid: docReqPid
   });
   return await http.post(url, data);
 };
 const removeDocument$1 = async (docReqPid, data) => {
-  const url = reactRouterDom.generatePath(apiPaths$2.document, {
+  const url = reactRouterDom.generatePath(apiPaths$3.document, {
     docReqPid: docReqPid
   });
   // https://github.com/axios/axios/issues/897#issuecomment-343715381
@@ -2519,19 +2519,19 @@ const removeDocument$1 = async (docReqPid, data) => {
   });
 };
 const addProvider$1 = async (docReqPid, data) => {
-  const url = reactRouterDom.generatePath(apiPaths$2.provider, {
+  const url = reactRouterDom.generatePath(apiPaths$3.provider, {
     docReqPid: docReqPid
   });
   return await http.post(url, data);
 };
 const removeProvider$1 = async docReqPid => {
-  const url = reactRouterDom.generatePath(apiPaths$2.provider, {
+  const url = reactRouterDom.generatePath(apiPaths$3.provider, {
     docReqPid: docReqPid
   });
   return await http.delete(url);
 };
 const decline = async (docRequestPid, data) => {
-  const urlPath = reactRouterDom.generatePath(apiPaths$2.decline, {
+  const urlPath = reactRouterDom.generatePath(apiPaths$3.decline, {
     docReqPid: docRequestPid
   });
   return performAction(urlPath, data);
@@ -3451,7 +3451,7 @@ const serializer$4 = {
   fromJSON: serializeResponse$3
 };
 
-const apiPaths$1 = {
+const apiPaths$2 = {
   checkout: '/circulation/loans/checkout',
   selfCheckout: '/circulation/loans/self-checkout',
   notificationOverdue: '/circulation/loans/:loanPid/notification-overdue',
@@ -3463,7 +3463,7 @@ const apiPaths$1 = {
   bulkExtend: '/circulation/bulk-extend'
 };
 const get$7 = async loanPid => {
-  const path = reactRouterDom.generatePath(apiPaths$1.item, {
+  const path = reactRouterDom.generatePath(apiPaths$2.item, {
     loanPid: loanPid
   });
   const response = await http.get(path);
@@ -3516,7 +3516,7 @@ const doRequest = async function (documentPid, patronPid) {
       method: deliveryMethod
     };
   }
-  const response = await http.post(apiPaths$1.request, payload);
+  const response = await http.post(apiPaths$2.request, payload);
   response.data = serializer$4.fromJSON(response.data);
   return response;
 };
@@ -3543,12 +3543,12 @@ const doCheckout = async function (documentPid, itemPid, patronPid) {
   if (force) {
     payload.force = true;
   }
-  const response = await http.post(apiPaths$1.checkout, payload);
+  const response = await http.post(apiPaths$2.checkout, payload);
   response.data = serializer$4.fromJSON(response.data);
   return response;
 };
 const doSelfCheckoutSearchItem = async barcode => {
-  const response = await http.get(`${apiPaths$1.selfCheckout}?barcode=${barcode}`);
+  const response = await http.get(`${apiPaths$2.selfCheckout}?barcode=${barcode}`);
   response.data = serializer$4.fromJSON(response.data);
   return response;
 };
@@ -3561,12 +3561,12 @@ const doSelfCheckout = async (documentPid, itemPid, patronPid) => {
     transaction_location_pid: `${currentUser.locationPid}`,
     transaction_user_pid: `${currentUser.id}`
   };
-  const response = await http.post(apiPaths$1.selfCheckout, payload);
+  const response = await http.post(apiPaths$2.selfCheckout, payload);
   response.data = serializer$4.fromJSON(response.data);
   return response;
 };
 const assignItemToLoan$1 = async (itemPid, loanPid) => {
-  const path = reactRouterDom.generatePath(apiPaths$1.replaceItem, {
+  const path = reactRouterDom.generatePath(apiPaths$2.replaceItem, {
     loanPid: loanPid
   });
   const payload = {
@@ -3580,7 +3580,7 @@ const bulkExtendLoans = async patronPid => {
   const payload = {
     patron_pid: patronPid
   };
-  const response = await http.post(apiPaths$1.bulkExtend, payload);
+  const response = await http.post(apiPaths$2.bulkExtend, payload);
   return response;
 };
 class QueryBuilder$4 {
@@ -3694,19 +3694,19 @@ const queryBuilder$4 = () => {
   return new QueryBuilder$4();
 };
 const list$7 = async query => {
-  const response = await http.get(`${apiPaths$1.list}?q=${query}`);
+  const response = await http.get(`${apiPaths$2.list}?q=${query}`);
   response.data.total = getSearchTotal(response.data.hits);
   response.data.hits = response.data.hits.hits.map(hit => serializer$4.fromJSON(hit));
   return response;
 };
 const sendOverdueLoansNotificationReminder$1 = async payload => {
-  const path = reactRouterDom.generatePath(apiPaths$1.notificationOverdue, {
+  const path = reactRouterDom.generatePath(apiPaths$2.notificationOverdue, {
     loanPid: payload.loanPid
   });
   return await http.post(path, payload);
 };
 const count$2 = async query => {
-  const response = await http.get(`${apiPaths$1.list}?q=${query}`);
+  const response = await http.get(`${apiPaths$2.list}?q=${query}`);
   response.data = getSearchTotal(response.data.hits);
   return response;
 };
@@ -3730,13 +3730,13 @@ const updateDates = async function (loanPid) {
   if (requestExpireDate) {
     payload.request_expire_date = requestExpireDate;
   }
-  const path = reactRouterDom.generatePath(apiPaths$1.updateDates, {
+  const path = reactRouterDom.generatePath(apiPaths$2.updateDates, {
     loanPid: loanPid
   });
   return await http.post(path, payload);
 };
 const loanApi = {
-  searchBaseURL: `${apiConfig.baseURL}${apiPaths$1.list}`,
+  searchBaseURL: `${apiConfig.baseURL}${apiPaths$2.list}`,
   assignItemToLoan: assignItemToLoan$1,
   query: queryBuilder$4,
   list: list$7,
@@ -3785,12 +3785,25 @@ function serializeLocationResponse(hit) {
   }
   return result;
 }
+function serializeLocationClosurePeriodsResponse(hit) {
+  let result = [];
+  if (!_isEmpty__default["default"](hit)) {
+    result = hit.closure_periods.map(period => ({
+      start: new luxon.DateTime.fromISO(period.start),
+      end: new luxon.DateTime.fromISO(period.end)
+    }));
+  }
+  return result;
+}
 const internalLocationSerializer = {
   fromJSON: serializeInternalLocationResponse
 };
 const locationSerializer = {
   fromJSON: serializeLocationResponse
 };
+const locationClosurePeriodsSerializer = {
+  fromJSON: serializeLocationClosurePeriodsResponse
+};
 
 const internalLocationURL = '/internal-locations/';
 const get$6 = async internalLocationPid => {
@@ -3831,6 +3844,9 @@ const internalLocationApi = {
 };
 
 const locationURL = '/locations/';
+const apiPaths$1 = {
+  closure_periods: `/closure_periods/`
+};
 const get$5 = async locationPid => {
   const response = await http.get(`${locationURL}${locationPid}`);
   response.data = locationSerializer.fromJSON(response.data);
@@ -3857,13 +3873,19 @@ const list$5 = async function () {
   response.data.hits = response.data.hits.hits.map(hit => locationSerializer.fromJSON(hit));
   return response;
 };
+const getClosurePeriods = async (locationPid, year) => {
+  const response = await http.get(`${locationURL}${locationPid}${apiPaths$1.closure_periods}${year}`);
+  response.data = locationClosurePeriodsSerializer.fromJSON(response.data);
+  return response;
+};
 const locationApi = {
   list: list$5,
   get: get$5,
   delete: del$2,
   create: create$2,
   update: update$2,
-  url: locationURL
+  url: locationURL,
+  getClosurePeriods: getClosurePeriods
 };
 
 function serializeResponse$2(hit) {
@@ -13165,102 +13187,70 @@ var DatePicker$1 = Overridable__default["default"].component('DatePicker', DateP
 class LocationDatePicker extends React.Component {
   constructor(props) {
     super(props);
-    this.fetchLocation = async locationPid => {
-      this.setState({
-        isLoading: true
-      });
-      try {
-        const response = await locationApi.get(locationPid);
-        this.setState({
-          data: response.data,
-          isLoading: false,
-          error: {}
-        });
-      } catch (error) {
+    this.fetchData = () => {
+      this.fetchLocationClosurePeriods();
+    };
+    this.fetchLocationClosurePeriods = async () => {
+      const {
+        locationPid
+      } = this.props;
+      if (!locationPid) {
         this.setState({
           isLoading: false,
-          error: error
+          disabledDates: [],
+          error: {
+            message: 'Location PID is missing.'
+          }
         });
+        return;
       }
-    };
-    this.disableAllDates = (minDate, maxDate, disabled) => {
-      let date = luxon.DateTime.fromISO(minDate);
-      const dateMax = luxon.DateTime.fromISO(maxDate);
-      while (date <= dateMax) {
-        const dateISO = date.toISODate();
-        disabled.push(dateISO);
-        date = date.plus({
-          days: 1
+      this.setState({
+        isLoading: true,
+        error: null
+      });
+      const currentYear = luxon.DateTime.now().year;
+      const yearsToFetch = [currentYear - 1, currentYear, currentYear + 1];
+      try {
+        const promises = yearsToFetch.map(year => {
+          const cancellable = withCancel(locationApi.getClosurePeriods(locationPid, year));
+          this.cancellableFetches.push(cancellable);
+          return cancellable.promise;
         });
-      }
-    };
-    this.disableClosures = (maxDate, minDate, data, disabled) => {
-      const weekdays = data.metadata.opening_weekdays,
-        exceptions = data.metadata.opening_exceptions;
-      let date = luxon.DateTime.fromISO(minDate);
-      const dateMax = luxon.DateTime.fromISO(maxDate);
-      while (date <= dateMax) {
-        const dateISO = date.toISODate();
-        let isOpen = weekdays[date.weekday - 1].is_open;
-        exceptions.forEach(exception => {
-          if (exception.start_date <= dateISO && dateISO <= exception.end_date) {
-            isOpen = exception.is_open;
+        const responses = await Promise.all(promises);
+        const disabledDateRanges = responses.flatMap(response => response.data);
+        const disabledDates = disabledDateRanges.flatMap(dateRange => {
+          const dates = [];
+          let currentDate = luxon.DateTime.fromISO(dateRange.start);
+          const endDate = luxon.DateTime.fromISO(dateRange.end);
+          while (currentDate <= endDate) {
+            dates.push(currentDate.toISODate());
+            currentDate = currentDate.plus({
+              days: 1
+            });
           }
+          return dates;
         });
-        if (!isOpen) {
-          disabled.push(dateISO);
-        }
-        date = date.plus({
-          days: 1
+        this.setState({
+          disabledDates: disabledDates,
+          isLoading: false
         });
-      }
-
-      // Disable recent X days including current date as set in the config
-      date = luxon.DateTime.fromISO(minDate);
-      let workingDaysToOffset = invenioConfig.CIRCULATION.requestStartOffset;
-      let i = 0;
-      while (workingDaysToOffset > 0) {
-        const dateISO = date.toISODate();
-        if (dateISO === disabled[i]) {
-          i++;
-        } else {
-          disabled.push(dateISO);
-          workingDaysToOffset--;
-        }
-        date = date.plus({
-          days: 1
+      } catch (fetchError) {
+        console.error('LocationDatePicker: Failed to fetch closure periods.', fetchError);
+        this.setState({
+          isLoading: false,
+          error: fetchError
         });
       }
     };
-    this.listDisabled = () => {
-      const {
-        minDate,
-        maxDate
-      } = this.props;
-      const {
-        isLoading,
-        error,
-        data
-      } = this.state;
-      const disabled = [];
-      if (isLoading) {
-        this.disableAllDates(minDate, maxDate, disabled);
-      } else if (!error.response && !_isEmpty__default["default"](data)) {
-        this.disableClosures(maxDate, minDate, data, disabled);
-      }
-      return disabled;
-    };
-    this.fetchData = () => {
-      const {
-        locationPid
-      } = this.props;
-      this.fetchLocation(locationPid);
-    };
     this.state = {
-      data: {},
+      disabledDates: [],
       isLoading: false,
-      error: {}
+      error: null
     };
+    this.cancellableFetches = [];
+  }
+  componentWillUnmount() {
+    this.cancellableFetches.forEach(cancellable => cancellable.cancel());
   }
   render() {
     const {
@@ -13272,12 +13262,18 @@ class LocationDatePicker extends React.Component {
       ...otherProps
     } = this.props;
     const {
-      isLoading
+      disabledDates,
+      isLoading,
+      error
     } = this.state;
+    if (error) {
+      console.error(error);
+      return null;
+    }
     return /*#__PURE__*/React__default["default"].createElement(DatePicker$1, Object.assign({}, otherProps, {
       minDate: minDate,
       maxDate: maxDate,
-      disable: this.listDisabled(),
+      disable: disabledDates,
       handleDateChange: handleDateChange,
       loading: isLoading,
       fetchData: this.fetchData,
@@ -13289,7 +13285,9 @@ class LocationDatePicker extends React.Component {
 }
 LocationDatePicker.defaultProps = {
   defaultValue: '',
-  locationPid: null
+  locationPid: null,
+  minDate: null,
+  maxDate: null
 };
 
 const serializeError = error => ({
@@ -15776,9 +15774,8 @@ class ExistingRelations extends React.Component {
     const {
       activePage
     } = this.state;
-    const activeRows = rows.slice((activePage - 1) * showMaxRows, activePage * showMaxRows);
     return /*#__PURE__*/React__default["default"].createElement(ResultsTable, {
-      data: activeRows,
+      data: rows,
       columns: columns,
       totalHitsCount: rows.length,
       showMaxRows: showMaxRows,
@@ -27282,16 +27279,18 @@ class LoanUpdateDates$1 extends React.Component {
     }), warning && this.renderWarning(warning), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Form, null, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Form.Group, null, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Form.Field, {
       inline: true,
       required: true
-    }, /*#__PURE__*/React__default["default"].createElement("label", null, startLabel), /*#__PURE__*/React__default["default"].createElement(DatePicker$1, {
+    }, /*#__PURE__*/React__default["default"].createElement("label", null, startLabel), /*#__PURE__*/React__default["default"].createElement(LocationDatePicker, {
       maxDate: active ? this.today() : null,
       defaultValue: active ? startDate : requestStartDate,
+      locationPid: sessionManager.user.locationPid,
       placeholder: startLabel,
       handleDateChange: value => this.handleStartDateChange(value)
     })), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Form.Field, {
       inline: true,
       required: true
-    }, /*#__PURE__*/React__default["default"].createElement("label", null, endLabel), /*#__PURE__*/React__default["default"].createElement(DatePicker$1, {
+    }, /*#__PURE__*/React__default["default"].createElement("label", null, endLabel), /*#__PURE__*/React__default["default"].createElement(LocationDatePicker, {
       defaultValue: active ? endDate : requestExpireDate,
+      locationPid: sessionManager.user.locationPid,
       placeholder: endLabel,
       handleDateChange: value => this.handleEndDateChange(value)
     }))), hint && this.renderHint(hint))), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Modal.Actions, {
@@ -29429,7 +29428,7 @@ class PatronBulkExtendLoans$1 extends React.Component {
       patronPid,
       bulkLoanExtension,
       isLoading,
-      hidden,
+      disabled,
       ...uiProps
     } = this.props;
     const {
@@ -29439,12 +29438,13 @@ class PatronBulkExtendLoans$1 extends React.Component {
       open: open,
       onClose: this.close,
       onOpen: this.open,
-      trigger: !hidden && /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Button, Object.assign({
+      trigger: /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Button, Object.assign({
         labelPosition: "left",
         fluid: true,
         icon: true,
         primary: true,
-        loading: isLoading
+        loading: isLoading,
+        disabled: disabled
       }, uiProps), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Icon, {
         name: "refresh"
       }), "Extend all loans")
@@ -29460,7 +29460,7 @@ class PatronBulkExtendLoans$1 extends React.Component {
 }
 PatronBulkExtendLoans$1.defaultProps = {
   isLoading: false,
-  hidden: true
+  disabled: true
 };
 
 const IS_LOADING$l = 'fetchPatronCurrentLoans/IS_LOADING';
@@ -30993,7 +30993,7 @@ class PatronDetails$1 extends React.Component {
       offset: 150
     }, /*#__PURE__*/React__default["default"].createElement(PatronBulkExtendLoans, {
       patronPid: currentPatronPid,
-      hidden: currentLoans.total === 0,
+      disabled: currentLoans.total === 0,
       fluid: true,
       color: "blue"
     }), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Divider, {
@@ -39007,7 +39007,7 @@ class PatronCurrentLoans$1 extends React.Component {
       floated: "right"
     }, /*#__PURE__*/React__default["default"].createElement(PatronBulkExtendLoans, {
       patronPid: currentUser.id,
-      hidden: loans.total === 0,
+      disabled: loans.total === 0,
       color: "orange"
     }))), /*#__PURE__*/React__default["default"].createElement(ILSItemPlaceholder, {
       fluid: true,