From c5f7c939966030f72cbf4d91f95841e70eac24dc Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 12 Jan 2024 14:55:04 +0900 Subject: [PATCH] Fix test --- app/javascript/mastodon/features/antenna_adder/index.jsx | 3 ++- app/javascript/mastodon/features/antennas/index.jsx | 3 ++- app/javascript/mastodon/features/bookmark_categories/index.jsx | 3 ++- .../mastodon/features/bookmark_category_adder/index.jsx | 3 ++- app/javascript/mastodon/features/circle_adder/index.jsx | 3 ++- app/javascript/mastodon/features/circles/index.jsx | 3 ++- app/javascript/mastodon/features/reaction_deck/index.jsx | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/javascript/mastodon/features/antenna_adder/index.jsx b/app/javascript/mastodon/features/antenna_adder/index.jsx index 7fecf8fa64..649b4742e7 100644 --- a/app/javascript/mastodon/features/antenna_adder/index.jsx +++ b/app/javascript/mastodon/features/antenna_adder/index.jsx @@ -2,10 +2,11 @@ import PropTypes from 'prop-types'; import { injectIntl } from 'react-intl'; +import { createSelector } from '@reduxjs/toolkit'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import { createSelector } from 'reselect'; + import { setupAntennaAdder, resetAntennaAdder, setupExcludeAntennaAdder } from '../../actions/antennas'; import NewAntennaForm from '../antennas/components/new_antenna_form'; diff --git a/app/javascript/mastodon/features/antennas/index.jsx b/app/javascript/mastodon/features/antennas/index.jsx index 51c5299d0e..0ad2b63a2f 100644 --- a/app/javascript/mastodon/features/antennas/index.jsx +++ b/app/javascript/mastodon/features/antennas/index.jsx @@ -4,13 +4,14 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { Helmet } from 'react-helmet'; +import { createSelector } from '@reduxjs/toolkit'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import { createSelector } from 'reselect'; import { ReactComponent as AntennaIcon } from '@material-symbols/svg-600/outlined/wifi.svg'; + import { fetchAntennas } from 'mastodon/actions/antennas'; import Column from 'mastodon/components/column'; import ColumnHeader from 'mastodon/components/column_header'; diff --git a/app/javascript/mastodon/features/bookmark_categories/index.jsx b/app/javascript/mastodon/features/bookmark_categories/index.jsx index 21ec0c8c27..47e2b0f6fc 100644 --- a/app/javascript/mastodon/features/bookmark_categories/index.jsx +++ b/app/javascript/mastodon/features/bookmark_categories/index.jsx @@ -4,10 +4,11 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { Helmet } from 'react-helmet'; +import { createSelector } from '@reduxjs/toolkit'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import { createSelector } from 'reselect'; + import { ReactComponent as BookmarksIcon } from '@material-symbols/svg-600/outlined/bookmark-fill.svg'; import { ReactComponent as BookmarkIcon } from '@material-symbols/svg-600/outlined/bookmark.svg'; diff --git a/app/javascript/mastodon/features/bookmark_category_adder/index.jsx b/app/javascript/mastodon/features/bookmark_category_adder/index.jsx index c929d82a2d..7381e1688d 100644 --- a/app/javascript/mastodon/features/bookmark_category_adder/index.jsx +++ b/app/javascript/mastodon/features/bookmark_category_adder/index.jsx @@ -2,10 +2,11 @@ import PropTypes from 'prop-types'; import { injectIntl } from 'react-intl'; +import { createSelector } from '@reduxjs/toolkit'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import { createSelector } from 'reselect'; + import { setupBookmarkCategoryAdder, resetBookmarkCategoryAdder } from '../../actions/bookmark_categories'; import NewBookmarkCategoryForm from '../bookmark_categories/components/new_bookmark_category_form'; diff --git a/app/javascript/mastodon/features/circle_adder/index.jsx b/app/javascript/mastodon/features/circle_adder/index.jsx index 9fb9d80a62..ae9c647bdd 100644 --- a/app/javascript/mastodon/features/circle_adder/index.jsx +++ b/app/javascript/mastodon/features/circle_adder/index.jsx @@ -2,10 +2,11 @@ import PropTypes from 'prop-types'; import { injectIntl } from 'react-intl'; +import { createSelector } from '@reduxjs/toolkit'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import { createSelector } from 'reselect'; + import { setupCircleAdder, resetCircleAdder } from '../../actions/circles'; import NewCircleForm from '../circles/components/new_circle_form'; diff --git a/app/javascript/mastodon/features/circles/index.jsx b/app/javascript/mastodon/features/circles/index.jsx index 9ee5343dc3..b609b58590 100644 --- a/app/javascript/mastodon/features/circles/index.jsx +++ b/app/javascript/mastodon/features/circles/index.jsx @@ -4,10 +4,11 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { Helmet } from 'react-helmet'; +import { createSelector } from '@reduxjs/toolkit'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import { createSelector } from 'reselect'; + import { ReactComponent as CirclesIcon } from '@material-symbols/svg-600/outlined/account_circle-fill.svg'; import { ReactComponent as CircleIcon } from '@material-symbols/svg-600/outlined/account_circle.svg'; diff --git a/app/javascript/mastodon/features/reaction_deck/index.jsx b/app/javascript/mastodon/features/reaction_deck/index.jsx index 747e730f3e..c8009fc762 100644 --- a/app/javascript/mastodon/features/reaction_deck/index.jsx +++ b/app/javascript/mastodon/features/reaction_deck/index.jsx @@ -5,11 +5,12 @@ import { defineMessages, injectIntl } from 'react-intl'; import { Helmet } from 'react-helmet'; +import { createSelector } from '@reduxjs/toolkit'; import { Map as ImmutableMap } from 'immutable'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { connect } from 'react-redux'; -import { createSelector } from 'reselect'; + import { DragDropContext, Droppable, Draggable } from '@hello-pangea/dnd'; import { ReactComponent as MenuIcon } from '@material-symbols/svg-600/outlined/menu.svg';