From 1aef35cb24c8953e14062d066127222ed16bf704 Mon Sep 17 00:00:00 2001 From: Zak Burke Date: Tue, 14 Jan 2025 14:32:27 -0500 Subject: [PATCH 1/3] STSMACOM-884 correctly import from public paths Import from public paths only. Refs STSMACOM-884 --- CHANGELOG.md | 1 + lib/ChangeDueDateDialog/LoanList.js | 2 +- lib/PasswordValidationField/PasswordValidationField.js | 3 +-- lib/SearchAndSort/advancedSearchQueryToRows.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c2a7689f..f82843c5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * Check for `active` status of `` navigation links independently from the applied href and query string. Query string should only be applied to active link. Refs STSMACOM-837. * `` use `lodash.isEmpty` to check for empty `state.status` in re-initialization checks on component update. Fixes STSMACOM-876. * `` improve "Display as pop-up" markup and fix label a11y issue. Refs STSMACOM-882. +* Correctly import from `stripes-*` libraries. Refs STSMACOM-884. ## [9.2.3] IN PROGRESS diff --git a/lib/ChangeDueDateDialog/LoanList.js b/lib/ChangeDueDateDialog/LoanList.js index e73c64406..4e2454ea8 100644 --- a/lib/ChangeDueDateDialog/LoanList.js +++ b/lib/ChangeDueDateDialog/LoanList.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { get } from 'lodash'; import { FormattedMessage, FormattedTime, useIntl } from 'react-intl'; import { Checkbox, MultiColumnList } from '@folio/stripes-components'; -import getEffectiveCallNumber from '@folio/stripes-util/lib/effectiveCallNumber'; +import { getEffectiveCallNumber } from '@folio/stripes-util'; const propTypes = { alerts: PropTypes.object, diff --git a/lib/PasswordValidationField/PasswordValidationField.js b/lib/PasswordValidationField/PasswordValidationField.js index 0dbc4e6c4..dffd25864 100644 --- a/lib/PasswordValidationField/PasswordValidationField.js +++ b/lib/PasswordValidationField/PasswordValidationField.js @@ -6,8 +6,7 @@ import { Field as ReduxFormField } from 'redux-form'; import { Field as FinalFormField } from 'react-final-form'; import isEmpty from 'lodash/isEmpty'; -import { TextField } from '@folio/stripes-components'; -import omitProps from '@folio/stripes-components/util/omitProps'; +import { TextField, omitProps } from '@folio/stripes-components'; const defaultValidationHandler = (errors) => { if (!isEmpty(errors)) { diff --git a/lib/SearchAndSort/advancedSearchQueryToRows.js b/lib/SearchAndSort/advancedSearchQueryToRows.js index 7677625a2..0e98bfca3 100644 --- a/lib/SearchAndSort/advancedSearchQueryToRows.js +++ b/lib/SearchAndSort/advancedSearchQueryToRows.js @@ -2,7 +2,7 @@ import { BOOLEAN_OPERATORS, DEFAULT_SEARCH_OPTION, MATCH_OPTIONS, -} from '@folio/stripes-components/lib/AdvancedSearch'; +} from '@folio/stripes-components'; const advancedSearchQueryToRows = (queryValue) => { if (!queryValue) { From 2b3d303f9a2de1a5f790cd893b6a78f3b5e53df7 Mon Sep 17 00:00:00 2001 From: Zak Burke Date: Wed, 15 Jan 2025 11:14:13 -0500 Subject: [PATCH 2/3] values were renamed on public export --- lib/SearchAndSort/advancedSearchQueryToRows.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/SearchAndSort/advancedSearchQueryToRows.js b/lib/SearchAndSort/advancedSearchQueryToRows.js index 0e98bfca3..a2d735c33 100644 --- a/lib/SearchAndSort/advancedSearchQueryToRows.js +++ b/lib/SearchAndSort/advancedSearchQueryToRows.js @@ -1,7 +1,7 @@ import { - BOOLEAN_OPERATORS, - DEFAULT_SEARCH_OPTION, - MATCH_OPTIONS, + ADVANCED_SEARCH_BOOLEAN_OPERATORS, + ADVANCED_SEARCH_DEFAULT_SEARCH_OPTION, + ADVANCED_SEARCH_MATCH_OPTIONS, } from '@folio/stripes-components'; const advancedSearchQueryToRows = (queryValue) => { From 7b5107b4325862cf113ebb1b237e884322b5c303 Mon Sep 17 00:00:00 2001 From: Zak Burke Date: Wed, 15 Jan 2025 12:50:31 -0500 Subject: [PATCH 3/3] actually fix the import this time --- lib/SearchAndSort/advancedSearchQueryToRows.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/SearchAndSort/advancedSearchQueryToRows.js b/lib/SearchAndSort/advancedSearchQueryToRows.js index a2d735c33..a35b02606 100644 --- a/lib/SearchAndSort/advancedSearchQueryToRows.js +++ b/lib/SearchAndSort/advancedSearchQueryToRows.js @@ -1,7 +1,7 @@ import { - ADVANCED_SEARCH_BOOLEAN_OPERATORS, - ADVANCED_SEARCH_DEFAULT_SEARCH_OPTION, - ADVANCED_SEARCH_MATCH_OPTIONS, + ADVANCED_SEARCH_BOOLEAN_OPERATORS as BOOLEAN_OPERATORS, + ADVANCED_SEARCH_DEFAULT_SEARCH_OPTION as DEFAULT_SEARCH_OPTION, + ADVANCED_SEARCH_MATCH_OPTIONS as MATCH_OPTIONS, } from '@folio/stripes-components'; const advancedSearchQueryToRows = (queryValue) => {