@inveniosoftware/react-invenio-app-ils 2.1.0 → 2.2.0

package/dist/cjs/index.js

@@ -739,7 +739,7 @@ const RECORDS_CONFIG = {
     }
   },
   ITEMS: {
-    identifiersToDisplayInFrontside: [],
+    identifiersToDisplay: [],
     circulationRestrictions: [{
       value: 'NO_RESTRICTION',
       text: 'No restriction (4 weeks)'
@@ -4287,6 +4287,26 @@ const vocabularyApi = {
   serializer: serializer$1
 };
 
+/**
+ * Resolves identifier scheme keys (e.g. "CALL_NUMBER") to their
+ * human-readable titles from the vocabulary API.
+ *
+ * @param {Array<string>} identifiers
+ * @param {string} identifierScheme
+ * @returns {Promise<Array<{key: string, text: string}>>}
+ */
+const fetchIdentifierTitles = async (identifiers, identifierScheme) => {
+  const query = vocabularyApi.query().withType(identifierScheme);
+  const response = await vocabularyApi.list(query.qs());
+  return identifiers.map(scheme => {
+    const vocabEntry = response.data.hits.find(entry => entry.metadata.key === scheme);
+    return {
+      key: scheme,
+      text: vocabEntry ? vocabEntry.metadata.text : scheme
+    };
+  });
+};
+
 class ScrollingMenuItem$1 extends React.Component {
   constructor(props) {
     super(props);
@@ -6232,32 +6252,36 @@ class DocumentItemBody extends React.Component {
       items,
       shelfLink,
       documentDetails,
-      identifiersToDisplayInFrontside
-    } = this.props;
-    return items.map(item => /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Row, {
-      key: item.pid
-    }, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
-      "data-label": "Barcode",
-      className: "document-item-table-itemCell"
-    }, item.barcode), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
-      "data-label": "Shelf",
-      className: "document-item-table-itemCell"
-    }, shelfLink !== null ? shelfLink(item, documentDetails) : _get__default["default"](item, 'shelf')), identifiersToDisplayInFrontside.map(identifier => {
-      var _item$identifiers, _item$identifiers$fin;
-      return /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
-        key: identifier,
-        "data-label": identifier.text,
+      identifiersToDisplay
+    } = this.props;
+    return items.map(item => {
+      const itemIsAccessible = !_get__default["default"](item, 'internal_location.restricted');
+      const shelfValue = shelfLink ? shelfLink(item, documentDetails) : _get__default["default"](item, 'shelf');
+      return /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Row, {
+        key: item.pid
+      }, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
+        "data-label": "Barcode",
+        className: "document-item-table-itemCell"
+      }, item.barcode), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
+        "data-label": "Shelf",
         className: "document-item-table-itemCell"
-      }, (_item$identifiers = item.identifiers) === null || _item$identifiers === void 0 ? void 0 : (_item$identifiers$fin = _item$identifiers.find(entry => {
-        return entry.scheme === identifier.key;
-      })) === null || _item$identifiers$fin === void 0 ? void 0 : _item$identifiers$fin.value);
-    }), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
-      "data-label": "Status"
-    }, this.statusLabel(item)), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
-      "data-label": "Medium"
-    }, getDisplayVal('ITEMS.mediums', item.medium)), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
-      "data-label": "Restrictions"
-    }, getDisplayVal('ITEMS.circulationRestrictions', item.circulation_restriction))));
+      }, itemIsAccessible ? shelfValue : /*#__PURE__*/React__default["default"].createElement("p", null, "Available on Request")), identifiersToDisplay.map(identifier => {
+        var _item$identifiers, _item$identifiers$fin;
+        return /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
+          key: identifier,
+          "data-label": identifier.text,
+          className: "document-item-table-itemCell"
+        }, itemIsAccessible && ((_item$identifiers = item.identifiers) === null || _item$identifiers === void 0 ? void 0 : (_item$identifiers$fin = _item$identifiers.find(entry => {
+          return entry.scheme === identifier.key;
+        })) === null || _item$identifiers$fin === void 0 ? void 0 : _item$identifiers$fin.value));
+      }), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
+        "data-label": "Status"
+      }, this.statusLabel(item)), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
+        "data-label": "Medium"
+      }, getDisplayVal('ITEMS.mediums', item.medium)), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Cell, {
+        "data-label": "Restrictions"
+      }, getDisplayVal('ITEMS.circulationRestrictions', item.circulation_restriction)));
+    });
   }
 }
 DocumentItemBody.defaultProps = {
@@ -27058,7 +27082,11 @@ class AvailableItems$1 extends React.Component {
       query: '',
       filteredData: null,
       modalOpen: false,
-      checkoutItem: null
+      checkoutItem: null,
+      identifiersToDisplay: invenioConfig.ITEMS.identifiersToDisplay.map(s => ({
+        key: s,
+        text: s
+      }))
     };
   }
   componentDidMount() {
@@ -27067,6 +27095,25 @@ class AvailableItems$1 extends React.Component {
       loan
     } = this.props;
     fetchAvailableItems(loan.metadata.document_pid);
+    this.loadIdentifierTitles();
+  }
+  componentWillUnmount() {
+    if (this.cancellableFetchIdentifierTitles) {
+      this.cancellableFetchIdentifierTitles.cancel();
+    }
+  }
+  async loadIdentifierTitles() {
+    this.cancellableFetchIdentifierTitles = withCancel(fetchIdentifierTitles(invenioConfig.ITEMS.identifiersToDisplay, invenioConfig.VOCABULARIES.item.identifier.scheme));
+    try {
+      let result = await this.cancellableFetchIdentifierTitles.promise;
+      this.setState({
+        identifiersToDisplay: result
+      });
+    } catch (error) {
+      if (error !== 'UNMOUNTED') {
+        console.error('Error fetching identifier titles for items.', error);
+      }
+    }
   }
   assignItemButton(item) {
     const {
@@ -27137,18 +27184,31 @@ class AvailableItems$1 extends React.Component {
       data
     } = this.props;
     const {
-      filteredData
+      filteredData,
+      identifiersToDisplay
     } = this.state;
+    const identifierColumns = identifiersToDisplay.map(identifier => ({
+      title: identifier.text,
+      field: `metadata.identifiers`,
+      formatter: _ref2 => {
+        var _row$metadata$identif;
+        let {
+          row
+        } = _ref2;
+        const entry = (_row$metadata$identif = row.metadata.identifiers) === null || _row$metadata$identif === void 0 ? void 0 : _row$metadata$identif.find(id => id.scheme === identifier.key);
+        return entry === null || entry === void 0 ? void 0 : entry.value;
+      }
+    }));
     const columns = [{
       title: 'PID',
       field: 'metadata.pid'
     }, {
       title: 'Barcode',
       field: 'metadata.barcode',
-      formatter: _ref2 => {
+      formatter: _ref3 => {
         let {
           row
-        } = _ref2;
+        } = _ref3;
         return /*#__PURE__*/React__default["default"].createElement(reactRouterDom.Link, {
           to: BackOfficeRoutes.itemDetailsFor(row.metadata.pid)
         }, row.metadata.barcode);
@@ -27165,7 +27225,7 @@ class AvailableItems$1 extends React.Component {
     }, {
       title: 'Shelf',
       field: 'metadata.shelf'
-    }, {
+    }, ...identifierColumns, {
       title: 'Actions',
       field: '',
       formatter: this.rowActionButton
@@ -28154,15 +28214,20 @@ const LoanDetails = reactRedux.connect(mapStateToProps$K, mapDispatchToProps$z)(
 class _SearchDateRange extends React.Component {
   constructor() {
     super(...arguments);
-    this.onDateChange = newFilter => {
+    this.onDateChange = (field, value) => {
       const {
         currentQueryState,
         updateQueryState
       } = this.props;
-      const filters = currentQueryState.filters;
-      filters.push(newFilter);
+      const updatedFilters = currentQueryState.filters.filter(_ref => {
+        let [name] = _ref;
+        return name !== field;
+      });
+      if (value !== '') {
+        updatedFilters.push([field, value]);
+      }
       return updateQueryState({
-        filters: filters
+        filters: updatedFilters
       });
     };
   }
@@ -28174,8 +28239,8 @@ class _SearchDateRange extends React.Component {
     } = this.props;
     let fromDate = '';
     let toDate = '';
-    filters.forEach(_ref => {
-      let [name, value] = _ref;
+    filters.forEach(_ref2 => {
+      let [name, value] = _ref2;
       if (name === 'loans_from_date') fromDate = value;
       if (name === 'loans_to_date') toDate = value;
     });
@@ -28187,12 +28252,12 @@ class _SearchDateRange extends React.Component {
       maxDate: toDate,
       defaultValue: fromDate,
       placeholder: "From",
-      handleDateChange: value => this.onDateChange(['loans_from_date', value])
+      handleDateChange: value => this.onDateChange('loans_from_date', value)
     })), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Card.Content, null, /*#__PURE__*/React__default["default"].createElement(DatePicker$1, {
       minDate: fromDate,
       defaultValue: toDate,
       placeholder: "To",
-      handleDateChange: value => this.onDateChange(['loans_to_date', value])
+      handleDateChange: value => this.onDateChange('loans_to_date', value)
     })));
   }
 }
@@ -28303,6 +28368,11 @@ const schema$3 = () => {
       physical_location: {
         type: 'string',
         title: 'Physical location'
+      },
+      restricted: {
+        type: 'boolean',
+        title: 'Restricted access (not accessible to patrons)',
+        default: false
       }
     }
   };
@@ -28323,6 +28393,8 @@ const uiSchema$3 = title => {
     }, {
       physical_location: 8,
       notes: 8
+    }, {
+      restricted: 8
     }],
     'custom:root': {
       'custom:formTitle': title
@@ -29392,6 +29464,16 @@ class InternalLocationList$1 extends React.Component {
     }, {
       title: 'Location e-mail',
       field: 'metadata.location.email'
+    }, {
+      title: 'Restricted access',
+      formatter: _ref2 => {
+        let {
+          row
+        } = _ref2;
+        return row.metadata.restricted ? /*#__PURE__*/React__default["default"].createElement("i", {
+          className: "check icon"
+        }) : null;
+      }
     }, {
       title: 'Actions',
       field: '',
@@ -35428,21 +35510,6 @@ class DocumentStats extends React.Component {
 class DocumentItem extends React.Component {
   constructor(props) {
     super(props);
-    this.fetchIdentifiersToDisplayInFrontsideTitles = () => {
-      const query = vocabularyApi.query().withType(invenioConfig.VOCABULARIES.item.identifier.scheme);
-      vocabularyApi.list(query.qs()).then(response => {
-        const identifiersToDisplayInFrontside = this.state.identifiersToDisplayInFrontside.map(identifier => {
-          const vocabEntry = response.data.hits.find(entry => entry.metadata.key === identifier.key);
-          return {
-            ...identifier,
-            text: vocabEntry ? vocabEntry.metadata.text : identifier.text
-          };
-        });
-        this.setState({
-          identifiersToDisplayInFrontside
-        });
-      });
-    };
     this.toggleItems = () => {
       const {
         isShowingAll
@@ -35451,18 +35518,10 @@ class DocumentItem extends React.Component {
         isShowingAll: !isShowingAll
       });
     };
-    const _identifiersToDisplayInFrontside = invenioConfig.ITEMS.identifiersToDisplayInFrontside.map(identifier => ({
-      key: identifier,
-      text: identifier
-    }));
     this.state = {
       isShowingAll: false,
-      itemAmountLimit: 5,
-      identifiersToDisplayInFrontside: _identifiersToDisplayInFrontside
+      itemAmountLimit: 5
     };
-    if (_identifiersToDisplayInFrontside.length > 0) {
-      this.fetchIdentifiersToDisplayInFrontsideTitles();
-    }
   }
   get moreItemsToLoad() {
     const {
@@ -35478,12 +35537,12 @@ class DocumentItem extends React.Component {
       internalLocationName,
       items,
       documentDetails,
-      showTitle
+      showTitle,
+      identifiersToDisplay
     } = this.props;
     const {
       isShowingAll,
-      itemAmountLimit,
-      identifiersToDisplayInFrontside
+      itemAmountLimit
     } = this.state;
     const previewArrayOfItems = items.slice(0, itemAmountLimit);
     const completeArrayOfItems = items;
@@ -35501,14 +35560,14 @@ class DocumentItem extends React.Component {
       id: "DocumentDetails.DocumentItem.TableHeader"
     }, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Row, {
       "data-test": "header"
-    }, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, null, "Barcode"), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, null, "Shelf"), identifiersToDisplayInFrontside.map(identifier => /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, {
+    }, /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, null, "Barcode"), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, null, "Shelf"), identifiersToDisplay.map(identifier => /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, {
       key: identifier.key
     }, identifier.text)), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, null, "Status"), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, null, "Medium"), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.HeaderCell, null, "Loan restriction")))), /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Body, null, /*#__PURE__*/React__default["default"].createElement(Overridable__default["default"], {
       id: "DocumentDetails.DocumentItemTableBody"
     }, /*#__PURE__*/React__default["default"].createElement(DocumentItemBody, {
       items: itemsToShow,
       documentDetails: documentDetails,
-      identifiersToDisplayInFrontside: identifiersToDisplayInFrontside
+      identifiersToDisplay: identifiersToDisplay
     }))), this.moreItemsToLoad && /*#__PURE__*/React__default["default"].createElement(semanticUiReact.Table.Footer, {
       fullWidth: true,
       "data-test": "footer",
@@ -35600,7 +35659,8 @@ class DocumentTabs extends React.Component {
     };
     this.createInternalLocationTables = locationsObject => {
       const {
-        activeInternalLocation
+        activeInternalLocation,
+        identifiersToDisplay
       } = this.state;
       const sortedInternalLocationEntries = this.sortedLocationEntries(Object.entries(locationsObject));
       if (activeInternalLocation) {
@@ -35614,7 +35674,8 @@ class DocumentTabs extends React.Component {
           internalLocationName: internalLocationName,
           items: items,
           documentDetails: this.documentDetails,
-          showTitle: activeInternalLocation !== internalLocationName
+          showTitle: activeInternalLocation !== internalLocationName,
+          identifiersToDisplay: identifiersToDisplay
         });
       }
       return sortedInternalLocationEntries.map(_ref6 => {
@@ -35625,7 +35686,8 @@ class DocumentTabs extends React.Component {
           internalLocationName: internalLocationName,
           items: items,
           documentDetails: this.documentDetails,
-          showTitle: activeInternalLocation !== internalLocationName
+          showTitle: activeInternalLocation !== internalLocationName,
+          identifiersToDisplay: identifiersToDisplay
         });
       });
     };
@@ -35649,9 +35711,34 @@ class DocumentTabs extends React.Component {
     const [firstLocationName] = this.locationEntries[0];
     const [_firstInternalLocationName] = this.firstInternalLocationEntry(firstLocationName);
     this.state = {
-      activeInternalLocation: _firstInternalLocationName
+      activeInternalLocation: _firstInternalLocationName,
+      identifiersToDisplay: invenioConfig.ITEMS.identifiersToDisplay.map(s => ({
+        key: s,
+        text: s
+      }))
     };
   }
+  componentDidMount() {
+    this.loadIdentifierTitles();
+  }
+  componentWillUnmount() {
+    if (this.cancellableFetchIdentifierTitles) {
+      this.cancellableFetchIdentifierTitles.cancel();
+    }
+  }
+  async loadIdentifierTitles() {
+    this.cancellableFetchIdentifierTitles = withCancel(fetchIdentifierTitles(invenioConfig.ITEMS.identifiersToDisplay, invenioConfig.VOCABULARIES.item.identifier.scheme));
+    try {
+      let result = await this.cancellableFetchIdentifierTitles.promise;
+      this.setState({
+        identifiersToDisplay: result
+      });
+    } catch (error) {
+      if (error !== 'UNMOUNTED') {
+        console.error('Error fetching identifier titles for items.', error);
+      }
+    }
+  }
   get locations() {
     const {
       locationsObject