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

package/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+Version 1.2.0 (released 2024-11-19)
+
+- self-checkout: integrate new dedicate endpoints
+
+Version 1.1.0 (released 2024-11-04)
+
+- self-checkout: uppercase barcode when input by the user
+
 Version 1.0.0 (released 2024-10-22)
 
 - upgrade axios and react-searchkit dependencies

package/README.md

@@ -10,8 +10,7 @@ To update dependencies you need to run `npm install` in the target deployment
 environment:
 
 ```shell
-$ rm -rf package-lock.json && rm -rf node_modules
-
+$ rm -rf package-lock.json node_modules
 # Run the container with x86_64 architecture and install packages
 $ docker run -it --platform="linux/amd64" --rm -v $(pwd):/app -w /app node:14-alpine sh -c "npm install"
 ```

package/dist/cjs/index.js

@@ -440,6 +440,12 @@ const RECORDS_CONFIG = {
         iconClass: 'dolly'
       }
     },
+    deliveryMethodSelfCheckout: {
+      'SELF-CHECKOUT': {
+        text: 'SELF-CHECKOUT',
+        iconClass: 'shopping basket'
+      }
+    },
     extensionsMaxCount: 3,
     loanWillExpireDays: 7,
     loanActiveStates: ['ITEM_AT_DESK', 'ITEM_ON_LOAN', 'ITEM_IN_TRANSIT_FOR_PICKUP', 'ITEM_IN_TRANSIT_TO_HOUSE'],
@@ -3447,6 +3453,7 @@ const serializer$4 = {
 
 const apiPaths$1 = {
   checkout: '/circulation/loans/checkout',
+  selfCheckout: '/circulation/loans/self-checkout',
   notificationOverdue: '/circulation/loans/:loanPid/notification-overdue',
   item: '/circulation/loans/:loanPid',
   list: '/circulation/loans/',
@@ -3540,6 +3547,24 @@ const doCheckout = async function (documentPid, itemPid, patronPid) {
   response.data = serializer$4.fromJSON(response.data);
   return response;
 };
+const doSelfCheckoutSearchItem = async barcode => {
+  const response = await http.get(`${apiPaths$1.selfCheckout}?barcode=${barcode}`);
+  response.data = serializer$4.fromJSON(response.data);
+  return response;
+};
+const doSelfCheckout = async (documentPid, itemPid, patronPid) => {
+  const currentUser = sessionManager.user;
+  const payload = {
+    document_pid: documentPid,
+    item_pid: itemPid,
+    patron_pid: patronPid,
+    transaction_location_pid: `${currentUser.locationPid}`,
+    transaction_user_pid: `${currentUser.id}`
+  };
+  const response = await http.post(apiPaths$1.selfCheckout, payload);
+  response.data = serializer$4.fromJSON(response.data);
+  return response;
+};
 const assignItemToLoan$1 = async (itemPid, loanPid) => {
   const path = reactRouterDom.generatePath(apiPaths$1.replaceItem, {
     loanPid: loanPid
@@ -3720,6 +3745,8 @@ const loanApi = {
   doAction: doAction,
   doRequest: doRequest,
   doCheckout: doCheckout,
+  doSelfCheckout: doSelfCheckout,
+  doSelfCheckoutSearchItem: doSelfCheckoutSearchItem,
   sendOverdueLoansNotificationReminder: sendOverdueLoansNotificationReminder$1,
   serializer: serializer$4,
   updateDates: updateDates,
@@ -12163,6 +12190,7 @@ class LoanListEntry extends React.Component {
     const patronPid = loan.metadata.patron_pid;
     const delivery = _get__default["default"](loan.metadata.delivery, 'method');
     const deliveryMethod = delivery && loan.metadata.state === 'PENDING' ? invenioConfig.CIRCULATION.deliveryMethods[delivery] : '';
+    const isSelfCheckout = delivery === 'SELF-CHECKOUT';
     return /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Item, null, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Item.Content, null, loan.metadata.is_overdue && /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Label, {
       color: "red"
     }, "Overdue"), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Item.Header, {
@@ -12197,8 +12225,10 @@ class LoanListEntry extends React.Component {
     }, loan.metadata.extension_count || '0'), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.List.Content, null, /*#__PURE__*/React__default["default"].createElement("label", null, " Extensions"))))), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Grid.Column, {
       width: 2,
       textAlign: "center"
-    }, deliveryMethod && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, delivery, ' ', deliveryMethod.iconClass && /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Icon, {
+    }, deliveryMethod ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, delivery, ' ', deliveryMethod.iconClass && /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Icon, {
       className: deliveryMethod.iconClass
+    })) : isSelfCheckout && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, delivery, ' ', /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Icon, {
+      className: invenioConfig.CIRCULATION.deliveryMethodSelfCheckout[delivery].iconClass
     }))), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Grid.Column, {
       computer: 3,
       largeScreen: 3
@@ -24871,7 +24901,7 @@ const deleteItem = itemPid => {
     }
   };
 };
-const checkoutItem$2 = function (documentPid, itemPid, patronPid) {
+const checkoutItem$1 = function (documentPid, itemPid, patronPid) {
   let force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   return async dispatch => {
     dispatch({
@@ -25071,7 +25101,7 @@ const mapDispatchToProps$J = dispatch => ({
   deleteItem: itemPid => dispatch(deleteItem(itemPid)),
   checkoutItem: function (documentPid, itemPid, patronPid) {
     let force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    return dispatch(checkoutItem$2(documentPid, itemPid, patronPid, force));
+    return dispatch(checkoutItem$1(documentPid, itemPid, patronPid, force));
   }
 });
 const ItemActionMenu = reactRedux.connect(mapStateToProps$W, mapDispatchToProps$J)(ItemActionMenu$1);
@@ -25452,7 +25482,7 @@ const mapDispatchToProps$I = dispatch => ({
   deleteItem: itemPid => dispatch(deleteItem(itemPid)),
   checkoutItem: function (documentPid, itemPid, patronPid) {
     let force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    return dispatch(checkoutItem$2(documentPid, itemPid, patronPid, force));
+    return dispatch(checkoutItem$1(documentPid, itemPid, patronPid, force));
   }
 });
 const ItemMetadata$1 = reactRedux.connect(mapStateToProps$U, mapDispatchToProps$I)(ItemMetadata$2);
@@ -26625,7 +26655,7 @@ class LoanMetadata$1 extends React.Component {
   getDelivery(_delivery) {
     const delivery = _get__default["default"](_delivery, 'method');
     if (delivery) {
-      const deliveryMethod = invenioConfig.CIRCULATION.deliveryMethods[delivery];
+      const deliveryMethod = invenioConfig.CIRCULATION.deliveryMethods[delivery] || invenioConfig.CIRCULATION.deliveryMethodSelfCheckout[delivery];
       return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, deliveryMethod.text, ' ', deliveryMethod.iconClass && /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Icon, {
         className: deliveryMethod.iconClass
       }));
@@ -29571,7 +29601,7 @@ const CLEAR_SEARCH = 'itemsSearchBarcode/CLEAR_SEARCH';
 const IS_LOADING$h = 'patronItemCheckout/IS_LOADING';
 const SUCCESS$h = 'patronItemCheckout/SUCCESS';
 const HAS_ERROR$h = 'patronItemCheckout/ERROR';
-const checkoutItem$1 = function (documentPid, itemPid, patronPid) {
+const checkoutItem = function (documentPid, itemPid, patronPid) {
   let force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   return async dispatch => {
     dispatch({
@@ -29612,7 +29642,7 @@ const checkoutItem$1 = function (documentPid, itemPid, patronPid) {
 const mapDispatchToProps$t = dispatch => ({
   checkoutItem: function (documentPid, itemPid, patronPid) {
     let force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    return dispatch(checkoutItem$1(documentPid, itemPid, patronPid, force));
+    return dispatch(checkoutItem(documentPid, itemPid, patronPid, force));
   }
 });
 const mapStateToProps$E = state => ({
@@ -29774,7 +29804,7 @@ const mapStateToProps$D = state => ({
 const mapDispatchToProps$s = dispatch => ({
   checkoutItem: function (documentPid, itemPid, patronPid) {
     let force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    return dispatch(checkoutItem$1(documentPid, itemPid, patronPid, force));
+    return dispatch(checkoutItem(documentPid, itemPid, patronPid, force));
   }
 });
 const ItemsResultsList = reactRedux.connect(mapStateToProps$D, mapDispatchToProps$s)(ItemsResultsList$1);
@@ -29900,7 +29930,7 @@ const fetchAndCheckoutIfOne = (barcode, patronPid, onSuccess) => {
           type: recordToPidType(itemToCheckout),
           value: itemToCheckout.metadata.pid
         };
-        dispatch(checkoutItem$1(documentPid, itemPid, patronPid, true));
+        dispatch(checkoutItem(documentPid, itemPid, patronPid, true));
         onSuccess();
       }
     } catch (error) {
@@ -29935,7 +29965,7 @@ const mapDispatchToProps$r = dispatch => ({
   clearResults: () => dispatch(clearResults()),
   checkoutItem: function (documentPid, itemPid, patronPid) {
     let force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-    return dispatch(checkoutItem$1(documentPid, itemPid, patronPid, force));
+    return dispatch(checkoutItem(documentPid, itemPid, patronPid, force));
   }
 });
 const mapStateToProps$C = state => ({
@@ -37659,7 +37689,7 @@ class ManualCheckout extends React__default["default"].Component {
   constructor(props) {
     super(props);
     this.state = {
-      manualBarcode: null
+      manualBarcode: ''
     };
     this.inputRef = React__default["default"].createRef();
   }
@@ -37676,7 +37706,7 @@ class ManualCheckout extends React__default["default"].Component {
   render() {
     const {
       show,
-      onChange,
+      onBarcodeInput,
       label
     } = this.props;
     const {
@@ -37690,17 +37720,22 @@ class ManualCheckout extends React__default["default"].Component {
       }, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Header, {
         className: "pb-1",
         as: "h5"
-      }, label, " Add the barcode manually:"), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Input, {
+      }, label, " Insert the barcode manually:"), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Input, {
         id: "barcodeInput",
         type: "text",
         placeholder: "Barcode...",
         className: "pb-1",
         ref: this.inputRef,
-        onChange: e => this.setState({
-          manualBarcode: e.target.value
-        })
+        value: manualBarcode,
+        onChange: e => {
+          var _e$target$value;
+          return this.setState({
+            manualBarcode: (_e$target$value = e.target.value) === null || _e$target$value === void 0 ? void 0 : _e$target$value.toUpperCase()
+          });
+        }
       }), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Button, {
-        onClick: () => onChange(manualBarcode),
+        onClick: () => manualBarcode && onBarcodeInput(manualBarcode),
+        disabled: !manualBarcode,
         className: "ml-10",
         type: "submit"
       }, "Search")));
@@ -37711,7 +37746,7 @@ class ManualCheckout extends React__default["default"].Component {
 }
 ManualCheckout.defaultProps = {
   show: false,
-  label: 'Can’t scan the barcode?',
+  label: "Can't scan the barcode?",
   autofocus: false
 };
 
@@ -37761,14 +37796,14 @@ class SelfCheckoutModal$1 extends React__default["default"].Component {
       size: "large",
       centered: true,
       onClose: () => toggleModal(false)
-    }, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Modal.Header, null, `You are about to checkout a book with barcode:
+    }, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Modal.Header, null, `You are about to checkout the literature with barcode:
             ${item === null || item === void 0 ? void 0 : item.metadata.barcode}`), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Modal.Content, null, /*#__PURE__*/React__default["default"].createElement(DocumentCard, {
       item: item
     }), /*#__PURE__*/React__default["default"].createElement(ManualCheckout, {
-      label: "Wrong book?",
+      label: "Wrong literature?",
       autofocus: true,
       show: true,
-      onChange: onBarcodeDetected
+      onBarcodeInput: onBarcodeDetected
     })), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Modal.Actions, null, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Button, {
       color: "black",
       onClick: () => toggleModal(false),
@@ -37803,21 +37838,19 @@ const notifyResultMessage = message => {
     dispatch(sendWarningNotification(message));
   };
 };
-const searchItem = async (dispatch, term) => {
-  const response = await itemApi.list(itemApi.query().withBarcode(term).qs());
-  const item = _first__default["default"](response.data.hits) || null;
-  dispatch({
-    type: SEARCH_ITEM_SUCCESS,
-    payload: item
-  });
-};
 const selfCheckOutSearch = term => {
   return async dispatch => {
     dispatch({
       type: SEARCH_IS_LOADING
     });
     try {
-      await searchItem(dispatch, term);
+      const upperCasedTerm = term.toUpperCase();
+      const response = await loanApi.doSelfCheckoutSearchItem(upperCasedTerm);
+      const item = response.data || null;
+      dispatch({
+        type: SEARCH_ITEM_SUCCESS,
+        payload: item
+      });
     } catch (error) {
       dispatch({
         type: SEARCH_HAS_ERROR,
@@ -37827,16 +37860,13 @@ const selfCheckOutSearch = term => {
     }
   };
 };
-const checkoutItem = (documentPid, itemPid, patronPid) => {
+const selfCheckOut = (documentPid, itemPid, patronPid) => {
   return async dispatch => {
     try {
-      const response = await loanApi.doCheckout(documentPid, itemPid, patronPid);
-      const {
-        pid
-      } = response.data.metadata;
-      const linkToLoan = /*#__PURE__*/React__default["default"].createElement("p", null, "The loan ", pid, " has been created by you!", ' ', /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
+      await loanApi.doSelfCheckout(documentPid, itemPid, patronPid);
+      const linkToLoan = /*#__PURE__*/React__default["default"].createElement("p", null, "Self-checkout completed! You can view all your current loans on your", ' ', /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
         to: FrontSiteRoutes.patronProfile
-      }, "You can now view the loan details."));
+      }, "profile"), " page.");
       dispatch(sendSuccessNotification('Success!', linkToLoan));
     } catch (error) {
       dispatch(sendErrorNotification(error));
@@ -37845,7 +37875,7 @@ const checkoutItem = (documentPid, itemPid, patronPid) => {
 };
 
 const mapDispatchToProps$a = dispatch => ({
-  checkoutItem: (documentPid, itemPid, patronPid) => dispatch(checkoutItem(documentPid, itemPid, patronPid))
+  checkoutItem: (documentPid, itemPid, patronPid) => dispatch(selfCheckOut(documentPid, itemPid, patronPid))
 });
 const mapStateToProps$b = state => ({
   user: state.authenticationManagement.data,
@@ -37879,48 +37909,8 @@ class SelfCheckout$1 extends React__default["default"].Component {
           selfCheckOutSearch
         } = this.props;
         await selfCheckOutSearch(detectedBarcode);
-
-        // open modal if item is loanable
-        const shouldShowModal = this.isItemLoanable(detectedBarcode);
-        if (shouldShowModal) {
-          this.toggleModal(true);
-        } else {
-          this.toggleModal(false);
-        }
-      }
-    };
-    this.itemStatus = item => ({
-      canCirculate: () => invenioConfig.ITEMS.canCirculateStatuses.includes(item.metadata.status),
-      isOnShelf: () => !item.metadata.circulation.state // on shelf if circulation.state doesn't exist
-    });
-    this.isItemLoanable = itemBarcode => {
-      const {
-        user,
-        item,
-        notifyResultMessage
-      } = this.props;
-      var resultMessage = `Book with barcode: ${itemBarcode} doesn't exist.`;
-      if (!_isEmpty__default["default"](item)) {
-        if (this.itemStatus(item).canCirculate()) {
-          if (this.itemStatus(item).isOnShelf()) {
-            return true;
-          } else {
-            if (item.metadata.circulation.patron_pid === user.id.toString()) {
-              resultMessage = `You already loaned this book with barcode: ${itemBarcode}!`;
-            } else {
-              resultMessage = `Book with barcode: ${itemBarcode} is currently on loan!`;
-            }
-          }
-        } else {
-          var _item$metadata;
-          const status = _find__default["default"](invenioConfig.ITEMS.statuses, {
-            value: (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.status
-          });
-          resultMessage = `Book with barcode: ${itemBarcode} is ${status === null || status === void 0 ? void 0 : status.text}!`;
-        }
+        this.toggleModal(true);
       }
-      notifyResultMessage(resultMessage);
-      return false;
     };
     this.renderInstructions = () => {
       return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Header, {
@@ -37960,24 +37950,24 @@ class SelfCheckout$1 extends React__default["default"].Component {
       onBarcodeDetected: this.onBarcodeDetected
     }), /*#__PURE__*/React__default["default"].createElement(ManualCheckout, {
       show: true,
-      onChange: this.onBarcodeDetected
+      onBarcodeInput: this.onBarcodeDetected
     }), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Message, {
       warning: true,
       compact: true
-    }, "If your browser isn't able to scan the barcode, try", /*#__PURE__*/React__default["default"].createElement("br", null), "using another browser. (Recommended: Chrome)")), /*#__PURE__*/React__default["default"].createElement(SelfCheckoutModal, {
+    }, "Barcode not detected while scanning?", /*#__PURE__*/React__default["default"].createElement("br", null), "Try using another browser. (Recommended:", ' ', /*#__PURE__*/React__default["default"].createElement("a", {
+      href: "https://www.google.com/chrome/"
+    }, "Google Chrome"), ")")), /*#__PURE__*/React__default["default"].createElement(SelfCheckoutModal, {
       modalOpened: showModal,
       toggleModal: this.toggleModal,
       onBarcodeDetected: this.onBarcodeDetected
     }), this.renderInstructions());
   }
 }
-SelfCheckout$1.defaultProps = {
-  item: null
-};
 var SelfCheckoutComponent = Overridable__default["default"].component('SelfCheckout', SelfCheckout$1);
 
 const mapDispatchToProps$9 = dispatch => ({
   selfCheckOutSearch: term => dispatch(selfCheckOutSearch(term)),
+  selfCheckOut: term => dispatch(selfCheckOut(term)),
   notifyResultMessage: message => dispatch(notifyResultMessage(message))
 });
 const mapStateToProps$a = state => ({