UIU-1860 - Users App: Consume {{FormattedDate}} and {{FormattedTime}}… (

#2559) * UIU-1860 - Users App: Consume {{FormattedDate}} and {{FormattedTime}} via stripes-component * update test * UIU-1860 - fix test failures
folio-org · Sep 20, 2023 · b7b3b6e · b7b3b6e
1 parent b2d890a
commit b7b3b6e
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -83,6 +83,7 @@
 * Generate "Create request" url for users without barcode. Refs UIU-2869.
 * Add auto focus to textarea on staff and patron info modal. Fixes UIU-2932.
 * ECS - Filter users by "User Type". Refs UIU-2943.
+* Users App: Consume {{FormattedDate}} and {{FormattedTime}} via stripes-component. Refs UIU-1860.
 
 ## [9.0.0](https://github.com/folio-org/ui-users/tree/v9.0.0) (2023-02-20)
 [Full Changelog](https://github.com/folio-org/ui-users/compare/v8.1.0...v9.0.0)

diff --git a/src/components/Accounts/ViewFeesFines/ViewFeesFines.js b/src/components/Accounts/ViewFeesFines/ViewFeesFines.js
@@ -3,9 +3,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import {
-  FormattedDate,
   FormattedMessage,
-  FormattedTime,
 } from 'react-intl';
 
 import {
@@ -17,6 +15,8 @@ import {
   Row,
   Col,
   Icon,
+  FormattedDate,
+  FormattedTime,
 } from '@folio/stripes/components';
 
 import { itemStatuses } from '../../../constants';

diff --git a/src/components/Accounts/ViewFeesFines/ViewFeesFines.test.js b/src/components/Accounts/ViewFeesFines/ViewFeesFines.test.js
@@ -17,6 +17,9 @@ jest.mock('../../util', () => ({
 jest.mock('react-intl', () => ({
   ...jest.requireActual('react-intl'),
   FormattedMessage: jest.fn(({ id }) => id),
+}));
+jest.mock('@folio/stripes/components', () => ({
+  ...jest.requireActual('@folio/stripes/components'),
   FormattedTime: jest.fn(({ value }) => value),
   FormattedDate: jest.fn(({ value }) => value),
 }));

diff --git a/src/components/BulkOverrideDialog/BulkOverrideLoansList.js b/src/components/BulkOverrideDialog/BulkOverrideLoansList.js
@@ -2,14 +2,14 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { get } from 'lodash';
 import {
-  FormattedTime,
   FormattedMessage,
   injectIntl,
 } from 'react-intl';
 
 import {
   Icon,
   MultiColumnList,
+  FormattedTime,
 } from '@folio/stripes/components';
 import { effectiveCallNumber } from '@folio/stripes/util';
 

diff --git a/src/components/BulkRenewalDialog/BulkRenewedLoansList.js b/src/components/BulkRenewalDialog/BulkRenewedLoansList.js
@@ -4,12 +4,12 @@ import get from 'lodash/get';
 
 import {
   FormattedMessage,
-  FormattedTime,
 } from 'react-intl';
 
 import {
   Icon,
   MultiColumnList,
+  FormattedTime,
 } from '@folio/stripes/components';
 import { effectiveCallNumber } from '@folio/stripes/util';
 

diff --git a/src/components/Loans/ClosedLoans/ClosedLoans.js b/src/components/Loans/ClosedLoans/ClosedLoans.js
@@ -2,7 +2,6 @@ import _ from 'lodash';
 import React from 'react';
 import {
   FormattedMessage,
-  FormattedTime,
   injectIntl,
 } from 'react-intl';
 import PropTypes from 'prop-types';
@@ -16,6 +15,7 @@ import {
   IconButton,
   ExportCsv,
   ConfirmationModal,
+  FormattedTime,
 } from '@folio/stripes/components';
 import {
   IfPermission,

diff --git a/src/components/Loans/OpenLoans/components/BulkClaimReturnedModal/BulkClaimReturnedModal.js b/src/components/Loans/OpenLoans/components/BulkClaimReturnedModal/BulkClaimReturnedModal.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, FormattedDate, injectIntl } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 import { isEmpty } from 'lodash';
 import moment from 'moment';
@@ -14,6 +14,7 @@ import {
   MultiColumnList,
   Spinner,
   TextArea,
+  FormattedDate,
 } from '@folio/stripes/components';
 
 import { getOpenRequestsPath } from '../../../../util';

diff --git a/src/components/Loans/OpenLoans/helpers/getListDataFormatter.js b/src/components/Loans/OpenLoans/helpers/getListDataFormatter.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { get } from 'lodash';
 import {
-  FormattedTime,
   FormattedDate,
-} from 'react-intl';
+  FormattedTime,
+} from '@folio/stripes/components';
 
 import { effectiveCallNumber } from '@folio/stripes/util';
 

diff --git a/src/components/ProxyGroup/ProxyEditItem/ProxyEditItem.js b/src/components/ProxyGroup/ProxyEditItem/ProxyEditItem.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import {
   FormattedMessage,
-  FormattedTime,
 } from 'react-intl';
 import {
   defer,
@@ -18,6 +17,7 @@ import {
   Datepicker,
   LayoutHeader,
   Select,
+  FormattedTime,
 } from '@folio/stripes/components';
 
 import { getFullName } from '../../util';

diff --git a/src/components/ProxyGroup/ProxyItem/ProxyItem.js b/src/components/ProxyGroup/ProxyItem/ProxyItem.js
@@ -1,9 +1,17 @@
 import _ from 'lodash';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, FormattedTime, FormattedDate } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import { Link } from 'react-router-dom';
-import { Row, Col, KeyValue, LayoutHeader, NoValue } from '@folio/stripes/components';
+import {
+  Row,
+  Col,
+  KeyValue,
+  LayoutHeader,
+  NoValue,
+  FormattedTime,
+  FormattedDate,
+} from '@folio/stripes/components';
 
 import { getFullName } from '../../util';
 import css from './ProxyItem.css';

diff --git a/src/components/UserDetailSections/UserInfo/UserInfo.js b/src/components/UserDetailSections/UserInfo/UserInfo.js
@@ -1,14 +1,15 @@
 import { get } from 'lodash';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage, FormattedDate } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import {
   Row,
   Col,
   KeyValue,
   Accordion,
   Headline,
   NoValue,
+  FormattedDate,
 } from '@folio/stripes/components';
 
 import { ViewMetaData } from '@folio/stripes/smart-components';

diff --git a/src/views/LoanDetails/LoanDetails.js b/src/views/LoanDetails/LoanDetails.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import {
   FormattedMessage,
-  FormattedTime,
   injectIntl,
 } from 'react-intl';
 import { compose } from 'redux';
@@ -29,6 +28,7 @@ import {
   LoadingView,
   Dropdown,
   DropdownMenu,
+  FormattedTime,
 } from '@folio/stripes/components';
 import { IfPermission, stripesConnect } from '@folio/stripes/core';
 import { effectiveCallNumber } from '@folio/stripes/util';

diff --git a/src/views/LostItems/LostItemsListContainer/components/LostItemsList/LostItemsList.test.js b/src/views/LostItems/LostItemsListContainer/components/LostItemsList/LostItemsList.test.js
@@ -49,8 +49,6 @@ jest.mock('./util', () => ({
 jest.mock('react-intl', () => ({
   ...jest.requireActual('react-intl'),
   FormattedMessage: jest.fn(({ id }) => id),
-  FormattedTime: jest.fn(({ value }) => value),
-  FormattedDate: jest.fn(({ value }) => value),
 }));
 
 const initialProps = {

diff --git a/...sListContainer/components/LostItemsList/components/DateTimeFormatter/DateTimeFormatter.js b/...sListContainer/components/LostItemsList/components/DateTimeFormatter/DateTimeFormatter.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {
   FormattedDate,
   FormattedTime,
-} from 'react-intl';
+} from '@folio/stripes/components';
 
 const DateTimeFormatter = ({ value }) => {
   return (

diff --git a/...Container/components/LostItemsList/components/DateTimeFormatter/DateTimeFormatter.test.js b/...Container/components/LostItemsList/components/DateTimeFormatter/DateTimeFormatter.test.js
@@ -2,7 +2,7 @@ import { render } from '@folio/jest-config-stripes/testing-library/react';
 import {
   FormattedDate,
   FormattedTime,
-} from 'react-intl';
+} from '@folio/stripes/components';
 
 import '../../../../../../../../test/jest/__mock__';
 

diff --git a/...tItemsListContainer/components/LostItemsList/components/RecordStatus/RecordStatus.test.js b/...tItemsListContainer/components/LostItemsList/components/RecordStatus/RecordStatus.test.js
@@ -4,9 +4,12 @@ import {
 } from '@folio/jest-config-stripes/testing-library/react';
 import {
   FormattedMessage,
+} from 'react-intl';
+
+import {
   FormattedDate,
   FormattedTime,
-} from 'react-intl';
+} from '@folio/stripes/components';
 
 import RecordStatus, {
   getBilledAmount,

diff --git a/test/jest/__mock__/stripesComponents.mock.js b/test/jest/__mock__/stripesComponents.mock.js
@@ -54,6 +54,20 @@ jest.mock('@folio/stripes/components', () => ({
   ExpandAllButton: jest.fn(({ children }) => (
     <span>{children}</span>
   )),
+  FormattedTime: jest.fn(({ value, children }) => {
+    if (children) {
+      return children([value]);
+    }
+
+    return value;
+  }),
+  FormattedDate: jest.fn(({ value, children }) => {
+    if (children) {
+      return children([value]);
+    }
+
+    return value;
+  }),
   HasCommand: jest.fn(({ children }) => (
     <span>{children}</span>
   )),