folio-org · Dmitriy-Litvinenko · Nov 16, 2023 · Nov 7, 2023 · Nov 15, 2023 · Nov 16, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Hide all actions except "Cancel Request" in Action menu (Lending library). Refs UIREQ-1032.
 * Hide all actions except "Cancel Request" in Action menu and DCB item links (Borrowing library). Refs UIREQ-1034.
 * Hide all actions except "Cancel Request" in Action menu and DCB item links (Pickup library). Refs UIREQ-1035.
+* Request Action - Create new option Print search slips. Refs UIREQ-1039.
 
 ## [9.0.0](https://github.com/folio-org/ui-requests/tree/v9.0.0) (2023-10-12)
 [Full Changelog](https://github.com/folio-org/ui-requests/compare/v8.0.2...v9.0.0)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@folio/requests",
-  "version": "9.0.0",
+  "version": "9.1.0",
   "description": "Requests manager",
   "repository": "folio-org/ui-requests",
   "publishConfig": {
@@ -118,6 +118,7 @@
           "circulation-storage.requests.item.post",
           "circulation-storage.request-preferences.collection.get",
           "circulation.pick-slips.get",
+          "circulation.search-slips.get",
           "inventory-storage.locations.item.get"
         ],
         "visible": true

diff --git a/src/components/PrintContent/PrintContent.js b/src/components/PrintContent/PrintContent.js
@@ -7,12 +7,17 @@ import { buildTemplate } from '../../utils';
 
 import css from './PrintContent.css';
 
-const PrintContent = forwardRef(({ dataSource, template }, ref) => {
+const PrintContent = forwardRef(({
+  dataSource,
+  template,
+  id,
+}, ref) => {
   const templateFn = useMemo(() => buildTemplate(template), [template]);
 
   return (
     <div
-      data-testid="printContent"
+      id={id}
+      data-testid={id}
       className={css.hiddenContent}
     >
       <div ref={ref}>
@@ -33,8 +38,13 @@ const PrintContent = forwardRef(({ dataSource, template }, ref) => {
 });
 
 PrintContent.propTypes = {
+  id: PropTypes.string,
   dataSource: PropTypes.arrayOf(PropTypes.object).isRequired,
   template: PropTypes.string.isRequired,
 };
 
+PrintContent.defaultProps = {
+  id: 'printContent',
+};
+
 export default memo(PrintContent, isEqual);
diff --git a/src/components/PrintContent/PrintContent.test.js b/src/components/PrintContent/PrintContent.test.js
@@ -28,6 +28,7 @@ describe('PrintContent', () => {
         },
       }
     ],
+    id: testIds.printContent,
   };
 
   afterEach(() => {

diff --git a/src/constants.js b/src/constants.js
@@ -250,7 +250,10 @@ export const requestLevelFilters = [
   { label: 'ui-requests.filters.requestLevel.title', value: REQUEST_LEVEL_TYPES.TITLE },
 ];
 
-export const pickSlipType = 'pick slip';
+export const SLIPS_TYPE = {
+  PICK_SLIP: 'Pick slip',
+  SEARCH_SLIP_HOLD_REQUESTS: 'Search slip (Hold requests)',
+};
 
 export const DOMAIN_NAME = 'requests';
 

diff --git a/src/routes/RequestsRoute.js b/src/routes/RequestsRoute.js
@@ -48,7 +48,7 @@ import {
   reportHeaders,
   fulfillmentTypes,
   expiredHoldsReportHeaders,
-  pickSlipType,
+  SLIPS_TYPE,
   createModes,
   requestStatusesTranslations,
   requestTypesTranslations,
@@ -93,6 +93,15 @@ const INITIAL_RESULT_COUNT = 30;
 const RESULT_COUNT_INCREMENT = 30;
 export const DEFAULT_FORMATTER_VALUE = '';
 
+export const getPrintHoldRequestsEnabled = (printHoldRequests) => {
+  const value = printHoldRequests.records[0]?.value;
+  const {
+    printHoldRequestsEnabled = false,
+  } = value ? JSON.parse(value) : {};
+
+  return printHoldRequestsEnabled;
+};
+
 export const urls = {
   user: (value, idType) => {
     const query = stringify({ query: `(${idType}=="${value}")` });
@@ -392,9 +401,22 @@ class RequestsRoute extends React.Component {
       type: 'okapi',
       records: 'pickSlips',
       path: 'circulation/pick-slips/%{currentServicePoint.id}',
-      fetch: true,
       throwErrors: false,
     },
+    searchSlips: {
+      type: 'okapi',
+      records: 'searchSlips',
+      path: 'circulation/search-slips/%{currentServicePoint.id}',
+      throwErrors: false,
+    },
+    printHoldRequests: {
+      type: 'okapi',
+      records: 'configs',
+      path: 'configurations/entries',
+      params: {
+        query: '(module==SETTINGS and configName==PRINT_HOLD_REQUESTS)',
+      },
+    },
     currentServicePoint: {},
     tags: {
       throwErrors: false,
@@ -456,6 +478,9 @@ class RequestsRoute extends React.Component {
       pickSlips: PropTypes.shape({
         GET: PropTypes.func,
       }).isRequired,
+      searchSlips: PropTypes.shape({
+        GET: PropTypes.func,
+      }).isRequired,
       currentServicePoint: PropTypes.shape({
         update: PropTypes.func.isRequired,
       }).isRequired,
@@ -486,10 +511,17 @@ class RequestsRoute extends React.Component {
         records: PropTypes.arrayOf(PropTypes.object).isRequired,
         isPending: PropTypes.bool,
       }),
+      searchSlips: PropTypes.shape({
+        records: PropTypes.arrayOf(PropTypes.object).isRequired,
+        isPending: PropTypes.bool,
+      }),
       configs: PropTypes.shape({
         hasLoaded: PropTypes.bool.isRequired,
         records: PropTypes.arrayOf(PropTypes.object).isRequired,
       }),
+      printHoldRequests: PropTypes.shape({
+        records: PropTypes.arrayOf(PropTypes.object).isRequired,
+      }),
     }).isRequired,
     stripes: PropTypes.shape({
       connect: PropTypes.func.isRequired,
@@ -571,7 +603,8 @@ class RequestsRoute extends React.Component {
       createTitleLevelRequestsByDefault,
     };
 
-    this.printContentRef = React.createRef();
+    this.pickSlipsPrintContentRef = React.createRef();
+    this.searchSlipsPrintContentRef = React.createRef();
     this.paneTitleRef = React.createRef();
   }
 
@@ -1037,10 +1070,12 @@ class RequestsRoute extends React.Component {
     this.setState({ errorModalData: {} });
   };
 
-  getPrintTemplate() {
+  getPrintTemplate(slipType) {
     const staffSlips = get(this.props.resources, 'staffSlips.records', []);
-    const pickSlip = staffSlips.find(slip => slip.name.toLowerCase() === pickSlipType);
-    return get(pickSlip, 'template', '');
+    const slipTypeInLowerCase = slipType.toLowerCase();
+    const slipTemplate = staffSlips.find(slip => slip.name.toLowerCase() === slipTypeInLowerCase);
+
+    return get(slipTemplate, 'template', '');
   }
 
   handleFilterChange = ({ name, values }) => {
@@ -1097,6 +1132,16 @@ class RequestsRoute extends React.Component {
     );
   };
 
+  onBeforeGetContentForPrintButton = (onToggle) => (
+    new Promise(resolve => {
+      this.context.sendCallout({ message: <FormattedMessage id="ui-requests.printInProgress" /> });
+      onToggle();
+      // without the timeout the printing process starts right away
+      // and the callout and onToggle above are blocked
+      setTimeout(() => resolve(), 1000);
+    })
+  );
+
   render() {
     const {
       resources,
@@ -1121,8 +1166,10 @@ class RequestsRoute extends React.Component {
       holdsShelfReportPending,
       createTitleLevelRequestsByDefault,
     } = this.state;
+    const isPrintHoldRequestsEnabled = getPrintHoldRequestsEnabled(resources.printHoldRequests);
     const { name: servicePointName } = this.getCurrentServicePointInfo();
     const pickSlips = get(resources, 'pickSlips.records', []);
+    const searchSlips = get(resources, 'searchSlips.records', []);
     const patronGroups = get(resources, 'patronGroups.records', []);
     const addressTypes = get(resources, 'addressTypes.records', []);
     const servicePoints = get(resources, 'servicePoints.records', []);
@@ -1135,11 +1182,15 @@ class RequestsRoute extends React.Component {
       createTitleLevelRequest: createTitleLevelRequestsByDefault,
     };
 
-    const pickSlipsArePending = resources?.pickSlips?.isPending;
+    const isPickSlipsArePending = resources?.pickSlips?.isPending;
+    const isSearchSlipsArePending = resources?.searchSlips?.isPending;
     const requestsEmpty = isEmpty(requests);
-    const pickSlipsEmpty = isEmpty(pickSlips);
-    const printTemplate = this.getPrintTemplate();
-    const pickSlipsData = convertToSlipData(pickSlips, intl, timezone, locale);
+    const isPickSlipsEmpty = isEmpty(pickSlips);
+    const isSearchSlipsEmpty = isEmpty(searchSlips);
+    const pickSlipsPrintTemplate = this.getPrintTemplate(SLIPS_TYPE.PICK_SLIP);
+    const searchSlipsPrintTemplate = this.getPrintTemplate(SLIPS_TYPE.SEARCH_SLIP_HOLD_REQUESTS);
+    const pickSlipsData = convertToSlipData(pickSlips, intl, timezone, locale, SLIPS_TYPE.PICK_SLIP);
+    const searchSlipsData = convertToSlipData(searchSlips, intl, timezone, locale, SLIPS_TYPE.SEARCH_SLIP_HOLD_REQUESTS);
     const resultsFormatter = getListFormatter(this.getRowURL, this.setURL);
 
     const actionMenu = ({ onToggle, renderColumnsMenu }) => (
@@ -1173,7 +1224,7 @@ class RequestsRoute extends React.Component {
             </Button>
           }
           {
-            pickSlipsArePending ?
+            isPickSlipsArePending ?
               <LoadingButton>
                 <FormattedMessage id="ui-requests.pickSlipsLoading" />
               </LoadingButton> :
@@ -1196,18 +1247,10 @@ class RequestsRoute extends React.Component {
                 <PrintButton
                   buttonStyle="dropdownItem"
                   id="printPickSlipsBtn"
-                  disabled={pickSlipsEmpty}
-                  template={printTemplate}
-                  contentRef={this.printContentRef}
-                  onBeforeGetContent={
-                    () => new Promise(resolve => {
-                      this.context.sendCallout({ message: <FormattedMessage id="ui-requests.printInProgress" /> });
-                      onToggle();
-                      // without the timeout the printing process starts right away
-                      // and the callout and onToggle above are blocked
-                      setTimeout(() => resolve(), 1000);
-                    })
-                  }
+                  disabled={isPickSlipsEmpty}
+                  template={pickSlipsPrintTemplate}
+                  contentRef={this.pickSlipsPrintContentRef}
+                  onBeforeGetContent={() => this.onBeforeGetContentForPrintButton(onToggle)}
                 >
                   <FormattedMessage
                     id="ui-requests.printPickSlips"
@@ -1216,6 +1259,30 @@ class RequestsRoute extends React.Component {
                 </PrintButton>
               </>
           }
+          {
+            isPrintHoldRequestsEnabled &&
+            <>
+              {
+                isSearchSlipsArePending ?
+                  <LoadingButton>
+                    <FormattedMessage id="ui-requests.searchSlipsLoading" />
+                  </LoadingButton> :
+                  <PrintButton
+                    buttonStyle="dropdownItem"
+                    id="printSearchSlipsBtn"
+                    disabled={isSearchSlipsEmpty}
+                    template={searchSlipsPrintTemplate}
+                    contentRef={this.searchSlipsPrintContentRef}
+                    onBeforeGetContent={() => this.onBeforeGetContentForPrintButton(onToggle)}
+                  >
+                    <FormattedMessage
+                      id="ui-requests.printSearchSlips"
+                      values={{ sp: servicePointName }}
+                    />
+                  </PrintButton>
+              }
+            </>
+          }
         </MenuSection>
         {renderColumnsMenu}
       </>
@@ -1314,10 +1381,20 @@ class RequestsRoute extends React.Component {
             />
           </div>
           <PrintContent
-            ref={this.printContentRef}
-            template={printTemplate}
+            printContentTestId="pickSlipsPrintTemplate"
+            ref={this.pickSlipsPrintContentRef}
+            template={pickSlipsPrintTemplate}
             dataSource={pickSlipsData}
           />
+          {
+            isPrintHoldRequestsEnabled &&
+            <PrintContent
+              printContentTestId="searchSlipsPrintTemplate"
+              ref={this.searchSlipsPrintContentRef}
+              template={searchSlipsPrintTemplate}
+              dataSource={searchSlipsData}
+            />
+          }
         </>
       </RequestsRouteShortcutsWrapper>
     );
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ describe('PrintContent', () => { @@
             },
           }
         ],
+        id: testIds.printContent,
       };
       afterEach(() => {
@@ Expand Down @@