overriden: DocumentItemBody: Render call number for blank shelf

ui/src/overridden/frontsite/Document/DocumentDetails/DocumentItemBody.js

@@ -1,30 +1,48 @@
+import React from "react";
 import {
   DocumentItemBody,
   invenioConfig,
+  InfoPopup,
 } from "@inveniosoftware/react-invenio-app-ils";
 import _get from "lodash/get";
+import _isEmpty from "lodash/isEmpty";
 import { parametrize } from "react-overridable";
 import { renderCallNumber, shelfLinkComponent } from "../../../utils";
 
 function renderShelflink(item, documentDetails) {
   const itemStatus = _get(item, "circulation.state");
 
-  // If item is on loan, don't hyperlink the shelf
-  const cannotCirculate =
-    invenioConfig.CIRCULATION.loanActiveStates.includes(itemStatus);
-  const itemOnShelf = ["CAN_CIRCULATE", "FOR_REFERENCE_ONLY"].includes(
+  // If item is not on loan, hyperlink the shelf
+  const canCirculateItem =
+    !invenioConfig.CIRCULATION.loanActiveStates.includes(itemStatus);
+  const itemIsOnShelf = ["CAN_CIRCULATE", "FOR_REFERENCE_ONLY"].includes(
     _get(item, "status")
   );
 
   const shelfNumber = _get(item, "shelf");
   const title = _get(documentDetails, "metadata.title");
-  const callNumber = renderCallNumber(item);
+  var callNumber = renderCallNumber(item);
 
   const itemShelf =
-    cannotCirculate && itemOnShelf
-      ? shelfNumber
-      : shelfLinkComponent(shelfNumber, title, callNumber);
-  return itemShelf;
+    canCirculateItem && itemIsOnShelf && !_isEmpty(shelfNumber)
+      ? shelfLinkComponent(shelfNumber, title, callNumber)
+      : shelfNumber;
+
+  if (_isEmpty(shelfNumber)) {
+    // If shelfNumber is empty, show info popup regardless of availability
+    callNumber = (
+      <InfoPopup message="Please request online or ask at the Library desk.">
+        {" "}
+        {callNumber}
+      </InfoPopup>
+    );
+  }
+
+  return (
+    <>
+      {itemShelf} {callNumber}
+    </>
+  );
 }
 
 export const DocumentItemBodyTable = parametrize(DocumentItemBody, {

ui/src/overridden/utils.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { InfoPopup, invenioConfig } from "@inveniosoftware/react-invenio-app-ils";
+import { invenioConfig } from "@inveniosoftware/react-invenio-app-ils";
 import { Icon } from "semantic-ui-react";
 import _get from "lodash/get";
 
@@ -47,18 +47,11 @@ export const shelfLinkComponent = (
   const linkToShelf = shelfLink(shelfNumber, {
     popupContent: { "Title": title, "Call number": callNumber },
   });
-  return shelfNumber ? (
-    <>
-      <a href={linkToShelf} target="_blank" rel="noreferrer">
-        <Icon name={iconName} />
-        {shelfNumber}
-      </a>{" "}
-      {callNumber}
-    </>
-  ) : (
-    <InfoPopup message="Please request online or ask at the Library desk.">
-      {callNumber}
-    </InfoPopup>
+  return (
+    <a href={linkToShelf} target="_blank" rel="noreferrer">
+      <Icon name={iconName} />
+      {shelfNumber}
+    </a>
   );
 };