UIU-3114 - refine code

folio-org · May 8, 2024 · 02b0819 · 02b0819
1 parent c4b5c42
commit 02b0819
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 21 deletions.
diff --git a/src/components/UserDetailSections/ReadingRoomAccess/ReadingRoomAccess.js b/src/components/UserDetailSections/ReadingRoomAccess/ReadingRoomAccess.js
@@ -10,13 +10,11 @@ import {
   FormattedUTCDate,
   Headline,
   MultiColumnList,
-  NoValue,
   SearchField,
 } from '@folio/stripes/components';
-import { ViewMetaData } from '@folio/stripes/smart-components';
 
-import { READING_ROOM_ACCESS } from '../../../constants';
 import { rraColumns } from './constant';
+import { getFormatter } from './getFormatter';
 import css from './ReadingRoomAccess.css';
 
 const ReadingRoomAccess = (props) => {
@@ -86,23 +84,6 @@ const ReadingRoomAccess = (props) => {
     [rraColumns.NOTES]: <FormattedMessage id="ui-users.readingRoom.note" />,
     [rraColumns.ID]: <FormattedMessage id="ui-users.readingRoom.lastUpdated" />,
   };
-  const formatter = {
-    [rraColumns.ACCESS]: (rra) => <FormattedMessage id={READING_ROOM_ACCESS[rra.access]} />,
-    [rraColumns.READING_ROOM_NAME]: (rra) => rra.readingRoomName,
-    [rraColumns.NOTES]: rra => rra.notes,
-    [rraColumns.ID]: rra => (
-      rra?.metadata?.updatedDate ? (
-        <ViewMetaData
-          metadata={rra.metadata}
-        >
-          {
-            (updater) => lastUpdatedDetails(updater?.lastUpdatedBy, rra.metadata.updatedDate)
-          }
-        </ViewMetaData>
-      ) :
-        <NoValue />
-    )
-  };
 
   return (
     <Accordion
@@ -132,7 +113,7 @@ const ReadingRoomAccess = (props) => {
         contentData={filteredRRA}
         columnMapping={columnMapping}
         visibleColumns={visibleColumns}
-        formatter={formatter}
+        formatter={getFormatter(lastUpdatedDetails)}
       />
     </Accordion>
   );

diff --git a/src/components/UserDetailSections/ReadingRoomAccess/getFormatter.js b/src/components/UserDetailSections/ReadingRoomAccess/getFormatter.js
@@ -0,0 +1,30 @@
+/* eslint-disable import/prefer-default-export */
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+
+import { ViewMetaData } from '@folio/stripes/smart-components';
+import { NoValue } from '@folio/stripes/components';
+
+import { READING_ROOM_ACCESS } from '../../../constants';
+import { rraColumns } from './constant';
+
+export const getFormatter = (lastUpdatedDetails) => ({
+  [rraColumns.ACCESS]: Object.assign(
+    ({ access }) => <FormattedMessage id={READING_ROOM_ACCESS[access]} />,
+    { access: PropTypes.string }
+  ),
+  [rraColumns.READING_ROOM_NAME]: ({ readingRoomName }) => readingRoomName,
+  [rraColumns.NOTES]: ({ notes }) => notes,
+  [rraColumns.ID]: rra => (
+    rra?.metadata?.updatedDate ? (
+      <ViewMetaData
+        metadata={rra.metadata}
+      >
+        {
+            (updater) => lastUpdatedDetails(updater?.lastUpdatedBy, rra.metadata.updatedDate)
+          }
+      </ViewMetaData>
+    ) :
+      <NoValue />
+  )
+});