Fix types of various fields in GlobalState (mattermost#26125)

* Fix types of entities.admin.analytics and entities.admin.teamAnalytics * Fix type of entities.channels.channelsInTeam * Fix types of entities.users.stats and entities.users.filteredStats * Fix types of various profilesInX fields in entities.users * Fix incorrect field name last_password_update_at used when updating password We never noticed this bug before because the settings modal reloads the current user after updating their password. * MM-56760 Fix users not being removed from state.entities.users properly
devinbinnie · Feb 15, 2024 · 54507bb · 54507bb
1 parent 64b1409
commit 54507bb
Show file tree

Hide file tree

Showing 48 changed files with 316 additions and 217 deletions.
diff --git a/webapp/channels/src/actions/channel_actions.test.ts b/webapp/channels/src/actions/channel_actions.test.ts
@@ -44,7 +44,7 @@ const initialState = {
                 }),
             },
             channelsInTeam: {
-                'team-id': ['current_channel_id'],
+                'team-id': new Set(['asdf']),
             },
             messageCounts: {
                 current_channel_id: {total: 10},

diff --git a/webapp/channels/src/actions/global_actions.test.ts b/webapp/channels/src/actions/global_actions.test.ts
@@ -112,8 +112,8 @@ describe('actions/global_actions', () => {
                             },
                         },
                         channelsInTeam: {
-                            team1: ['channel-in-team-1'],
-                            team2: ['channel-in-team-2'],
+                            team1: new Set(['channel-in-team-1']),
+                            team2: new Set(['channel-in-team-2']),
                         },
                     },
                     users: {
@@ -185,8 +185,8 @@ describe('actions/global_actions', () => {
                             },
                         },
                         channelsInTeam: {
-                            team1: ['channel-in-team-1'],
-                            team2: ['channel-in-team-2'],
+                            team1: new Set(['channel-in-team-1']),
+                            team2: new Set(['channel-in-team-2']),
                         },
                     },
                     users: {
@@ -257,8 +257,8 @@ describe('actions/global_actions', () => {
                             },
                         },
                         channelsInTeam: {
-                            team1: ['channel-in-team-1'],
-                            team2: ['channel-in-team-2'],
+                            team1: new Set(['channel-in-team-1']),
+                            team2: new Set(['channel-in-team-2']),
                         },
                     },
                     users: {
@@ -382,8 +382,8 @@ describe('actions/global_actions', () => {
                             },
                         },
                         channelsInTeam: {
-                            team1: ['channel-in-team-1', directChannelId],
-                            team2: ['channel-in-team-2'],
+                            team1: new Set(['channel-in-team-1', directChannelId]),
+                            team2: new Set(['channel-in-team-2']),
                         },
                     },
                     users: {
@@ -479,8 +479,8 @@ describe('actions/global_actions', () => {
                             },
                         },
                         channelsInTeam: {
-                            team1: ['channel-in-team-1', directChannelId, groupChannelId],
-                            team2: ['channel-in-team-2'],
+                            team1: new Set(['channel-in-team-1', directChannelId, groupChannelId]),
+                            team2: new Set(['channel-in-team-2']),
                         },
                     },
                     users: {
@@ -554,8 +554,8 @@ describe('actions/global_actions', () => {
                             },
                         },
                         channelsInTeam: {
-                            team1: ['channel-in-team-1'],
-                            team2: ['channel-in-team-2'],
+                            team1: new Set(['channel-in-team-1']),
+                            team2: new Set(['channel-in-team-2']),
                         },
                     },
                     users: {

diff --git a/webapp/channels/src/actions/status_actions.test.ts b/webapp/channels/src/actions/status_actions.test.ts
@@ -12,8 +12,6 @@ import * as Actions from 'actions/status_actions';
 
 import mockStore from 'tests/test_store';
 
-import type {GlobalState} from 'types/store';
-
 jest.mock('mattermost-redux/actions/users', () => ({
     getStatusesByIds: jest.fn(() => {
         return {type: ''};
@@ -38,7 +36,7 @@ describe('actions/status_actions', () => {
                 currentChannelId: 'channel_id1',
                 channels: {channel_id1: {id: 'channel_id1', name: 'channel1', team_id: 'team_id1'}, channel_id2: {id: 'channel_id2', name: 'channel2', team_id: 'team_id1'}},
                 myMembers: {channel_id1: {channel_id: 'channel_id1', user_id: 'current_user_id'}},
-                channelsInTeam: {team_id1: ['channel_id1']},
+                channelsInTeam: {team_id1: new Set(['channel_id1'])},
             },
             general: {
                 config: {
@@ -76,7 +74,7 @@ describe('actions/status_actions', () => {
                 },
             },
         },
-    } as unknown as GlobalState;
+    };
 
     describe('loadStatusesForChannelAndSidebar', () => {
         test('load statuses with posts in channel and user in sidebar', () => {

diff --git a/webapp/channels/src/actions/user_actions.test.ts b/webapp/channels/src/actions/user_actions.test.ts
@@ -90,7 +90,7 @@ describe('Actions.User', () => {
                     } as Channel,
                 },
                 channelsInTeam: {
-                    team_1: ['current_channel_id'],
+                    team_1: new Set(['current_channel_id']),
                 },
                 messageCounts: {
                     current_channel_id: {total: 10} as ChannelMessageCount,
@@ -539,7 +539,7 @@ describe('Actions.User', () => {
         };
 
         const channelsInTeam = {
-            '': [gmChannel.id],
+            '': new Set([gmChannel.id]),
         };
 
         const myMembers = {

diff --git a/webapp/channels/src/actions/views/channel_sidebar.test.ts b/webapp/channels/src/actions/views/channel_sidebar.test.ts
@@ -212,7 +212,7 @@ describe('multiSelectChannelTo', () => {
                     }, {}),
                 },
                 channelsInTeam: {
-                    team1: channelIds.map((id) => `category1_${id}`).concat(channelIds.map((id) => `category2_${id}`)),
+                    team1: new Set(channelIds.map((id) => `category1_${id}`).concat(channelIds.map((id) => `category2_${id}`))),
                 },
             },
             teams: {

diff --git a/webapp/channels/src/actions/websocket_actions.test.jsx b/webapp/channels/src/actions/websocket_actions.test.jsx
@@ -132,7 +132,7 @@ let mockState = {
                 },
             },
             channelsInTeam: {
-                team: ['channel1', 'channel2'],
+                team: new Set(['channel1', 'channel2']),
             },
             membersInChannel: {
                 otherChannel: {},

diff --git a/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.tsx b/webapp/channels/src/components/admin_console/feature_discovery/feature_discovery.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import {FormattedMessage, useIntl} from 'react-intl';
 
-import type {AnalyticsRow} from '@mattermost/types/admin';
+import type {AnalyticsState} from '@mattermost/types/admin';
 import type {CloudCustomer} from '@mattermost/types/cloud';
 import type {ClientLicense} from '@mattermost/types/config';
 
@@ -46,7 +46,7 @@ type Props = {
 
     prevTrialLicense: ClientLicense;
 
-    stats?: Record<string, number | AnalyticsRow[]>;
+    stats?: AnalyticsState;
     actions: {
         getPrevTrialLicense: () => void;
         getCloudSubscription: () => void;

diff --git a/...c/components/admin_console/team_channel_settings/channel/details/channel_members/index.ts b/...c/components/admin_console/team_channel_settings/channel/details/channel_members/index.ts
@@ -6,7 +6,7 @@ import {bindActionCreators} from 'redux';
 import type {Dispatch} from 'redux';
 
 import type {ChannelStats} from '@mattermost/types/channels';
-import type {UserProfile, UsersStats} from '@mattermost/types/users';
+import type {UserProfile} from '@mattermost/types/users';
 
 import {getChannelStats} from 'mattermost-redux/actions/channels';
 import {getFilteredUsersStats} from 'mattermost-redux/actions/users';
@@ -69,10 +69,10 @@ function makeMapStateToProps() {
             };
             totalCount = stats.member_count;
         } else {
-            const filteredUserStats: UsersStats = selectFilteredUsersStats(state) || {
+            const filteredUserStats = selectFilteredUsersStats(state) || {
                 total_users_count: 0,
             };
-            totalCount = filteredUserStats.total_users_count;
+            totalCount = filteredUserStats.total_users_count ?? 0;
         }
 
         let users = [];

diff --git a/...els/src/components/admin_console/team_channel_settings/team/details/team_members/index.ts b/...els/src/components/admin_console/team_channel_settings/team/details/team_members/index.ts
@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import type {Dispatch} from 'redux';
 
-import type {UserProfile, UsersStats} from '@mattermost/types/users';
+import type {UserProfile} from '@mattermost/types/users';
 
 import {getTeamStats as loadTeamStats} from 'mattermost-redux/actions/teams';
 import {getFilteredUsersStats} from 'mattermost-redux/actions/users';
@@ -49,10 +49,10 @@ function mapStateToProps(state: GlobalState, props: Props) {
         const stats = getTeamStats(state)[teamId] || {active_member_count: 0};
         totalCount = stats.active_member_count;
     } else {
-        const filteredUserStats: UsersStats = selectFilteredUsersStats(state) || {
+        const filteredUserStats = selectFilteredUsersStats(state) || {
             total_users_count: 0,
         };
-        totalCount = filteredUserStats.total_users_count;
+        totalCount = filteredUserStats.total_users_count ?? 0;
     }
 
     let users = [];

diff --git a/...s/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts b/...s/src/components/admin_console/workspace-optimization/dashboard_checks/easy_management.ts
@@ -72,7 +72,7 @@ const usesLDAP = async (
 // // @see discussion here: https://github.com/mattermost/mattermost-webapp/pull/9822#discussion_r806879385
 // const fetchGuestAccounts = async (
 //     config: Partial<AdminConfig>,
-//     analytics: Record<string, number | AnalyticsRow[]> | undefined,
+//     analytics: AnalyticsState | undefined,
 // ) => {
 //     if (config.TeamSettings?.EnableOpenServer && config.GuestAccountsSettings?.Enable) {
 //         let usersArray = await fetch(`${Client4.getBaseRoute()}/users/invalid_emails`).then((result) => result.json());

diff --git a/webapp/channels/src/components/analytics/system_analytics/system_analytics.tsx b/webapp/channels/src/components/analytics/system_analytics/system_analytics.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import {FormattedMessage, defineMessages} from 'react-intl';
 
-import type {AnalyticsRow, PluginAnalyticsRow, IndexedPluginAnalyticsRow} from '@mattermost/types/admin';
+import type {AnalyticsRow, PluginAnalyticsRow, IndexedPluginAnalyticsRow, AnalyticsState} from '@mattermost/types/admin';
 import type {ClientLicense} from '@mattermost/types/config';
 
 import * as AdminActions from 'actions/admin_actions.jsx';
@@ -33,7 +33,7 @@ const StatTypes = Constants.StatTypes;
 
 type Props = {
     isLicensed: boolean;
-    stats?: Record<string, number | AnalyticsRow[]>;
+    stats?: AnalyticsState;
     license: ClientLicense;
     pluginStatHandlers: GlobalState['plugins']['siteStatsHandlers'];
 }
@@ -119,7 +119,7 @@ export default class SystemAnalytics extends React.PureComponent<Props, State> {
         this.setState({pluginSiteStats: allStatsIndexed});
     }
 
-    private getStatValue(stat: number | AnalyticsRow[]): number | undefined {
+    private getStatValue(stat: number | AnalyticsRow[] | undefined): number | undefined {
         if (typeof stat === 'number') {
             return stat;
         }

diff --git a/webapp/channels/src/components/analytics/team_analytics/team_analytics.tsx b/webapp/channels/src/components/analytics/team_analytics/team_analytics.tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import type {MessageDescriptor} from 'react-intl';
 import {FormattedDate, FormattedMessage, defineMessages} from 'react-intl';
 
-import type {AnalyticsRow} from '@mattermost/types/admin';
+import type {AnalyticsRow, AnalyticsState} from '@mattermost/types/admin';
 import type {ClientLicense} from '@mattermost/types/config';
 import type {Team} from '@mattermost/types/teams';
 import type {UserProfile} from '@mattermost/types/users';
@@ -52,7 +52,7 @@ type Props = {
 
     license: ClientLicense;
 
-    stats: RelationOneToOne<Team, Record<string, number | AnalyticsRow[]>>;
+    stats: RelationOneToOne<Team, AnalyticsState>;
 
     actions: {
 
@@ -129,7 +129,7 @@ export default class TeamAnalytics extends React.PureComponent<Props, State> {
         }
     }
 
-    private getStatValue(stat: number | AnalyticsRow[]): number | undefined {
+    private getStatValue(stat: number | AnalyticsRow[] | undefined): number | undefined {
         if (typeof stat === 'number') {
             return stat;
         }

diff --git a/webapp/channels/src/components/channel_info_rhs/about_area_channel.test.tsx b/webapp/channels/src/components/channel_info_rhs/about_area_channel.test.tsx
@@ -44,7 +44,7 @@ const initialState: DeepPartial<GlobalState> = {
                 },
             },
             channelsInTeam: {
-                'team-id': ['current_channel_id'],
+                'team-id': new Set(['current_channel_id']),
             },
             messageCounts: {
                 current_channel_id: {total: 10},

diff --git a/webapp/channels/src/components/channel_info_rhs/about_area_dm.test.tsx b/webapp/channels/src/components/channel_info_rhs/about_area_dm.test.tsx
@@ -46,7 +46,7 @@ const initialState: DeepPartial<GlobalState> = {
                 },
             },
             channelsInTeam: {
-                'team-id': ['current_channel_id'],
+                'team-id': new Set(['current_channel_id']),
             },
             messageCounts: {
                 current_channel_id: {total: 10},

diff --git a/webapp/channels/src/components/channel_info_rhs/about_area_gm.test.tsx b/webapp/channels/src/components/channel_info_rhs/about_area_gm.test.tsx
@@ -45,7 +45,7 @@ const initialState: DeepPartial<GlobalState> = {
                 },
             },
             channelsInTeam: {
-                'team-id': ['current_channel_id'],
+                'team-id': new Set(['current_channel_id']),
             },
             messageCounts: {
                 current_channel_id: {total: 10},

diff --git a/webapp/channels/src/components/channel_layout/channel_identifier_router/actions.test.ts b/webapp/channels/src/components/channel_layout/channel_identifier_router/actions.test.ts
@@ -59,7 +59,7 @@ describe('Actions', () => {
                 currentChannelId: 'channel_id1',
                 channels: {channel_id1: channel1, channel_id2: channel2, channel_id3: channel3, channel_id4: channel4, channel_id5: channel5, channel_id6: channel6},
                 myMembers: {channel_id1: {channel_id: 'channel_id1', user_id: 'current_user_id'}, channel_id2: {channel_id: 'channel_id2', user_id: 'current_user_id'}},
-                channelsInTeam: {team_id1: ['channel_id1'], team_id2: ['channel_id2']},
+                channelsInTeam: {team_id1: new Set(['channel_id1']), team_id2: new Set(['channel_id2'])},
             },
             teams: {
                 currentTeamId: 'team_id1',

diff --git a/webapp/channels/src/components/more_direct_channels/index.ts b/webapp/channels/src/components/more_direct_channels/index.ts
@@ -78,7 +78,7 @@ const makeMapStateToProps = () => {
             currentChannelMembers,
             currentUserId,
             restrictDirectMessage,
-            totalCount: stats.total_users_count,
+            totalCount: stats.total_users_count ?? 0,
         };
     };
 };

diff --git a/webapp/channels/src/components/more_direct_channels/list/index.test.ts b/webapp/channels/src/components/more_direct_channels/list/index.test.ts
@@ -216,7 +216,7 @@ describe('makeGetOptions', () => {
                         [gmChannel3.id]: gmChannel3,
                     },
                     channelsInTeam: {
-                        '': [gmChannel1.id, gmChannel2.id, gmChannel3.id],
+                        '': new Set([gmChannel1.id, gmChannel2.id, gmChannel3.id]),
                     },
                 },
                 users: {
@@ -291,7 +291,7 @@ describe('makeGetOptions', () => {
                         [gmChannel2.id]: gmChannel2,
                     },
                     channelsInTeam: {
-                        '': [gmChannel1.id, gmChannel2.id],
+                        '': new Set([gmChannel1.id, gmChannel2.id]),
                     },
                 },
                 users: {
@@ -378,7 +378,7 @@ describe('makeGetOptions', () => {
                         [gmChannel3.id]: gmChannel3,
                     },
                     channelsInTeam: {
-                        '': [gmChannel1.id, gmChannel2.id, gmChannel3.id],
+                        '': new Set([gmChannel1.id, gmChannel2.id, gmChannel3.id]),
                     },
                 },
                 users: {
@@ -480,7 +480,7 @@ describe('makeGetOptions', () => {
                         [gmChannel2.id]: gmChannel2,
                     },
                     channelsInTeam: {
-                        '': [gmChannel1.id, gmChannel2.id],
+                        '': new Set([gmChannel1.id, gmChannel2.id]),
                     },
                 },
                 users: {
@@ -591,7 +591,7 @@ describe('makeGetOptions', () => {
                         [dm1.id]: dm1,
                     },
                     channelsInTeam: {
-                        '': [dm1.id],
+                        '': new Set([dm1.id]),
                     },
                 },
                 users: {

diff --git a/webapp/channels/src/components/sidebar/invite_members_button.test.tsx b/webapp/channels/src/components/sidebar/invite_members_button.test.tsx
@@ -35,7 +35,7 @@ describe('components/sidebar/invite_members_button', () => {
                 },
                 stats: {
                     total_users_count: 10,
-                } as any, // HARRISONTODO The defined type of entities.users.stats is incorrect
+                },
             },
             roles: {
                 roles: {

diff --git a/webapp/channels/src/components/sidebar/sidebar.test.tsx b/webapp/channels/src/components/sidebar/sidebar.test.tsx
@@ -141,7 +141,7 @@ describe('components/sidebar', () => {
                         channel2,
                     },
                     channelsInTeam: {
-                        [currentTeamId]: [channel1.id, channel2.id],
+                        [currentTeamId]: new Set([channel1.id, channel2.id]),
                     },
                     messageCounts: {
                         channel1: {total: 10},

diff --git a/...ents/suggestion/command_provider/app_command_parser/tests/app_command_parser_test_data.ts b/...ents/suggestion/command_provider/app_command_parser/tests/app_command_parser_test_data.ts
@@ -40,7 +40,7 @@ export const reduxTestState = {
                 },
             },
             channelsInTeam: {
-                'team-id': ['current_channel_id'],
+                'team-id': new Set(['current_channel_id']),
             },
             messageCounts: {
                 current_channel_id: {total: 10},

diff --git a/webapp/channels/src/components/suggestion/search_channel_with_permissions_provider.test.tsx b/webapp/channels/src/components/suggestion/search_channel_with_permissions_provider.test.tsx
@@ -91,14 +91,14 @@ describe('components/SearchChannelWithPermissionsProvider', () => {
                     }),
                 },
                 channelsInTeam: {
-                    someTeamId: [
+                    someTeamId: new Set([
                         'somePublicMemberChannelId',
                         'somePrivateMemberChannelId',
                         'somePublicNonMemberChannelId',
                         'somePrivateNonMemberChannelId',
                         'someDirectConversation',
                         'someGroupConversation',
-                    ],
+                    ]),
                 },
             },
             roles: {