refactor: hide button for shadow users

folio-org · Oct 10, 2023 · 71b105f · 71b105f
1 parent 42680c2
commit 71b105f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 56 deletions.
diff --git a/src/components/LostItemsLink/LostItemsLink.js b/src/components/LostItemsLink/LostItemsLink.js
@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 
@@ -14,13 +13,9 @@ import {
   LOST_ITEM_STATUSES,
 } from '../../views/LostItems/constants';
 
-const LostItemsLink = ({ disabled }) => {
+const LostItemsLink = () => {
   const history = useHistory();
 
-  if (disabled) {
-    return null;
-  }
-
   return (
     <IfPermission perm="ui-users.lost-items.requiring-actual-cost">
       <Button
@@ -43,12 +38,4 @@ const LostItemsLink = ({ disabled }) => {
   );
 };
 
-LostItemsLink.propTypes = {
-  disabled: PropTypes.bool,
-};
-
-LostItemsLink.defaultProps = {
-  disabled: false,
-};
-
 export default LostItemsLink;
diff --git a/src/components/LostItemsLink/LostItemsLink.test.js b/src/components/LostItemsLink/LostItemsLink.test.js
@@ -23,33 +23,30 @@ const labelIds = {
   lostItems: 'ui-users.actionMenu.lostItems',
 };
 
-const renderLostItemsLink = ({ disabled = false }) => {
-  const history = createMemoryHistory();
-  render(
-    <Router history={history}>
-      <LostItemsLink disabled={disabled} />
-    </Router>
-  );
-};
-
 describe('LostItemsLink', () => {
+  beforeEach(() => {
+    const history = createMemoryHistory();
+
+    render(
+      <Router history={history}>
+        <LostItemsLink />
+      </Router>
+    );
+  });
+
   it('should be rendered', () => {
-    renderLostItemsLink({ disabled: false });
     const lostItemsLink = screen.getByTestId(testIds.lostItemsLink);
 
     expect(lostItemsLink).toBeInTheDocument();
   });
 
   it('should have correct label', () => {
-    renderLostItemsLink({ disabled: false });
     const lostItemsLabel = screen.getByText(labelIds.lostItems);
 
     expect(lostItemsLabel).toBeInTheDocument();
   });
 
   it('should trigger "Button" with correct props', () => {
-    renderLostItemsLink({ disabled: false });
-
     const expectedProps = {
       buttonStyle: 'dropdownItem',
       to: {
@@ -64,11 +61,4 @@ describe('LostItemsLink', () => {
 
     expect(Button).toHaveBeenCalledWith(expect.objectContaining(expectedProps), {});
   });
-
-  it('should button be disabled', () => {
-    renderLostItemsLink({ disabled: true });
-    const lostItemsLink = screen.queryByRole('button');
-
-    expect(lostItemsLink).toBeNull();
-  });
 });
diff --git a/src/components/RequestFeeFineBlockButtons/RequestFeeFineBlockButtons.js b/src/components/RequestFeeFineBlockButtons/RequestFeeFineBlockButtons.js
@@ -17,7 +17,6 @@ class RequestFeeFineBlockButtons extends React.Component {
     onToggle: PropTypes.func,
     userId: PropTypes.string,
     location: PropTypes.object,
-    disabled: PropTypes.bool,
   };
 
   render() {
@@ -26,14 +25,9 @@ class RequestFeeFineBlockButtons extends React.Component {
       onToggle,
       userId,
       location,
-      disabled,
     } = this.props;
     const createRequestUrl = getRequestUrl(barcode, userId);
 
-    if (disabled) {
-      return null;
-    }
-
     return (
       <div data-test-actions-menu>
         <IfPermission perm="ui-requests.all">

diff --git a/src/components/RequestFeeFineBlockButtons/RequestFeeFineBlockButtons.test.js b/src/components/RequestFeeFineBlockButtons/RequestFeeFineBlockButtons.test.js
@@ -44,13 +44,6 @@ describe('RequestFeeFineBlockButtons', () => {
       expect(screen.queryByText('ui-users.accounts.chargeManual')).toBeInTheDocument();
       expect(screen.queryByText('ui-users.blocks.buttons.add')).toBeInTheDocument();
     });
-
-    it('should createRequest button to be disabled', () => {
-      renderRequestFeeFineBlockButtons({ disabled: true });
-      const buttonElement = screen.queryByRole('button');
-
-      expect(buttonElement).toBeNull();
-    });
   });
 
   describe('without ui-requests.all permission', () => {

diff --git a/src/views/UserDetail/UserDetail.js b/src/views/UserDetail/UserDetail.js
@@ -446,22 +446,24 @@ class UserDetail extends React.Component {
     if (showActionMenu) {
       return (
         <>
-          <IfInterface name="feesfines">
-            <RequestFeeFineBlockButtons
-              barcode={barcode}
-              onToggle={onToggle}
-              userId={this.props.match.params.id}
-              disabled={isShadowUser}
-            />
-          </IfInterface>
+          {!isShadowUser && (
+            <IfInterface name="feesfines">
+              <RequestFeeFineBlockButtons
+                barcode={barcode}
+                onToggle={onToggle}
+                userId={this.props.match.params.id}
+                disabled={isShadowUser}
+              />
+            </IfInterface>
+          )}
           <ActionMenuEditButton
             id={this.props.match.params.id}
             suppressList={this.props.resources.suppressEdit}
             onToggle={onToggle}
             goToEdit={this.goToEdit}
             editButton={this.editButton}
           />
-          <LostItemsLink disabled={isShadowUser} />
+          {!isShadowUser && <LostItemsLink />}
           <IfInterface name="feesfines">
             <ExportFeesFinesReportButton
               feesFinesReportData={feesFinesReportData}