From 20ec920b7184cc52f22e673e929c816964115bb6 Mon Sep 17 00:00:00 2001 From: M-ZubairAhmed Date: Tue, 30 May 2023 13:20:28 +0530 Subject: [PATCH] MM-52873 : Switch to npm's 'reselect' for Playbooks (#23396) --- webapp/channels/jest.config.js | 1 - webapp/channels/src/actions/telemetry_actions.jsx | 3 +-- .../channels/src/actions/views/create_comment.tsx | 3 +-- .../src/components/actions_menu/selectors.ts | 3 +-- .../admin_console/compliance_reports/index.ts | 3 +-- .../admin_console/custom_plugin_settings/index.ts | 3 +-- .../filter/team_filter_dropdown/index.tsx | 3 +-- .../team_filter_dropdown/team_filter_dropdown.tsx | 4 ++-- .../group_settings/groups_list/index.ts | 5 ++--- .../channel/details/channel_members/index.ts | 10 +++------- .../team_channel_settings/channel/list/index.ts | 4 ++-- .../team_channel_settings/team/list/index.ts | 3 +-- .../components/channel_header_dropdown/index.ts | 2 +- .../src/components/channel_header_mobile/index.ts | 3 +-- .../src/components/channel_members_rhs/index.ts | 2 +- .../src/components/channel_select/index.ts | 3 +-- webapp/channels/src/components/markdown/index.ts | 6 ++---- .../src/components/member_list_channel/index.ts | 3 +-- .../channels/src/components/more_channels/index.ts | 3 +-- .../components/more_direct_channels/list/index.ts | 3 +-- .../src/components/new_replies_banner/index.ts | 5 ++--- .../channels/src/components/post_markdown/index.ts | 2 +- .../src/components/post_view/reaction/index.ts | 3 +-- .../post_view/reaction/reaction_tooltip/index.ts | 3 +-- .../src/components/rename_channel_modal/index.ts | 3 +-- .../channels/src/components/system_notice/index.ts | 3 +-- .../channels/src/components/toast_wrapper/index.ts | 3 +-- .../user_group_popover/group_member_list/index.ts | 2 +- .../src/selectors/create_selector}/index.d.ts | 0 .../src/selectors/create_selector}/index.js | 0 .../src/selectors/entities/admin.ts | 4 ++-- .../src/selectors/entities/apps.ts | 3 +-- .../src/selectors/entities/bots.ts | 4 ++-- .../src/selectors/entities/channel_categories.ts | 3 +-- .../src/selectors/entities/channels.ts | 3 +-- .../src/selectors/entities/common.ts | 4 ++-- .../src/selectors/entities/emojis.ts | 3 +-- .../src/selectors/entities/files.ts | 3 +-- .../src/selectors/entities/general.ts | 3 +-- .../src/selectors/entities/groups.ts | 5 ++--- .../src/selectors/entities/insights.ts | 2 +- .../src/selectors/entities/integrations.ts | 3 +-- .../src/selectors/entities/jobs.ts | 4 ++-- .../src/selectors/entities/posts.ts | 3 +-- .../src/selectors/entities/preferences.ts | 3 +-- .../src/selectors/entities/roles.ts | 3 +-- .../src/selectors/entities/roles_helpers.ts | 7 +++---- .../src/selectors/entities/schemes.ts | 3 +-- .../src/selectors/entities/search.ts | 3 +-- .../src/selectors/entities/teams.ts | 3 +-- .../src/selectors/entities/threads.ts | 3 +-- .../src/selectors/entities/timezone.ts | 3 ++- .../src/selectors/entities/typing.ts | 3 +-- .../src/selectors/entities/users.ts | 3 +-- .../src/selectors/entities/utils.ts | 3 +-- .../packages/mattermost-redux/src/utils/helpers.ts | 6 +++--- .../mattermost-redux/src/utils/post_list.ts | 5 ++--- webapp/channels/src/selectors/admin_console.jsx | 3 +-- webapp/channels/src/selectors/cloud.ts | 2 +- webapp/channels/src/selectors/drafts.ts | 3 +-- webapp/channels/src/selectors/emojis.ts | 3 +-- webapp/channels/src/selectors/lhs.ts | 3 ++- webapp/channels/src/selectors/onboarding.ts | 3 +-- webapp/channels/src/selectors/plugins.ts | 3 +-- webapp/channels/src/selectors/posts.ts | 3 +-- webapp/channels/src/selectors/rhs.ts | 3 +-- .../src/selectors/views/channel_sidebar.ts | 3 +-- .../channels/src/selectors/views/custom_status.ts | 3 +-- webapp/channels/src/selectors/views/marketplace.ts | 6 +++--- webapp/channels/src/selectors/views/threads.ts | 3 +-- webapp/channels/src/selectors/work_template.ts | 3 +-- webapp/channels/src/stores/hooks.ts | 3 +-- webapp/channels/src/utils/post_utils.ts | 5 +---- webapp/channels/tsconfig.json | 1 - webapp/channels/webpack.config.js | 1 - webapp/package-lock.json | 14 ++++++++------ webapp/playbooks/jest.config.js | 1 - webapp/playbooks/package.json | 1 + .../src/components/backstage/channel_selector.tsx | 2 -- webapp/playbooks/src/selectors.ts | 13 ------------- webapp/playbooks/tsconfig.json | 1 - webapp/playbooks/webpack.config.js | 1 - 82 files changed, 100 insertions(+), 176 deletions(-) rename webapp/channels/src/packages/{reselect/src => mattermost-redux/src/selectors/create_selector}/index.d.ts (100%) rename webapp/channels/src/packages/{reselect/src => mattermost-redux/src/selectors/create_selector}/index.js (100%) diff --git a/webapp/channels/jest.config.js b/webapp/channels/jest.config.js index 01d80ffe8d..02f1570316 100644 --- a/webapp/channels/jest.config.js +++ b/webapp/channels/jest.config.js @@ -26,7 +26,6 @@ const config = { '^mattermost-redux/test/(.*)$': '/src/packages/mattermost-redux/test/$1', '^mattermost-redux/(.*)$': '/src/packages/mattermost-redux/src/$1', - '^reselect$': '/src/packages/reselect/src', '^.+\\.(jpg|jpeg|png|apng|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'identity-obj-proxy', '^.+\\.(css|less|scss)$': 'identity-obj-proxy', diff --git a/webapp/channels/src/actions/telemetry_actions.jsx b/webapp/channels/src/actions/telemetry_actions.jsx index 752eaeff3f..bd2dbb79ac 100644 --- a/webapp/channels/src/actions/telemetry_actions.jsx +++ b/webapp/channels/src/actions/telemetry_actions.jsx @@ -1,10 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {getSortedTrackedSelectors} from 'reselect'; - import {Client4} from 'mattermost-redux/client'; import {Preferences} from 'mattermost-redux/constants'; +import {getSortedTrackedSelectors} from 'mattermost-redux/selectors/create_selector'; import {getConfig, isPerformanceDebuggingEnabled} from 'mattermost-redux/selectors/entities/general'; import {getBool} from 'mattermost-redux/selectors/entities/preferences'; diff --git a/webapp/channels/src/actions/views/create_comment.tsx b/webapp/channels/src/actions/views/create_comment.tsx index 48593b93d4..39037b215b 100644 --- a/webapp/channels/src/actions/views/create_comment.tsx +++ b/webapp/channels/src/actions/views/create_comment.tsx @@ -1,10 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {Post} from '@mattermost/types/posts'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams'; import { diff --git a/webapp/channels/src/components/actions_menu/selectors.ts b/webapp/channels/src/components/actions_menu/selectors.ts index abb002a65a..a9a2606ca7 100644 --- a/webapp/channels/src/components/actions_menu/selectors.ts +++ b/webapp/channels/src/components/actions_menu/selectors.ts @@ -1,10 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {AppBinding} from '@mattermost/types/apps'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {AppBindingLocations} from 'mattermost-redux/constants/apps'; import {makeAppBindingsSelector, makeRHSAppBindingSelector} from 'mattermost-redux/selectors/entities/apps'; diff --git a/webapp/channels/src/components/admin_console/compliance_reports/index.ts b/webapp/channels/src/components/admin_console/compliance_reports/index.ts index fa1253e32c..778b1a18df 100644 --- a/webapp/channels/src/components/admin_console/compliance_reports/index.ts +++ b/webapp/channels/src/components/admin_console/compliance_reports/index.ts @@ -4,9 +4,8 @@ import {connect} from 'react-redux'; import {ActionCreatorsMapObject, bindActionCreators, Dispatch} from 'redux'; -import {createSelector} from 'reselect'; - import {createComplianceReport, getComplianceReports} from 'mattermost-redux/actions/admin'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getComplianceReports as selectComplianceReports, getConfig} from 'mattermost-redux/selectors/entities/admin'; import {getLicense} from 'mattermost-redux/selectors/entities/general'; diff --git a/webapp/channels/src/components/admin_console/custom_plugin_settings/index.ts b/webapp/channels/src/components/admin_console/custom_plugin_settings/index.ts index 7e348daeb4..c08da3d9a2 100644 --- a/webapp/channels/src/components/admin_console/custom_plugin_settings/index.ts +++ b/webapp/channels/src/components/admin_console/custom_plugin_settings/index.ts @@ -3,8 +3,7 @@ import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getRoles} from 'mattermost-redux/selectors/entities/roles'; import {appsFeatureFlagEnabled} from 'mattermost-redux/selectors/entities/apps'; import {isCurrentLicenseCloud} from 'mattermost-redux/selectors/entities/cloud'; diff --git a/webapp/channels/src/components/admin_console/filter/team_filter_dropdown/index.tsx b/webapp/channels/src/components/admin_console/filter/team_filter_dropdown/index.tsx index 857afe0d74..f33d8ddf52 100644 --- a/webapp/channels/src/components/admin_console/filter/team_filter_dropdown/index.tsx +++ b/webapp/channels/src/components/admin_console/filter/team_filter_dropdown/index.tsx @@ -4,12 +4,11 @@ import {connect} from 'react-redux'; import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux'; -import {createSelector} from 'reselect'; - import {GenericAction, ActionFunc} from 'mattermost-redux/types/actions'; import {TeamSearchOpts} from '@mattermost/types/teams'; import {getTeams as fetchTeams, searchTeams} from 'mattermost-redux/actions/teams'; import {getTeams} from 'mattermost-redux/selectors/entities/teams'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {GlobalState} from 'types/store'; diff --git a/webapp/channels/src/components/admin_console/filter/team_filter_dropdown/team_filter_dropdown.tsx b/webapp/channels/src/components/admin_console/filter/team_filter_dropdown/team_filter_dropdown.tsx index 0d4121f182..1ded2f0e3e 100644 --- a/webapp/channels/src/components/admin_console/filter/team_filter_dropdown/team_filter_dropdown.tsx +++ b/webapp/channels/src/components/admin_console/filter/team_filter_dropdown/team_filter_dropdown.tsx @@ -4,10 +4,10 @@ import React from 'react'; import {FormattedMessage} from 'react-intl'; -import {createSelector} from 'reselect'; - import {Team, TeamSearchOpts} from '@mattermost/types/teams'; + import {debounce} from 'mattermost-redux/actions/helpers'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import LoadingSpinner from 'components/widgets/loading/loading_spinner'; import InfiniteScroll from 'components/gif_picker/components/InfiniteScroll'; diff --git a/webapp/channels/src/components/admin_console/group_settings/groups_list/index.ts b/webapp/channels/src/components/admin_console/group_settings/groups_list/index.ts index 1fedb7902e..babc2a82a0 100644 --- a/webapp/channels/src/components/admin_console/group_settings/groups_list/index.ts +++ b/webapp/channels/src/components/admin_console/group_settings/groups_list/index.ts @@ -4,12 +4,11 @@ import {connect} from 'react-redux'; import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux'; -import {createSelector} from 'reselect'; +import {GlobalState} from '@mattermost/types/store'; import {linkLdapGroup, unlinkLdapGroup, getLdapGroups as fetchLdapGroups} from 'mattermost-redux/actions/admin'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getLdapGroups, getLdapGroupsCount} from 'mattermost-redux/selectors/entities/admin'; - -import {GlobalState} from '@mattermost/types/store'; import {ActionFunc} from 'mattermost-redux/types/actions'; import GroupsList from './groups_list'; diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/index.ts b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/index.ts index 66a6d1f382..9ed0898555 100644 --- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/index.ts +++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/index.ts @@ -4,19 +4,15 @@ import {connect} from 'react-redux'; import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux'; -import {createSelector} from 'reselect'; - import {ServerError} from '@mattermost/types/errors'; import {UserProfile, UsersStats, GetFilteredUsersStatsOpts} from '@mattermost/types/users'; - -import {filterProfilesStartingWithTerm, profileListToMap} from 'mattermost-redux/utils/user_utils'; - -import {ActionResult, ActionFunc, GenericAction} from 'mattermost-redux/types/actions'; import {ChannelStats} from '@mattermost/types/channels'; +import {filterProfilesStartingWithTerm, profileListToMap} from 'mattermost-redux/utils/user_utils'; +import {ActionResult, ActionFunc, GenericAction} from 'mattermost-redux/types/actions'; import {getChannelStats} from 'mattermost-redux/actions/channels'; import {getFilteredUsersStats} from 'mattermost-redux/actions/users'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getChannelMembersInChannels, getAllChannelStats, getChannel} from 'mattermost-redux/selectors/entities/channels'; import {makeGetProfilesInChannel, makeSearchProfilesInChannel, filterProfiles, getFilteredUsersStats as selectFilteredUsersStats} from 'mattermost-redux/selectors/entities/users'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/list/index.ts b/webapp/channels/src/components/admin_console/team_channel_settings/channel/list/index.ts index a3154a70c4..e60800c4b7 100644 --- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/list/index.ts +++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/list/index.ts @@ -4,12 +4,12 @@ import {connect} from 'react-redux'; import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux'; -import {createSelector} from 'reselect'; +import {ChannelWithTeamData, ChannelSearchOpts} from '@mattermost/types/channels'; import {getAllChannelsWithCount as getData, searchAllChannels} from 'mattermost-redux/actions/channels'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getAllChannels} from 'mattermost-redux/selectors/entities/channels'; import {GenericAction, ActionFunc, ActionResult} from 'mattermost-redux/types/actions'; -import {ChannelWithTeamData, ChannelSearchOpts} from '@mattermost/types/channels'; import {GlobalState} from 'types/store'; import {Constants} from 'utils/constants'; diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/team/list/index.ts b/webapp/channels/src/components/admin_console/team_channel_settings/team/list/index.ts index 68f5835b79..f54bc10915 100644 --- a/webapp/channels/src/components/admin_console/team_channel_settings/team/list/index.ts +++ b/webapp/channels/src/components/admin_console/team_channel_settings/team/list/index.ts @@ -4,10 +4,9 @@ import {connect} from 'react-redux'; import {ActionCreatorsMapObject, bindActionCreators, Dispatch} from 'redux'; -import {createSelector} from 'reselect'; - import {getTeams as fetchTeams, searchTeams} from 'mattermost-redux/actions/teams'; import {getTeams} from 'mattermost-redux/selectors/entities/teams'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {ActionFunc} from 'mattermost-redux/types/actions'; diff --git a/webapp/channels/src/components/channel_header_dropdown/index.ts b/webapp/channels/src/components/channel_header_dropdown/index.ts index 73396ca645..c3c903c2e9 100644 --- a/webapp/channels/src/components/channel_header_dropdown/index.ts +++ b/webapp/channels/src/components/channel_header_dropdown/index.ts @@ -3,7 +3,7 @@ import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import { getUser, diff --git a/webapp/channels/src/components/channel_header_mobile/index.ts b/webapp/channels/src/components/channel_header_mobile/index.ts index 2486cc152b..5e6d2ac482 100644 --- a/webapp/channels/src/components/channel_header_mobile/index.ts +++ b/webapp/channels/src/components/channel_header_mobile/index.ts @@ -6,8 +6,7 @@ import {connect} from 'react-redux'; import {bindActionCreators, Dispatch} from 'redux'; import {withRouter, matchPath} from 'react-router-dom'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentUser} from 'mattermost-redux/selectors/entities/users'; import { getCurrentChannel, diff --git a/webapp/channels/src/components/channel_members_rhs/index.ts b/webapp/channels/src/components/channel_members_rhs/index.ts index b589eeb79f..3ebb828d87 100644 --- a/webapp/channels/src/components/channel_members_rhs/index.ts +++ b/webapp/channels/src/components/channel_members_rhs/index.ts @@ -4,7 +4,7 @@ import {connect} from 'react-redux'; import {AnyAction, bindActionCreators, Dispatch} from 'redux'; -import {createSelector} from 'reselect'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import { getCurrentChannel, diff --git a/webapp/channels/src/components/channel_select/index.ts b/webapp/channels/src/components/channel_select/index.ts index 4459b0665e..d8f246619d 100644 --- a/webapp/channels/src/components/channel_select/index.ts +++ b/webapp/channels/src/components/channel_select/index.ts @@ -3,8 +3,7 @@ import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getMyChannels} from 'mattermost-redux/selectors/entities/channels'; import {getCurrentUserLocale} from 'mattermost-redux/selectors/entities/i18n'; import {sortChannelsByTypeAndDisplayName} from 'mattermost-redux/utils/channel_utils'; diff --git a/webapp/channels/src/components/markdown/index.ts b/webapp/channels/src/components/markdown/index.ts index ee66b87f46..7e38386822 100644 --- a/webapp/channels/src/components/markdown/index.ts +++ b/webapp/channels/src/components/markdown/index.ts @@ -3,14 +3,14 @@ import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; - import {Preferences} from 'mattermost-redux/constants'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getChannelNameToDisplayNameMap} from 'mattermost-redux/selectors/entities/channels'; import {getAutolinkedUrlSchemes, getConfig, getManagedResourcePaths} from 'mattermost-redux/selectors/entities/general'; import {getBool} from 'mattermost-redux/selectors/entities/preferences'; import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams'; import {getAllUserMentionKeys} from 'mattermost-redux/selectors/entities/search'; +import {getPost} from 'mattermost-redux/selectors/entities/posts'; import {GlobalState} from 'types/store'; import {getEmojiMap} from 'selectors/emojis'; @@ -18,8 +18,6 @@ import {getEmojiMap} from 'selectors/emojis'; import {getSiteURL} from 'utils/url'; import {ChannelNamesMap, MentionKey} from 'utils/text_formatting'; -import {getPost} from 'mattermost-redux/selectors/entities/posts'; - import Markdown from './markdown'; type Props = { diff --git a/webapp/channels/src/components/member_list_channel/index.ts b/webapp/channels/src/components/member_list_channel/index.ts index 23b307cc78..bb8f936809 100644 --- a/webapp/channels/src/components/member_list_channel/index.ts +++ b/webapp/channels/src/components/member_list_channel/index.ts @@ -4,8 +4,7 @@ import {connect} from 'react-redux'; import {bindActionCreators, Dispatch, ActionCreatorsMapObject} from 'redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {searchProfilesInCurrentChannel, getProfilesInCurrentChannel} from 'mattermost-redux/selectors/entities/users'; import {getMembersInCurrentChannel, getCurrentChannelStats, getCurrentChannel} from 'mattermost-redux/selectors/entities/channels'; import {getMembersInCurrentTeam} from 'mattermost-redux/selectors/entities/teams'; diff --git a/webapp/channels/src/components/more_channels/index.ts b/webapp/channels/src/components/more_channels/index.ts index d21425d99e..80bfd4a8c1 100644 --- a/webapp/channels/src/components/more_channels/index.ts +++ b/webapp/channels/src/components/more_channels/index.ts @@ -4,8 +4,7 @@ import {connect} from 'react-redux'; import {ActionCreatorsMapObject, bindActionCreators, Dispatch} from 'redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {RequestStatus} from 'mattermost-redux/constants'; import {Channel} from '@mattermost/types/channels'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; diff --git a/webapp/channels/src/components/more_direct_channels/list/index.ts b/webapp/channels/src/components/more_direct_channels/list/index.ts index 1a5a9978fa..d78bf7a5fc 100644 --- a/webapp/channels/src/components/more_direct_channels/list/index.ts +++ b/webapp/channels/src/components/more_direct_channels/list/index.ts @@ -3,8 +3,7 @@ import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getAllChannels, getChannelsWithUserProfiles} from 'mattermost-redux/selectors/entities/channels'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/components/new_replies_banner/index.ts b/webapp/channels/src/components/new_replies_banner/index.ts index 42fc9fcac7..4f47410176 100644 --- a/webapp/channels/src/components/new_replies_banner/index.ts +++ b/webapp/channels/src/components/new_replies_banner/index.ts @@ -4,11 +4,10 @@ import {bindActionCreators, Dispatch} from 'redux'; import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; - import {Post} from '@mattermost/types/posts'; -import {GenericAction} from 'mattermost-redux/types/actions'; +import {GenericAction} from 'mattermost-redux/types/actions'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {makeGetPostsForThread} from 'mattermost-redux/selectors/entities/posts'; import {getCurrentUser} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/components/post_markdown/index.ts b/webapp/channels/src/components/post_markdown/index.ts index 750d91d793..d558f7c926 100644 --- a/webapp/channels/src/components/post_markdown/index.ts +++ b/webapp/channels/src/components/post_markdown/index.ts @@ -3,7 +3,7 @@ import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getChannel} from 'mattermost-redux/selectors/entities/channels'; import { getMyGroupMentionKeysForChannel, diff --git a/webapp/channels/src/components/post_view/reaction/index.ts b/webapp/channels/src/components/post_view/reaction/index.ts index fff3ceeb7c..7fdd4bcb8a 100644 --- a/webapp/channels/src/components/post_view/reaction/index.ts +++ b/webapp/channels/src/components/post_view/reaction/index.ts @@ -4,8 +4,7 @@ import {connect} from 'react-redux'; import {bindActionCreators, Dispatch} from 'redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {removeReaction} from 'mattermost-redux/actions/posts'; import {getMissingProfilesByIds} from 'mattermost-redux/actions/users'; diff --git a/webapp/channels/src/components/post_view/reaction/reaction_tooltip/index.ts b/webapp/channels/src/components/post_view/reaction/reaction_tooltip/index.ts index b363a39753..1848315bc7 100644 --- a/webapp/channels/src/components/post_view/reaction/reaction_tooltip/index.ts +++ b/webapp/channels/src/components/post_view/reaction/reaction_tooltip/index.ts @@ -3,8 +3,7 @@ import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentUserId, makeGetProfilesForReactions} from 'mattermost-redux/selectors/entities/users'; import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences'; diff --git a/webapp/channels/src/components/rename_channel_modal/index.ts b/webapp/channels/src/components/rename_channel_modal/index.ts index 1c793b9cb8..bcf9a48a8c 100644 --- a/webapp/channels/src/components/rename_channel_modal/index.ts +++ b/webapp/channels/src/components/rename_channel_modal/index.ts @@ -4,8 +4,7 @@ import {ActionCreatorsMapObject, bindActionCreators, Dispatch} from 'redux'; import {connect} from 'react-redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {patchChannel} from 'mattermost-redux/actions/channels'; import {getTeam} from 'mattermost-redux/selectors/entities/teams'; import {GlobalState} from '@mattermost/types/store'; diff --git a/webapp/channels/src/components/system_notice/index.ts b/webapp/channels/src/components/system_notice/index.ts index 5e0a173126..6b335c2332 100644 --- a/webapp/channels/src/components/system_notice/index.ts +++ b/webapp/channels/src/components/system_notice/index.ts @@ -4,8 +4,7 @@ import {connect} from 'react-redux'; import {bindActionCreators, Dispatch} from 'redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {makeGetCategory} from 'mattermost-redux/selectors/entities/preferences'; import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general'; import {haveISystemPermission} from 'mattermost-redux/selectors/entities/roles'; diff --git a/webapp/channels/src/components/toast_wrapper/index.ts b/webapp/channels/src/components/toast_wrapper/index.ts index e8d5a186a3..99b9edd4b7 100644 --- a/webapp/channels/src/components/toast_wrapper/index.ts +++ b/webapp/channels/src/components/toast_wrapper/index.ts @@ -7,8 +7,7 @@ import {withRouter} from 'react-router-dom'; import {GlobalState} from 'types/store/index'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {Posts} from 'mattermost-redux/constants'; import {getAllPosts, getPostIdsInChannel} from 'mattermost-redux/selectors/entities/posts'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/components/user_group_popover/group_member_list/index.ts b/webapp/channels/src/components/user_group_popover/group_member_list/index.ts index eeeed01211..eb2d6c290c 100644 --- a/webapp/channels/src/components/user_group_popover/group_member_list/index.ts +++ b/webapp/channels/src/components/user_group_popover/group_member_list/index.ts @@ -18,7 +18,7 @@ import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities import {openDirectChannelToUserId} from 'actions/channel_actions'; import {closeRightHandSide} from 'actions/views/rhs'; -import {createSelector} from 'reselect'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {displayUsername} from 'mattermost-redux/utils/user_utils'; import GroupMemberList, {GroupMember} from './group_member_list'; diff --git a/webapp/channels/src/packages/reselect/src/index.d.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/create_selector/index.d.ts similarity index 100% rename from webapp/channels/src/packages/reselect/src/index.d.ts rename to webapp/channels/src/packages/mattermost-redux/src/selectors/create_selector/index.d.ts diff --git a/webapp/channels/src/packages/reselect/src/index.js b/webapp/channels/src/packages/mattermost-redux/src/selectors/create_selector/index.js similarity index 100% rename from webapp/channels/src/packages/reselect/src/index.js rename to webapp/channels/src/packages/mattermost-redux/src/selectors/create_selector/index.js diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/admin.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/admin.ts index ec3b45b5a5..8c79cf1537 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/admin.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/admin.ts @@ -1,14 +1,14 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {DataRetentionCustomPolicies, DataRetentionCustomPolicy} from '@mattermost/types/data_retention'; import {PluginStatusRedux} from '@mattermost/types/plugins'; import {GlobalState} from '@mattermost/types/store'; import {LogObject} from '@mattermost/types/admin'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; + export function getLogs(state: GlobalState) { return state.entities.admin.logs; } diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/apps.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/apps.ts index 2a3af2e15d..556188f65a 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/apps.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/apps.ts @@ -1,12 +1,11 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {GlobalState} from '@mattermost/types/store'; import {AppBinding} from '@mattermost/types/apps'; import {ClientConfig} from '@mattermost/types/config'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; import {AppBindingLocations} from 'mattermost-redux/constants/apps'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/bots.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/bots.ts index de5fe0a74d..395d542ab6 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/bots.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/bots.ts @@ -1,11 +1,11 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {Bot} from '@mattermost/types/bots'; import {GlobalState} from '@mattermost/types/store'; + import {getUsers} from 'mattermost-redux/selectors/entities/common'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; export const ExternalBotAccountNames: string[] = ['mattermost-advisor']; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts index f714b8cb7b..91b7c638f7 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts @@ -3,8 +3,7 @@ import shallowEquals from 'shallow-equals'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {General, Preferences} from 'mattermost-redux/constants'; import {CategoryTypes} from 'mattermost-redux/constants/channel_categories'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channels.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channels.ts index f629c09783..a84b797244 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channels.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channels.ts @@ -50,8 +50,7 @@ import { import {createIdsSelector} from 'mattermost-redux/utils/helpers'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import { Channel, ChannelMemberCountsByGroup, diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/common.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/common.ts index df49a50724..143575c5ac 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/common.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/common.ts @@ -1,14 +1,14 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {ChannelMembership, Channel} from '@mattermost/types/channels'; import {TeamMembership} from '@mattermost/types/teams'; import {GlobalState} from '@mattermost/types/store'; import {UserProfile} from '@mattermost/types/users'; import {RelationOneToOne, IDMappedObjects} from '@mattermost/types/utilities'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; + const CALLS_PLUGIN = 'plugins-com.mattermost.calls'; type CallsConfig = { diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/emojis.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/emojis.ts index 102bfb8511..323bcd66d4 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/emojis.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/emojis.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; import {CustomEmoji} from '@mattermost/types/emojis'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/files.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/files.ts index 694b5798b3..b600c53684 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/files.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/files.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentUserLocale} from 'mattermost-redux/selectors/entities/i18n'; import {FileInfo, FileSearchResultItem} from '@mattermost/types/files'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/general.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/general.ts index 0c335a969a..7885025d9c 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/general.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/general.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {General} from 'mattermost-redux/constants'; import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.ts index 0220f48839..d67dedd74b 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/groups.ts @@ -1,15 +1,14 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {GlobalState} from '@mattermost/types/store'; import {Group, GroupSource} from '@mattermost/types/groups'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {filterGroupsMatchingTerm, sortGroups} from 'mattermost-redux/utils/group_utils'; import {getChannel} from 'mattermost-redux/selectors/entities/channels'; import {getTeam} from 'mattermost-redux/selectors/entities/teams'; import {UserMentionKey} from 'mattermost-redux/selectors/entities/users'; -import {GlobalState} from '@mattermost/types/store'; import {getCurrentUserLocale} from './i18n'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/insights.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/insights.ts index 8f8f2a7724..446f416549 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/insights.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/insights.ts @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {GlobalState} from '@mattermost/types/store'; import {TimeFrame, TimeFrames, TopReaction} from '@mattermost/types/insights'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/integrations.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/integrations.ts index 83748d9150..a75d2e5cd4 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/integrations.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/integrations.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams'; import {OutgoingWebhook, Command} from '@mattermost/types/integrations'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/jobs.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/jobs.ts index 0773e092f9..3dacd232e5 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/jobs.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/jobs.ts @@ -1,12 +1,12 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {JobType, Job, JobsByType} from '@mattermost/types/jobs'; import {GlobalState} from '@mattermost/types/store'; import {IDMappedObjects} from '@mattermost/types/utilities'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; + export function getAllJobs(state: GlobalState): IDMappedObjects { return state.entities.jobs.jobs; } diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts index 897177a504..ce50bba0eb 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/posts.ts @@ -1,10 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {Posts, Preferences} from 'mattermost-redux/constants'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentUser} from 'mattermost-redux/selectors/entities/common'; import {getMyPreferences} from 'mattermost-redux/selectors/entities/preferences'; import {getUsers, getCurrentUserId, getUserStatuses} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts index 4a05ed42d5..2fa981c5db 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/preferences.ts @@ -1,10 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {General, Preferences} from 'mattermost-redux/constants'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getConfig, getFeatureFlagValue, getLicense} from 'mattermost-redux/selectors/entities/general'; import {getCurrentUser} from 'mattermost-redux/selectors/entities/users'; import {isGuest} from 'mattermost-redux/utils/user_utils'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles.ts index 64c889fc6d..e742d25c77 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentChannelId} from 'mattermost-redux/selectors/entities/common'; import { getMySystemPermissions, diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles_helpers.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles_helpers.ts index bffdd90927..e9ff1b1442 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles_helpers.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/roles_helpers.ts @@ -1,14 +1,13 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - -import {getCurrentUser} from 'mattermost-redux/selectors/entities/common'; - import {Role} from '@mattermost/types/roles'; import {GlobalState} from '@mattermost/types/store'; import {UserProfile} from '@mattermost/types/users'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; +import {getCurrentUser} from 'mattermost-redux/selectors/entities/common'; + export type PermissionsOptions = { channel?: string; team?: string; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/schemes.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/schemes.ts index a2aaa355ae..de13e17706 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/schemes.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/schemes.ts @@ -1,10 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {ScopeTypes} from 'mattermost-redux/constants/schemes'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getAllChannels} from 'mattermost-redux/selectors/entities/channels'; import {getTeams} from 'mattermost-redux/selectors/entities/teams'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/search.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/search.ts index 451ad5606c..cf13ef3777 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/search.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/search.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams'; import {getCurrentUserMentionKeys, UserMentionKey} from 'mattermost-redux/selectors/entities/users'; import {getMyGroupMentionKeys} from 'mattermost-redux/selectors/entities/groups'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/teams.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/teams.ts index 4581ff597c..0e0d608eb4 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/teams.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/teams.ts @@ -1,10 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {Permissions} from 'mattermost-redux/constants'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getConfig, isCompatibleWithJoinViewTeamPermissions} from 'mattermost-redux/selectors/entities/general'; import {haveISystemPermission} from 'mattermost-redux/selectors/entities/roles_helpers'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/threads.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/threads.ts index 97fcc9d1f5..d0bf6c3274 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/threads.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/threads.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams'; import {GlobalState} from '@mattermost/types/store'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/timezone.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/timezone.ts index 5ff93935cd..67208fecc9 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/timezone.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/timezone.ts @@ -5,7 +5,8 @@ import timezones from 'timezones.json'; import {GlobalState} from '@mattermost/types/store'; import {UserProfile} from '@mattermost/types/users'; -import {createSelector} from 'reselect'; + +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getTimezoneLabel, getUserCurrentTimezone} from 'mattermost-redux/utils/timezone_utils'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/typing.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/typing.ts index 194b1bca26..7a3765063d 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/typing.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/typing.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getUsers} from 'mattermost-redux/selectors/entities/common'; import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/users.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/users.ts index 131a60a281..5bd27e31a2 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/users.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/users.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import { getCurrentChannelId, getCurrentUser, diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/utils.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/utils.ts index 626b9fbcca..dda07c90ee 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/utils.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/utils.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getMyChannelMemberships, getAllDmChannels} from 'mattermost-redux/selectors/entities/channels'; import {getCurrentUserId, getUserStatuses} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/packages/mattermost-redux/src/utils/helpers.ts b/webapp/channels/src/packages/mattermost-redux/src/utils/helpers.ts index 3cb592d78b..452ecf1647 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/utils/helpers.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/utils/helpers.ts @@ -3,7 +3,7 @@ import shallowEqual from 'shallow-equals'; -import * as reselect from 'reselect'; +import {createSelectorCreator, defaultMemoize} from 'mattermost-redux/selectors/create_selector'; // eslint-disable-next-line @typescript-eslint/ban-types export function memoizeResult(func: F, measure: Function | undefined = undefined): F { @@ -32,10 +32,10 @@ export function memoizeResult(func: F, measure: Function | u // Use this selector when you want a shallow comparison of the arguments and you want to memoize the result // try and use this only when your selector returns an array of ids -export const createIdsSelector = reselect.createSelectorCreator(memoizeResult); +export const createIdsSelector = createSelectorCreator(memoizeResult); // Use this selector when you want a shallow comparison of the arguments and you don't need to memoize the result -export const createShallowSelector = reselect.createSelectorCreator(reselect.defaultMemoize, shallowEqual as any); +export const createShallowSelector = createSelectorCreator(defaultMemoize, shallowEqual as any); // isMinimumServerVersion will return true if currentVersion is equal to higher or than the // the provided minimum version. A non-equal major version will ignore minor and dot diff --git a/webapp/channels/src/packages/mattermost-redux/src/utils/post_list.ts b/webapp/channels/src/packages/mattermost-redux/src/utils/post_list.ts index 5bd511616f..73f293c0ca 100644 --- a/webapp/channels/src/packages/mattermost-redux/src/utils/post_list.ts +++ b/webapp/channels/src/packages/mattermost-redux/src/utils/post_list.ts @@ -3,10 +3,9 @@ import moment from 'moment-timezone'; -import * as reselect from 'reselect'; - import {Posts, Preferences} from 'mattermost-redux/constants'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {makeGetPostsForIds, UserActivityPost} from 'mattermost-redux/selectors/entities/posts'; import {getBool} from 'mattermost-redux/selectors/entities/preferences'; import {isTimezoneEnabled} from 'mattermost-redux/selectors/entities/timezone'; @@ -275,7 +274,7 @@ export function makeGenerateCombinedPost(): (state: GlobalState, combinedId: str const getPostsForIds = makeGetPostsForIds(); const getPostIds = memoizeResult(getPostIdsForCombinedUserActivityPost); - return reselect.createSelector( + return createSelector( 'makeGenerateCombinedPost', (state: GlobalState, combinedId: string) => combinedId, (state: GlobalState, combinedId: string) => getPostsForIds(state, getPostIds(combinedId)), diff --git a/webapp/channels/src/selectors/admin_console.jsx b/webapp/channels/src/selectors/admin_console.jsx index 754894278e..d89351afe2 100644 --- a/webapp/channels/src/selectors/admin_console.jsx +++ b/webapp/channels/src/selectors/admin_console.jsx @@ -3,8 +3,7 @@ import {cloneDeep} from 'lodash'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getMySystemPermissions} from 'mattermost-redux/selectors/entities/roles_helpers'; import {ResourceToSysConsolePermissionsTable, RESOURCE_KEYS} from 'mattermost-redux/constants/permissions_sysconsole'; diff --git a/webapp/channels/src/selectors/cloud.ts b/webapp/channels/src/selectors/cloud.ts index ebf683afdd..0cfc22f04b 100644 --- a/webapp/channels/src/selectors/cloud.ts +++ b/webapp/channels/src/selectors/cloud.ts @@ -4,7 +4,7 @@ import {Invoice, Subscription} from '@mattermost/types/cloud'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; -import {createSelector} from 'reselect'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {GlobalState} from 'types/store'; diff --git a/webapp/channels/src/selectors/drafts.ts b/webapp/channels/src/selectors/drafts.ts index eb7606823a..329a542d22 100644 --- a/webapp/channels/src/selectors/drafts.ts +++ b/webapp/channels/src/selectors/drafts.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getMyActiveChannelIds} from 'mattermost-redux/selectors/entities/channels'; import {get, onboardingTourTipsEnabled} from 'mattermost-redux/selectors/entities/preferences'; diff --git a/webapp/channels/src/selectors/emojis.ts b/webapp/channels/src/selectors/emojis.ts index c4ceb90b46..ea6395e15b 100644 --- a/webapp/channels/src/selectors/emojis.ts +++ b/webapp/channels/src/selectors/emojis.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCustomEmojisByName} from 'mattermost-redux/selectors/entities/emojis'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; diff --git a/webapp/channels/src/selectors/lhs.ts b/webapp/channels/src/selectors/lhs.ts index 9933159e40..308fefaf6e 100644 --- a/webapp/channels/src/selectors/lhs.ts +++ b/webapp/channels/src/selectors/lhs.ts @@ -1,9 +1,10 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; import {GlobalState} from 'types/store'; import {StaticPage} from 'types/store/lhs'; + +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {makeGetDraftsCount} from 'selectors/drafts'; import { insightsAreEnabled, diff --git a/webapp/channels/src/selectors/onboarding.ts b/webapp/channels/src/selectors/onboarding.ts index 0e9af42651..00c7c63c04 100644 --- a/webapp/channels/src/selectors/onboarding.ts +++ b/webapp/channels/src/selectors/onboarding.ts @@ -3,8 +3,7 @@ import {isMobile} from 'utils/utils'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {makeGetCategory, getBool} from 'mattermost-redux/selectors/entities/preferences'; import {getCurrentUser, isFirstAdmin} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/selectors/plugins.ts b/webapp/channels/src/selectors/plugins.ts index 95198d0b76..b4f4ab3781 100644 --- a/webapp/channels/src/selectors/plugins.ts +++ b/webapp/channels/src/selectors/plugins.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {appBarEnabled, getAppBarAppBindings} from 'mattermost-redux/selectors/entities/apps'; import {createShallowSelector} from 'mattermost-redux/utils/helpers'; diff --git a/webapp/channels/src/selectors/posts.ts b/webapp/channels/src/selectors/posts.ts index d45932f045..07d708b51a 100644 --- a/webapp/channels/src/selectors/posts.ts +++ b/webapp/channels/src/selectors/posts.ts @@ -1,10 +1,9 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - import {Post} from '@mattermost/types/posts'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getPost} from 'mattermost-redux/selectors/entities/posts'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/selectors/rhs.ts b/webapp/channels/src/selectors/rhs.ts index 4e5b106b79..a54c631dad 100644 --- a/webapp/channels/src/selectors/rhs.ts +++ b/webapp/channels/src/selectors/rhs.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels'; import {Post, PostType} from '@mattermost/types/posts'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/selectors/views/channel_sidebar.ts b/webapp/channels/src/selectors/views/channel_sidebar.ts index b3aee60335..4ef55a444f 100644 --- a/webapp/channels/src/selectors/views/channel_sidebar.ts +++ b/webapp/channels/src/selectors/views/channel_sidebar.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import { getAllChannels, getCurrentChannelId, diff --git a/webapp/channels/src/selectors/views/custom_status.ts b/webapp/channels/src/selectors/views/custom_status.ts index cd536331a7..920e2d21b9 100644 --- a/webapp/channels/src/selectors/views/custom_status.ts +++ b/webapp/channels/src/selectors/views/custom_status.ts @@ -3,8 +3,7 @@ import moment from 'moment-timezone'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentTimezone} from 'mattermost-redux/selectors/entities/timezone'; import {getCurrentUser, getUser} from 'mattermost-redux/selectors/entities/users'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; diff --git a/webapp/channels/src/selectors/views/marketplace.ts b/webapp/channels/src/selectors/views/marketplace.ts index dcaf41ca0c..2a3da099fd 100644 --- a/webapp/channels/src/selectors/views/marketplace.ts +++ b/webapp/channels/src/selectors/views/marketplace.ts @@ -1,11 +1,11 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - -import {isPlugin} from 'mattermost-redux/utils/marketplace'; import type {MarketplaceApp, MarketplacePlugin} from '@mattermost/types/marketplace'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; +import {isPlugin} from 'mattermost-redux/utils/marketplace'; + import {GlobalState} from 'types/store'; export const getPlugins = (state: GlobalState): MarketplacePlugin[] => state.views.marketplace.plugins; diff --git a/webapp/channels/src/selectors/views/threads.ts b/webapp/channels/src/selectors/views/threads.ts index 3f0f1ac081..2ade54479e 100644 --- a/webapp/channels/src/selectors/views/threads.ts +++ b/webapp/channels/src/selectors/views/threads.ts @@ -3,8 +3,7 @@ import moment from 'moment'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {makeGetPostsForIds} from 'mattermost-redux/selectors/entities/posts'; import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams'; import {getThreads} from 'mattermost-redux/selectors/entities/threads'; diff --git a/webapp/channels/src/selectors/work_template.ts b/webapp/channels/src/selectors/work_template.ts index cbeb19cc3a..28034839bd 100644 --- a/webapp/channels/src/selectors/work_template.ts +++ b/webapp/channels/src/selectors/work_template.ts @@ -1,8 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getFeatureFlagValue, getLicense} from 'mattermost-redux/selectors/entities/general'; import {GlobalState} from 'types/store'; import {haveICurrentTeamPermission} from 'mattermost-redux/selectors/entities/roles'; diff --git a/webapp/channels/src/stores/hooks.ts b/webapp/channels/src/stores/hooks.ts index 0ad7a56eb2..7134de0905 100644 --- a/webapp/channels/src/stores/hooks.ts +++ b/webapp/channels/src/stores/hooks.ts @@ -4,8 +4,7 @@ import {useCallback} from 'react'; import {useSelector, useDispatch, shallowEqual} from 'react-redux'; -import {createSelector} from 'reselect'; - +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams'; import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users'; diff --git a/webapp/channels/src/utils/post_utils.ts b/webapp/channels/src/utils/post_utils.ts index d7dfb01d5d..feac4ef623 100644 --- a/webapp/channels/src/utils/post_utils.ts +++ b/webapp/channels/src/utils/post_utils.ts @@ -2,17 +2,14 @@ // See LICENSE.txt for license information. import {IntlShape, useIntl} from 'react-intl'; - import {useMemo} from 'react'; - import {useSelector} from 'react-redux'; -import {createSelector} from 'reselect'; - import {Client4} from 'mattermost-redux/client'; import {Permissions, Posts} from 'mattermost-redux/constants'; +import {createSelector} from 'mattermost-redux/selectors/create_selector'; import {getChannel} from 'mattermost-redux/selectors/entities/channels'; import {getConfig} from 'mattermost-redux/selectors/entities/general'; import {makeGetReactionsForPost} from 'mattermost-redux/selectors/entities/posts'; diff --git a/webapp/channels/tsconfig.json b/webapp/channels/tsconfig.json index 2e3a0be10f..6cf89b88df 100644 --- a/webapp/channels/tsconfig.json +++ b/webapp/channels/tsconfig.json @@ -25,7 +25,6 @@ "composite": true, "paths": { "mattermost-redux/*": ["packages/mattermost-redux/src/*"], - "reselect": ["packages/reselect/src"], "@mui/styled-engine": ["./node_modules/@mui/styled-engine-sc"], } }, diff --git a/webapp/channels/webpack.config.js b/webapp/channels/webpack.config.js index 16c018ccd1..5dec7e60a0 100644 --- a/webapp/channels/webpack.config.js +++ b/webapp/channels/webpack.config.js @@ -134,7 +134,6 @@ var config = { alias: { 'mattermost-redux/test': 'packages/mattermost-redux/test', 'mattermost-redux': 'packages/mattermost-redux/src', - reselect: 'packages/reselect/src', '@mui/styled-engine': '@mui/styled-engine-sc', }, extensions: ['.ts', '.tsx', '.js', '.jsx'], diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 21b8789535..f9d308e4d8 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -28284,9 +28284,9 @@ "dev": true }, "node_modules/reselect": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.7.tgz", - "integrity": "sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==" + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", + "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==" }, "node_modules/resize-observer-polyfill": { "version": "1.5.1", @@ -33824,6 +33824,7 @@ "react-select": "4.3.1", "react-use": "17.3.2", "redux": "4.1.2", + "reselect": "4.1.8", "styled-components": "5.3.3", "typescript": "4.7.4" }, @@ -55522,6 +55523,7 @@ "redux": "4.1.2", "redux-mock-store": "1.5.4", "redux-thunk": "2.4.1", + "reselect": "4.1.8", "style-loader": "3.3.1", "styled-components": "5.3.3", "ts-prune": "0.10.3", @@ -58110,9 +58112,9 @@ "dev": true }, "reselect": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.7.tgz", - "integrity": "sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==" + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", + "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==" }, "resize-observer-polyfill": { "version": "1.5.1", diff --git a/webapp/playbooks/jest.config.js b/webapp/playbooks/jest.config.js index 209ee1b2db..f33b9b00c3 100644 --- a/webapp/playbooks/jest.config.js +++ b/webapp/playbooks/jest.config.js @@ -10,7 +10,6 @@ const config = { '^@mattermost/(client)$': '/../platform/$1/src', '^@mattermost/(types)/(.*)$': '/../platform/$1/src/$2', '^mattermost-redux/(.*)$': '/../channels/src/packages/mattermost-redux/src/$1', - '^reselect$': '/../channels/src/packages/reselect/src', '^src/(.*)$': '/src/$1', }, testEnvironment: 'jsdom', diff --git a/webapp/playbooks/package.json b/webapp/playbooks/package.json index 9d18676867..6a88a5f5a0 100644 --- a/webapp/playbooks/package.json +++ b/webapp/playbooks/package.json @@ -35,6 +35,7 @@ "react-select": "4.3.1", "react-use": "17.3.2", "redux": "4.1.2", + "reselect": "4.1.8", "styled-components": "5.3.3", "typescript": "4.7.4" }, diff --git a/webapp/playbooks/src/components/backstage/channel_selector.tsx b/webapp/playbooks/src/components/backstage/channel_selector.tsx index fc3c1b3203..f223f9eeba 100644 --- a/webapp/playbooks/src/components/backstage/channel_selector.tsx +++ b/webapp/playbooks/src/components/backstage/channel_selector.tsx @@ -32,7 +32,6 @@ export interface Props { } const getAllPublicChannelsInTeam = (teamId: string) => createSelector( - 'getAllPublicChannelsInTeam', getAllChannels, getChannelsInTeam, (allChannels: IDMappedObjects, channelsByTeam: RelationOneToMany): Channel[] => { @@ -48,7 +47,6 @@ const getAllPublicChannelsInTeam = (teamId: string) => createSelector( ); const getMyPublicAndPrivateChannelsInTeam = (teamId: string) => createSelector( - 'getMyPublicAndPrivateChannelsInTeam', getAllChannels, getChannelsInTeam, getMyChannelMemberships, diff --git a/webapp/playbooks/src/selectors.ts b/webapp/playbooks/src/selectors.ts index a729c14d5b..1735bc271e 100644 --- a/webapp/playbooks/src/selectors.ts +++ b/webapp/playbooks/src/selectors.ts @@ -96,7 +96,6 @@ export const canIPostUpdateForRun = (state: GlobalState, channelId: string, team }; export const inPlaybookRunChannel = createSelector( - 'inPlaybookRunChannel', getCurrentTeamId, getCurrentChannelId, myPlaybookRunsByTeam, @@ -106,7 +105,6 @@ export const inPlaybookRunChannel = createSelector( ); export const currentPlaybookRun = createSelector( - 'currentPlaybookRun', getCurrentTeamId, getCurrentChannelId, myPlaybookRunsByTeam, @@ -118,7 +116,6 @@ export const currentPlaybookRun = createSelector( const emptyChecklistState = {} as Record; export const currentChecklistCollapsedState = (stateKey: string) => createSelector( - 'currentChecklistCollapsedState', pluginState, (plugin) => { return plugin.checklistCollapsedState[stateKey] ?? emptyChecklistState; @@ -126,7 +123,6 @@ export const currentChecklistCollapsedState = (stateKey: string) => createSelect ); export const currentChecklistAllCollapsed = (stateKey: string) => createSelector( - 'currentChecklistAllCollapsed', currentChecklistCollapsedState(stateKey), (checklistsState) => { if (Object.entries(checklistsState).length === 0) { @@ -147,7 +143,6 @@ export const currentChecklistItemsFilter = (state: GlobalState, stateKey: string }; export const myActivePlaybookRunsList = createSelector( - 'myActivePlaybookRunsList', getCurrentTeamId, myPlaybookRunsByTeam, (teamId, playbookRunMapByTeam) => { @@ -169,7 +164,6 @@ export const myPlaybookRunsMap = (state: GlobalState) => { }; export const lastUpdatedByPlaybookRunId = createSelector( - 'lastUpdatedByPlaybookRunId', getCurrentTeamId, myPlaybookRunsByTeam, (teamId, playbookRunsMapByTeam) => { @@ -225,7 +219,6 @@ export const isPlaybookActionsModalVisible = (state: GlobalState): boolean => pluginState(state).playbookActionsModalVisibility; export const isCurrentUserAdmin = createSelector( - 'isCurrentUserAdmin', getCurrentUser, (user) => { const rolesArray = user.roles.split(' '); @@ -234,7 +227,6 @@ export const isCurrentUserAdmin = createSelector( ); export const isCurrentUserChannelAdmin = createSelector( - 'isCurrentUserChannelAdmin', getMyCurrentChannelMembership, (membership) => { return membership?.scheme_admin || false; @@ -242,7 +234,6 @@ export const isCurrentUserChannelAdmin = createSelector( ); export const isCurrentUserChannelMember = (channelId: string) => createSelector( - 'isCurrentUserChannelMember', getMyChannelMemberships, (memberships) => { return memberships[channelId]?.scheme_user || memberships[channelId]?.scheme_admin || false; @@ -252,7 +243,6 @@ export const isCurrentUserChannelMember = (channelId: string) => createSelector( export const hasViewedByChannelID = (state: GlobalState) => pluginState(state).hasViewedByChannel; export const isTeamEdition = createSelector( - 'isTeamEdition', getConfig, (config) => config.BuildEnterpriseReady !== 'true', ); @@ -260,7 +250,6 @@ export const isTeamEdition = createSelector( const rhsAboutCollapsedState = (state: GlobalState): Record => pluginState(state).rhsAboutCollapsedByChannel; export const currentRHSAboutCollapsedState = createSelector( - 'currentRHSAboutCollapsedState', getCurrentChannelId, rhsAboutCollapsedState, (channelId, stateByChannel) => { @@ -280,7 +269,6 @@ export const selectExperimentalFeatures = (state: GlobalState) => Boolean(global // Select tasks assigned to the current user, or unassigned but belonging to a run owned by the // current user. export const selectMyTasks = createSelector( - 'selectMyTasks', myPlaybookRuns, getCurrentUser, (playbookRuns, currentUser) => Object @@ -331,7 +319,6 @@ export const isTaskOverdue = (item: ChecklistItem) => { // Determine if there are overdue tasks assigned to the current user, or unassigned but belonging // to a run owned by the current user. export const selectHasOverdueTasks = createSelector( - 'hasOverdueTasks', selectMyTasks, (myTasks) => myTasks.some((checklistItem) => isTaskOverdue(checklistItem)) ); diff --git a/webapp/playbooks/tsconfig.json b/webapp/playbooks/tsconfig.json index 7d1f24bc31..a05626126f 100644 --- a/webapp/playbooks/tsconfig.json +++ b/webapp/playbooks/tsconfig.json @@ -25,7 +25,6 @@ "paths": { "src": ["src"], "mattermost-redux/*": ["../channels/src/packages/mattermost-redux/src/*"], - "reselect": ["../channels/src/packages/reselect/src"] } }, "include": [ diff --git a/webapp/playbooks/webpack.config.js b/webapp/playbooks/webpack.config.js index 9ea491e2bf..efe8858f83 100644 --- a/webapp/playbooks/webpack.config.js +++ b/webapp/playbooks/webpack.config.js @@ -23,7 +23,6 @@ const config = { alias: { src: path.resolve(__dirname, './src/'), 'mattermost-redux': path.resolve(__dirname, '../channels/src/packages/mattermost-redux/src/'), - reselect: path.resolve(__dirname, '../channels/src/packages/reselect/src/index'), '@mattermost/client': path.resolve(__dirname, '../platform/client/src/'), '@mattermost/components': path.resolve(__dirname, '../platform/components/src/'), },