Merge pull request #417 from folio-org/UITEN-292

UITEN-292: Change visibility rules for routing service points

CHANGELOG.md

@@ -11,6 +11,9 @@
 * [UITEN-278] (https://issues.folio.org/browse/UITEN-278) Reading Room Access (settings): Create new reading room.
 * [UITEN-282] (https://issues.folio.org/browse/UITEN-282) Reading Room Access (settings): Update reading room.
 * [UITEN-283] (https://issues.folio.org/browse/UITEN-283) Reading Room Access (settings): Delete reading room.
+* [UITEN-281](https://folio-org.atlassian.net/browse/UITEN-281) Add Routing service point option to Service point page(ECS only).
+* [UITEN-285](https://folio-org.atlassian.net/browse/UITEN-285) Disable edit of Routing service point field (ECS only).
+* [UITEN-294](https://folio-org.atlassian.net/browse/UITEN-294) Show routing service points on settings -> tenant -> servicePoints.
 * [UITEN-290] (https://issues.folio.org/browse/UITEN-290) Make dependency on mod-reading-rooms optional.
 * [UITEN-298] (https://issues.folio.org/browse/UITEN-298) Update translation ids for reading room.
 * [UITEN-301] (https://issues.folio.org/browse/UITEN-301) Display Reading room access in alphabetical order on settings page.
@@ -20,6 +23,7 @@
 * [UITEN-281](https://folio-org.atlassian.net/browse/UITEN-281) Add Routing service point option to Service point page(ECS only).
 * [UITEN-285](https://folio-org.atlassian.net/browse/UITEN-285) Disable edit of Routing service point field (ECS only).
 * [UITEN-294](https://folio-org.atlassian.net/browse/UITEN-294) Show routing service points on settings -> tenant -> servicePoints.
+* [UITEN-292](https://folio-org.atlassian.net/browse/UITEN-292) Change visibility rules for routing service points.
 
 ## [8.1.0](https://github.com/folio-org/ui-tenant-settings/tree/v8.1.0)(2024-03-19)
 [Full Changelog](https://github.com/folio-org/ui-tenant-settings/compare/v8.0.0...v8.1.0)

package.json

@@ -194,7 +194,8 @@
           "inventory-storage.location-units.libraries.collection.get",
           "inventory-storage.service-points.collection.get",
           "inventory-storage.service-points.item.get",
-          "circulation-storage.staff-slips.collection.get"
+          "circulation-storage.staff-slips.collection.get",
+          "circulation.settings.collection.get"
         ],
         "visible": false
       },
@@ -284,6 +285,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-intl": "^6.4.4",
+    "react-query": "^3.6.0",
     "react-redux": "^7.2.0",
     "react-router-dom": "^5.2.0",
     "redux": "^4.0.0",

src/hooks/index.js

@@ -0,0 +1 @@
+export { default as useCirculationSettingsEcsTlrFeature } from './useCirculationSettingsEcsTlrFeature';

src/hooks/useCirculationSettingsEcsTlrFeature/index.js

@@ -0,0 +1 @@
+export { default } from './useCirculationSettingsEcsTlrFeature';

src/hooks/useCirculationSettingsEcsTlrFeature/useCirculationSettingsEcsTlrFeature.js

@@ -0,0 +1,27 @@
+import { useQuery } from 'react-query';
+
+import { useNamespace, useOkapiKy } from '@folio/stripes/core';
+
+import { getEcsTlrFeature } from '../../settings/ServicePoints/utils';
+
+const useCirculationSettingsEcsTlrFeature = (enabled) => {
+  const ky = useOkapiKy();
+  const [namespace] = useNamespace({ key: 'circulationSettingsEcsTlrFeature' });
+  const searchParams = {
+    query: 'name==ecsTlrFeature',
+  };
+  const { isLoading, data, refetch, isFetching } = useQuery(
+    [namespace],
+    () => ky.get('circulation/settings', { searchParams }).json(),
+    { enabled },
+  );
+
+  return ({
+    titleLevelRequestsFeatureEnabled: getEcsTlrFeature(data?.circulationSettings),
+    isLoading,
+    isFetching,
+    refetch,
+  });
+};
+
+export default useCirculationSettingsEcsTlrFeature;

src/settings/ServicePoints/ServicePointDetail.js

@@ -21,11 +21,11 @@ class ServicePointDetail extends React.Component {
     intl: PropTypes.object,
     stripes: PropTypes.shape({
       connect: PropTypes.func.isRequired,
-      hasInterface: PropTypes.func.isRequired,
     }).isRequired,
     initialValues: PropTypes.object,
     parentResources: PropTypes.object,
-    parentMutator: PropTypes.object
+    parentMutator: PropTypes.object,
+    titleLevelRequestsFeatureEnabled: PropTypes.bool,
   };
 
   constructor(props) {
@@ -83,7 +83,7 @@ class ServicePointDetail extends React.Component {
   }
 
   render() {
-    const { initialValues, parentResources, stripes } = this.props;
+    const { initialValues, parentResources, titleLevelRequestsFeatureEnabled } = this.props;
     const locations = (parentResources.locations || {}).records || [];
     const staffSlips = orderBy((parentResources.staffSlips || {}).records || [], 'name');
     const servicePoint = initialValues;
@@ -136,7 +136,7 @@ class ServicePointDetail extends React.Component {
                 />
               </Col>
             </Row>
-            {isEcsRequestRoutingVisible(stripes) && (
+            {isEcsRequestRoutingVisible(titleLevelRequestsFeatureEnabled) && (
               <Row>
                 <Col xs={8}>
                   <KeyValue label={<FormattedMessage id="ui-tenant-settings.settings.servicePoints.ecsRequestRouting" />}>
@@ -148,7 +148,7 @@ class ServicePointDetail extends React.Component {
                 </Col>
               </Row>
             )}
-            {isEcsRequestRoutingAssociatedFieldsVisible(stripes, servicePoint.ecsRequestRouting) && (
+            {isEcsRequestRoutingAssociatedFieldsVisible(titleLevelRequestsFeatureEnabled, servicePoint.ecsRequestRouting) && (
               <>
                 <Row>
                   <Col xs={8}>
@@ -196,7 +196,7 @@ class ServicePointDetail extends React.Component {
             )}
           </Accordion>
 
-          {isEcsRequestRoutingAssociatedFieldsVisible(stripes, servicePoint.ecsRequestRouting) && (
+          {isEcsRequestRoutingAssociatedFieldsVisible(titleLevelRequestsFeatureEnabled, servicePoint.ecsRequestRouting) && (
             <LocationList
               locations={locations}
               servicePoint={servicePoint}

src/settings/ServicePoints/ServicePointForm.js

@@ -43,6 +43,10 @@ import {
   isEcsRequestRoutingAssociatedFieldsVisible,
 } from './utils';
 
+import {
+  useCirculationSettingsEcsTlrFeature,
+} from '../../hooks';
+
 import {
   shortTermExpiryPeriod,
   shortTermClosedDateManagementMenu,
@@ -75,6 +79,7 @@ const ServicePointForm = ({
   handleSubmit,
   onCancel,
 }) => {
+  const { titleLevelRequestsFeatureEnabled } = useCirculationSettingsEcsTlrFeature(true);
   const [sections, setSections] = useState({
     generalSection: true,
     locationSection: true
@@ -302,7 +307,7 @@ const ServicePointForm = ({
                 />
               </Col>
             </Row>
-            {isEcsRequestRoutingVisible(stripes) && (
+            {isEcsRequestRoutingVisible(titleLevelRequestsFeatureEnabled) && (
               <Row>
                 <Col xs={2}>
                   <Field
@@ -317,7 +322,7 @@ const ServicePointForm = ({
                 </Col>
               </Row>
             )}
-            {isEcsRequestRoutingAssociatedFieldsVisible(stripes, formValues.ecsRequestRouting) && (
+            {isEcsRequestRoutingAssociatedFieldsVisible(titleLevelRequestsFeatureEnabled, formValues.ecsRequestRouting) && (
               <>
                 <Row>
                   <Col xs={4}>
@@ -376,7 +381,7 @@ const ServicePointForm = ({
               </>
             )}
           </Accordion>
-          {isEcsRequestRoutingAssociatedFieldsVisible(stripes, formValues.ecsRequestRouting) && (
+          {isEcsRequestRoutingAssociatedFieldsVisible(titleLevelRequestsFeatureEnabled, formValues.ecsRequestRouting) && (
             <LocationList
               locations={locations}
               servicePoint={servicePoint}
@@ -407,7 +412,6 @@ ServicePointForm.propTypes = {
   }).isRequired,
   submitting: PropTypes.bool,
   stripes: PropTypes.shape({
-    hasInterface: PropTypes.func.isRequired,
     hasPerm: PropTypes.func.isRequired,
   }).isRequired,
   form: PropTypes.object.isRequired,

src/settings/ServicePoints/ServicePointFormContainer.test.js

@@ -12,6 +12,10 @@ import {
 import ServicePointFormContainer from './ServicePointFormContainer';
 import { parentMutatorMock, parentResourcesMock } from './test/setup';
 
+jest.mock('../../hooks', () => ({
+  useCirculationSettingsEcsTlrFeature: jest.fn().mockReturnValue({ titleLevelRequestsFeatureEnabled: true }),
+}));
+
 const onSave = jest.fn();
 const staffSlips = [true, true, true, true];
 

src/settings/ServicePoints/ServicePointManager.js

@@ -7,6 +7,7 @@ import { TitleManager } from '@folio/stripes/core';
 import { injectIntl } from 'react-intl';
 import ServicePointDetail from './ServicePointDetail';
 import ServicePointFormContainer from './ServicePointFormContainer';
+import { getEcsTlrFeature } from './utils';
 
 class ServicePointManager extends React.Component {
   static manifest = Object.freeze({
@@ -49,6 +50,11 @@ class ServicePointManager extends React.Component {
         limit: '1000',
       },
     },
+    settings: {
+      type: 'okapi',
+      path: 'circulation/settings?query=(name==ecsTlrFeature)',
+      records: 'circulationSettings',
+    },
   });
 
   static propTypes = {
@@ -57,6 +63,9 @@ class ServicePointManager extends React.Component {
       entries: PropTypes.shape({
         records: PropTypes.arrayOf(PropTypes.object),
       }),
+      settings: PropTypes.shape({
+        records: PropTypes.arrayOf(PropTypes.object),
+      }),
       staffSlips: PropTypes.object,
     }).isRequired,
     mutator: PropTypes.shape({
@@ -87,6 +96,8 @@ class ServicePointManager extends React.Component {
   }
 
   render() {
+    const { resources } = this.props;
+    const titleLevelRequestsFeatureEnabled = getEcsTlrFeature(resources?.settings?.records);
     let entryList = sortBy((this.props.resources.entries || {}).records || [], ['name']);
     entryList = entryList.map(item => {
       item.pickupLocation = item.pickupLocation || false;
@@ -117,6 +128,7 @@ class ServicePointManager extends React.Component {
           nameKey="name"
           editable={isEditable}
           permissions={permissions}
+          titleLevelRequestsFeatureEnabled={titleLevelRequestsFeatureEnabled}
         />
       </TitleManager>
     );

src/settings/ServicePoints/utils.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
+import { get } from 'lodash';
 
 export const validateServicePointForm = (values) => {
   const errors = {};
@@ -54,10 +55,14 @@ export const getUniquenessValidation = (field, mutator) => {
   };
 };
 
-export const isEcsRequestRoutingVisible = (stripes) => (
-  stripes.hasInterface('consortia') && stripes.hasInterface('ecs-tlr')
+export const isEcsRequestRoutingVisible = (titleLevelRequestsFeatureEnabled) => (
+  !!titleLevelRequestsFeatureEnabled
 );
 
-export const isEcsRequestRoutingAssociatedFieldsVisible = (stripes, ecsRequestRouting) => (
-  (isEcsRequestRoutingVisible(stripes) && !ecsRequestRouting) || !isEcsRequestRoutingVisible(stripes)
+export const isEcsRequestRoutingAssociatedFieldsVisible = (titleLevelRequestsFeatureEnabled, ecsRequestRouting) => (
+  (isEcsRequestRoutingVisible(titleLevelRequestsFeatureEnabled) && !ecsRequestRouting) || !isEcsRequestRoutingVisible(titleLevelRequestsFeatureEnabled)
+);
+
+export const getEcsTlrFeature = (data = []) => (
+  get(data, '[0].value.enabled', false)
 );