mattermost-redux 10.6.0-0 → 10.7.0

package/lib/action_types/general.d.ts

@@ -4,7 +4,10 @@ declare const _default: {
     CLIENT_CONFIG_RESET: "CLIENT_CONFIG_RESET";
     CLIENT_LICENSE_RECEIVED: "CLIENT_LICENSE_RECEIVED";
     CLIENT_LICENSE_RESET: "CLIENT_LICENSE_RESET";
-    CUSTOM_PROFILE_ATTRIBUTES_RECEIVED: "CUSTOM_PROFILE_ATTRIBUTES_RECEIVED";
+    CUSTOM_PROFILE_ATTRIBUTE_FIELDS_RECEIVED: "CUSTOM_PROFILE_ATTRIBUTE_FIELDS_RECEIVED";
+    CUSTOM_PROFILE_ATTRIBUTE_FIELD_CREATED: "CUSTOM_PROFILE_ATTRIBUTE_FIELD_CREATED";
+    CUSTOM_PROFILE_ATTRIBUTE_FIELD_DELETED: "CUSTOM_PROFILE_ATTRIBUTE_FIELD_DELETED";
+    CUSTOM_PROFILE_ATTRIBUTE_FIELD_PATCHED: "CUSTOM_PROFILE_ATTRIBUTE_FIELD_PATCHED";
     LOG_CLIENT_ERROR_REQUEST: "LOG_CLIENT_ERROR_REQUEST";
     LOG_CLIENT_ERROR_SUCCESS: "LOG_CLIENT_ERROR_SUCCESS";
     LOG_CLIENT_ERROR_FAILURE: "LOG_CLIENT_ERROR_FAILURE";

package/lib/action_types/general.js

@@ -12,7 +12,10 @@ exports.default = (0, key_mirror_1.default)({
     CLIENT_CONFIG_RESET: null,
     CLIENT_LICENSE_RECEIVED: null,
     CLIENT_LICENSE_RESET: null,
-    CUSTOM_PROFILE_ATTRIBUTES_RECEIVED: null,
+    CUSTOM_PROFILE_ATTRIBUTE_FIELDS_RECEIVED: null,
+    CUSTOM_PROFILE_ATTRIBUTE_FIELD_CREATED: null,
+    CUSTOM_PROFILE_ATTRIBUTE_FIELD_DELETED: null,
+    CUSTOM_PROFILE_ATTRIBUTE_FIELD_PATCHED: null,
     LOG_CLIENT_ERROR_REQUEST: null,
     LOG_CLIENT_ERROR_SUCCESS: null,
     LOG_CLIENT_ERROR_FAILURE: null,

package/lib/action_types/users.d.ts

@@ -20,6 +20,7 @@ declare const _default: {
     RECEIVED_TERMS_OF_SERVICE_STATUS: "RECEIVED_TERMS_OF_SERVICE_STATUS";
     RECEIVED_PROFILE: "RECEIVED_PROFILE";
     RECEIVED_PROFILES: "RECEIVED_PROFILES";
+    RECEIVED_CPA_VALUES: "RECEIVED_CPA_VALUES";
     RECEIVED_PROFILES_LIST: "RECEIVED_PROFILES_LIST";
     RECEIVED_PROFILES_IN_TEAM: "RECEIVED_PROFILES_IN_TEAM";
     RECEIVED_PROFILE_IN_TEAM: "RECEIVED_PROFILE_IN_TEAM";

package/lib/action_types/users.js

@@ -28,6 +28,7 @@ exports.default = (0, key_mirror_1.default)({
     RECEIVED_TERMS_OF_SERVICE_STATUS: null,
     RECEIVED_PROFILE: null,
     RECEIVED_PROFILES: null,
+    RECEIVED_CPA_VALUES: null,
     RECEIVED_PROFILES_LIST: null,
     RECEIVED_PROFILES_IN_TEAM: null,
     RECEIVED_PROFILE_IN_TEAM: null,

package/lib/actions/errors.d.ts

@@ -1,5 +1,6 @@
 import type { ErrorObject } from 'serialize-error';
 import type { ServerError } from '@mattermost/types/errors';
+import type { GlobalState } from '@mattermost/types/store';
 import type { ActionFuncAsync } from 'mattermost-redux/types/actions';
 export declare function dismissError(index: number): {
     type: "DISMISS_ERROR";
@@ -12,7 +13,31 @@ export declare function getLogErrorAction(error: ErrorObject, displayable?: bool
     error: ErrorObject;
     data: null;
 };
-export declare function logError(error: ServerError, displayable?: boolean, consoleError?: boolean): ActionFuncAsync<boolean>;
+export type LogErrorOptions = {
+    /**
+     * errorBarMode controls how and when the error bar is shown for this error.
+     *
+     * If unspecified, this defaults to DontShow.
+     */
+    errorBarMode?: LogErrorBarMode;
+};
+export declare enum LogErrorBarMode {
+    /**
+     * Always show the error bar for this error.
+     */
+    Always = "Always",
+    /**
+     * Never show the error bar for this error.
+     */
+    Never = "Never",
+    /**
+     * Only shows the error bar if Developer Mode is enabled, and the message displayed will tell the user to check the
+     * JS console for more information.
+     */
+    InDevMode = "InDevMode"
+}
+export declare function logError(error: ServerError, options?: LogErrorOptions): ActionFuncAsync<boolean>;
+export declare function shouldShowErrorBar(state: GlobalState, options: LogErrorOptions): boolean;
 export declare function clearErrors(): {
     type: "CLEAR_ERRORS";
     data: null;

package/lib/actions/errors.js

@@ -2,9 +2,11 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogErrorBarMode = void 0;
 exports.dismissError = dismissError;
 exports.getLogErrorAction = getLogErrorAction;
 exports.logError = logError;
+exports.shouldShowErrorBar = shouldShowErrorBar;
 exports.clearErrors = clearErrors;
 const serialize_error_1 = require("serialize-error");
 const client4_1 = require("@mattermost/types/client4");
@@ -25,7 +27,23 @@ function getLogErrorAction(error, displayable = false) {
         data: null,
     };
 }
-function logError(error, displayable = false, consoleError = false) {
+var LogErrorBarMode;
+(function (LogErrorBarMode) {
+    /**
+     * Always show the error bar for this error.
+     */
+    LogErrorBarMode["Always"] = "Always";
+    /**
+     * Never show the error bar for this error.
+     */
+    LogErrorBarMode["Never"] = "Never";
+    /**
+     * Only shows the error bar if Developer Mode is enabled, and the message displayed will tell the user to check the
+     * JS console for more information.
+     */
+    LogErrorBarMode["InDevMode"] = "InDevMode";
+})(LogErrorBarMode || (exports.LogErrorBarMode = LogErrorBarMode = {}));
+function logError(error, options = {}) {
     return async (dispatch, getState) => {
         if (error.server_error_id === 'api.context.session_expired.app_error') {
             return { data: true };
@@ -48,19 +66,23 @@ function logError(error, displayable = false, consoleError = false) {
                 // avoid crashing the app if an error sending "the error" occurs.
             }
         }
-        if (consoleError) {
+        if (options && options.errorBarMode === LogErrorBarMode.InDevMode) {
             serializedError.message = 'A JavaScript error has occurred. Please use the JavaScript console to capture and report the error';
         }
-        const isDevMode = getState()?.entities.general?.config?.EnableDeveloper === 'true';
-        let shouldDisplay = displayable;
-        // Display announcements bar if error is a developer error and we are in dev mode
-        if (isDevMode && error.type === 'developer') {
-            shouldDisplay = true;
-        }
-        dispatch(getLogErrorAction(serializedError, shouldDisplay));
+        dispatch(getLogErrorAction(serializedError, shouldShowErrorBar(getState(), options)));
         return { data: true };
     };
 }
+function shouldShowErrorBar(state, options) {
+    if (options && options.errorBarMode === LogErrorBarMode.Always) {
+        return true;
+    }
+    if (options && options.errorBarMode === LogErrorBarMode.InDevMode) {
+        const isDevMode = state.entities.general.config?.EnableDeveloper === 'true';
+        return isDevMode;
+    }
+    return false;
+}
 function clearErrors() {
     return {
         type: action_types_1.ErrorTypes.CLEAR_ERRORS,

package/lib/actions/general.d.ts

@@ -5,13 +5,6 @@ import type { ActionFuncAsync } from 'mattermost-redux/types/actions';
 export declare function getClientConfig(): ActionFuncAsync<ClientConfig>;
 export declare function getLicenseConfig(): ActionFuncAsync<import("@mattermost/types/config").ClientLicense, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function getCustomProfileAttributeFields(): ActionFuncAsync<import("@mattermost/types/properties").UserPropertyField[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
-export declare function getCustomProfileAttributeValues(userID: string): () => Promise<{
-    error: any;
-    data?: undefined;
-} | {
-    data: Record<string, string>;
-    error?: undefined;
-}>;
 export declare function logClientError(message: string, level?: LogLevel): ActionFuncAsync<{
     message: string;
 }, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;

package/lib/actions/general.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientConfig = getClientConfig;
 exports.getLicenseConfig = getLicenseConfig;
 exports.getCustomProfileAttributeFields = getCustomProfileAttributeFields;
-exports.getCustomProfileAttributeValues = getCustomProfileAttributeValues;
 exports.logClientError = logClientError;
 exports.setServerVersion = setServerVersion;
 exports.setUrl = setUrl;
@@ -45,21 +44,9 @@ function getLicenseConfig() {
 function getCustomProfileAttributeFields() {
     return (0, helpers_1.bindClientFunc)({
         clientFunc: client_1.Client4.getCustomProfileAttributeFields,
-        onSuccess: [action_types_1.GeneralTypes.CUSTOM_PROFILE_ATTRIBUTES_RECEIVED],
+        onSuccess: [action_types_1.GeneralTypes.CUSTOM_PROFILE_ATTRIBUTE_FIELDS_RECEIVED],
     });
 }
-function getCustomProfileAttributeValues(userID) {
-    return async () => {
-        let data;
-        try {
-            data = await client_1.Client4.getUserCustomProfileAttributesValues(userID);
-        }
-        catch (error) {
-            return { error };
-        }
-        return { data };
-    };
-}
 function logClientError(message, level = client4_1.LogLevel.Error) {
     return (0, helpers_1.bindClientFunc)({
         clientFunc: client_1.Client4.logClientError,

package/lib/actions/groups.d.ts

@@ -9,8 +9,8 @@ export declare function getGroupSyncables(groupID: string, syncableType: Syncabl
 export declare function patchGroupSyncable(groupID: string, syncableID: string, syncableType: SyncableType, patch: Partial<SyncablePatch>): ActionFuncAsync;
 export declare function getGroup(id: string, includeMemberCount?: boolean): ActionFuncAsync<Group, import("@mattermost/types/store").GlobalState, AnyAction>;
 export declare function getGroups(opts: GetGroupsParams): ActionFuncAsync<Group[], import("@mattermost/types/store").GlobalState, AnyAction>;
-export declare function getGroupsNotAssociatedToTeam(teamID: string, q?: string, page?: number, perPage?: number, source?: GroupSource): ActionFuncAsync<Group[], import("@mattermost/types/store").GlobalState, AnyAction>;
-export declare function getGroupsNotAssociatedToChannel(channelID: string, q?: string, page?: number, perPage?: number, filterParentTeamPermitted?: boolean, source?: GroupSource): ActionFuncAsync<Group[], import("@mattermost/types/store").GlobalState, AnyAction>;
+export declare function getGroupsNotAssociatedToTeam(teamID: string, q?: string, page?: number, perPage?: number, source?: GroupSource | string, onlySyncableSources?: boolean): ActionFuncAsync<Group[], import("@mattermost/types/store").GlobalState, AnyAction>;
+export declare function getGroupsNotAssociatedToChannel(channelID: string, q?: string, page?: number, perPage?: number, filterParentTeamPermitted?: boolean, source?: GroupSource | string, onlySyncableSources?: boolean): ActionFuncAsync<Group[], import("@mattermost/types/store").GlobalState, AnyAction>;
 export declare function getAllGroupsAssociatedToTeam(teamID: string, filterAllowReference?: boolean, includeMemberCount?: boolean): ActionFuncAsync<import("@mattermost/types/groups").GroupsWithCount, import("@mattermost/types/store").GlobalState, AnyAction>;
 export declare function getAllGroupsAssociatedToChannelsInTeam(teamID: string, filterAllowReference?: boolean): ActionFuncAsync<{
     groupsByChannelId: import("@mattermost/types/utilities").RelationOneToOne<import("@mattermost/types/channels").Channel, Group>;

package/lib/actions/groups.js

@@ -170,7 +170,7 @@ function getGroups(opts) {
         ],
     });
 }
-function getGroupsNotAssociatedToTeam(teamID, q = '', page = 0, perPage = constants_1.General.PAGE_SIZE_DEFAULT, source = groups_1.GroupSource.Ldap) {
+function getGroupsNotAssociatedToTeam(teamID, q = '', page = 0, perPage = constants_1.General.PAGE_SIZE_DEFAULT, source = groups_1.GroupSource.Ldap, onlySyncableSources = false) {
     return (0, helpers_1.bindClientFunc)({
         clientFunc: client_1.Client4.getGroupsNotAssociatedToTeam,
         onSuccess: [action_types_1.GroupTypes.RECEIVED_GROUPS],
@@ -180,10 +180,11 @@ function getGroupsNotAssociatedToTeam(teamID, q = '', page = 0, perPage = consta
             page,
             perPage,
             source,
+            onlySyncableSources,
         ],
     });
 }
-function getGroupsNotAssociatedToChannel(channelID, q = '', page = 0, perPage = constants_1.General.PAGE_SIZE_DEFAULT, filterParentTeamPermitted = false, source = groups_1.GroupSource.Ldap) {
+function getGroupsNotAssociatedToChannel(channelID, q = '', page = 0, perPage = constants_1.General.PAGE_SIZE_DEFAULT, filterParentTeamPermitted = false, source = groups_1.GroupSource.Ldap, onlySyncableSources = false) {
     return (0, helpers_1.bindClientFunc)({
         clientFunc: client_1.Client4.getGroupsNotAssociatedToChannel,
         onSuccess: [action_types_1.GroupTypes.RECEIVED_GROUPS],
@@ -194,6 +195,7 @@ function getGroupsNotAssociatedToChannel(channelID, q = '', page = 0, perPage =
             perPage,
             filterParentTeamPermitted,
             source,
+            onlySyncableSources,
         ],
     });
 }

package/lib/actions/posts.js

@@ -1191,7 +1191,7 @@ function restorePostVersion(postId, restoreVersionId, connectionId) {
         catch (error) {
             // Send to error bar if it's an edit post error about time limit.
             if (error.server_error_id === 'api.post.update_post.permissions_time_limit.app_error') {
-                dispatch((0, errors_1.logError)({ type: 'announcement', message: error.message }, true));
+                dispatch((0, errors_1.logError)({ type: 'announcement', message: error.message }, { errorBarMode: errors_1.LogErrorBarMode.Always }));
             }
             else {
                 dispatch((0, errors_1.logError)(error));

package/lib/actions/search.d.ts

@@ -7,10 +7,10 @@ export declare function getMissingChannelsFromPosts(posts: PostList['posts']): T
 export declare function getMissingChannelsFromFiles(files: Map<string, FileSearchResultItem>): ThunkActionFunc<Promise<ActionResult[]>>;
 export declare function searchPostsWithParams(teamId: string, params: SearchParameter): ActionFuncAsync<PostSearchResults>;
 export declare function searchPosts(teamId: string, terms: string, isOrSearch: boolean, includeDeletedChannels: boolean): ActionFuncAsync<PostSearchResults>;
-export declare function getMorePostsForSearch(): ActionFuncAsync;
+export declare function getMorePostsForSearch(teamId: string): ActionFuncAsync;
 export declare function clearSearch(): ActionFuncAsync;
 export declare function searchFilesWithParams(teamId: string, params: SearchParameter): ActionFuncAsync;
-export declare function getMoreFilesForSearch(): ActionFuncAsync;
+export declare function getMoreFilesForSearch(teamId: string): ActionFuncAsync;
 export declare function getFlaggedPosts(): ActionFuncAsync<PostList>;
 export declare function getPinnedPosts(channelId: string): ActionFuncAsync;
 declare const _default: {

package/lib/actions/search.js

@@ -16,7 +16,6 @@ exports.getPinnedPosts = getPinnedPosts;
 const redux_batched_actions_1 = require("redux-batched-actions");
 const action_types_1 = require("mattermost-redux/action_types");
 const client_1 = require("mattermost-redux/client");
-const teams_1 = require("mattermost-redux/selectors/entities/teams");
 const users_1 = require("mattermost-redux/selectors/entities/users");
 const channels_1 = require("./channels");
 const errors_1 = require("./errors");
@@ -101,10 +100,9 @@ function searchPostsWithParams(teamId, params) {
 function searchPosts(teamId, terms, isOrSearch, includeDeletedChannels) {
     return searchPostsWithParams(teamId, { terms, is_or_search: isOrSearch, include_deleted_channels: includeDeletedChannels, page: 0, per_page: exports.WEBAPP_SEARCH_PER_PAGE });
 }
-function getMorePostsForSearch() {
+function getMorePostsForSearch(teamId) {
     return async (dispatch, getState) => {
-        const teamId = (0, teams_1.getCurrentTeamId)(getState());
-        const { params, isEnd } = getState().entities.search.current[teamId];
+        const { params, isEnd } = getState().entities.search.current[teamId || 'ALL_TEAMS'];
         if (!isEnd) {
             const newParams = Object.assign({}, params);
             newParams.page += 1;
@@ -159,10 +157,9 @@ function searchFilesWithParams(teamId, params) {
         return { data: files };
     };
 }
-function getMoreFilesForSearch() {
+function getMoreFilesForSearch(teamId) {
     return async (dispatch, getState) => {
-        const teamId = (0, teams_1.getCurrentTeamId)(getState());
-        const { params, isFilesEnd } = getState().entities.search.current[teamId];
+        const { params, isFilesEnd } = getState().entities.search.current[teamId || 'ALL_TEAMS'];
         if (!isFilesEnd) {
             const newParams = Object.assign({}, params);
             newParams.page += 1;

package/lib/actions/status_profile_polling.d.ts

@@ -17,4 +17,4 @@ export declare function cleanUpStatusAndProfileFetchingPoll(): ThunkActionFunc<v
  * This action however doesn't refetch the profiles and statuses except for groups if they are already fetched once
  */
 export declare function batchFetchStatusesProfilesGroupsFromPosts(postsArrayOrMap: Post[] | PostList['posts'] | Post): ActionFunc<boolean>;
-export declare function getUsersFromMentionedUsernamesAndGroups(usernamesAndGroups: string[]): ActionFuncAsync<string[]>;
+export declare function getUsersFromMentionedUsernamesAndGroups(usernamesAndGroups: string[], isLicensed: boolean): ActionFuncAsync<string[]>;

package/lib/actions/status_profile_polling.js

@@ -147,12 +147,12 @@ function batchFetchStatusesProfilesGroupsFromPosts(postsArrayOrMap) {
             }
         });
         if (mentionedUsernamesAndGroupsInPosts.size > 0) {
-            dispatch(getUsersFromMentionedUsernamesAndGroups(Array.from(mentionedUsernamesAndGroupsInPosts)));
+            dispatch(getUsersFromMentionedUsernamesAndGroups(Array.from(mentionedUsernamesAndGroupsInPosts), (0, general_1.getLicense)(state).IsLicensed === 'true'));
         }
         return { data: true };
     };
 }
-function getUsersFromMentionedUsernamesAndGroups(usernamesAndGroups) {
+function getUsersFromMentionedUsernamesAndGroups(usernamesAndGroups, isLicensed) {
     return async (dispatch) => {
         // We run the at-mentioned be it user or group through the user profile search
         const { data: userProfiles } = await dispatch((0, users_1.getProfilesByUsernames)(usernamesAndGroups));
@@ -167,14 +167,16 @@ function getUsersFromMentionedUsernamesAndGroups(usernamesAndGroups) {
         }
         // Removing usernames from the list will leave only the group names
         const mentionedGroups = usernamesAndGroups.filter((name) => !mentionedUsernames.includes(name));
-        for (const group of mentionedGroups) {
-            const groupSearchParam = {
-                q: group,
-                filter_allow_reference: true,
-                page: 0,
-                per_page: 60,
-            };
-            dispatch((0, groups_1.searchGroups)(groupSearchParam));
+        if (isLicensed) {
+            for (const group of mentionedGroups) {
+                const groupSearchParam = {
+                    q: group,
+                    filter_allow_reference: true,
+                    page: 0,
+                    per_page: 60,
+                };
+                dispatch((0, groups_1.searchGroups)(groupSearchParam));
+            }
         }
         return { data: mentionedGroups };
     };

package/lib/actions/threads.js

@@ -37,6 +37,7 @@ const users_2 = require("mattermost-redux/selectors/entities/users");
 const errors_1 = require("./errors");
 const helpers_1 = require("./helpers");
 const posts_2 = require("./posts");
+const teams_2 = require("./teams");
 function fetchThreads(userId, teamId, { before = '', after = '', perPage = threads_1.default.THREADS_CHUNK_SIZE, unread = false, totalsOnly = false, threadsOnly = false, extended = false, since = 0 } = {}) {
     return async (dispatch, getState) => {
         let data;
@@ -329,6 +330,10 @@ function setThreadFollow(userId, teamId, threadId, newState) {
             dispatch((0, errors_1.logError)(error));
             return { error };
         }
+        // As a short term fix for https://mattermost.atlassian.net/browse/MM-62113, we will fetch
+        // the users team unreads after following or unfollowing a thread. This will ensure that the unreads are
+        // updated correctly in the case where the user is following or unfollowing a thread that has unread messages.
+        dispatch((0, teams_2.getMyTeamUnreads)((0, preferences_1.isCollapsedThreadsEnabled)(getState())));
         return {};
     };
 }

package/lib/actions/users.d.ts

@@ -30,6 +30,7 @@ export declare function batchGetProfilesInChannel(channelId: string): ActionFunc
 export declare function getProfilesInGroupChannels(channelsIds: string[]): ActionFuncAsync;
 export declare function getProfilesNotInChannel(teamId: string, channelId: string, groupConstrained: boolean, page: number, perPage?: number): ActionFuncAsync<UserProfile[]>;
 export declare function getMe(): ActionFuncAsync<UserProfile>;
+export declare function getCustomProfileAttributeValues(userID: string): ActionFuncAsync<Record<string, string>>;
 export declare function updateMyTermsOfServiceStatus(termsOfServiceId: string, accepted: boolean): ActionFuncAsync;
 export declare function getProfilesInGroup(groupId: string, page?: number, perPage?: number, sort?: string): ActionFuncAsync<UserProfile[]>;
 export declare function getProfilesNotInGroup(groupId: string, page?: number, perPage?: number): ActionFuncAsync<UserProfile[]>;
@@ -55,11 +56,12 @@ export declare function autocompleteUsers(term: string, teamId?: string, channel
 }): ActionFuncAsync<UserAutocomplete>;
 export declare function searchProfiles(term: string, options?: any): ActionFuncAsync<UserProfile[]>;
 export declare function updateMe(user: Partial<UserProfile>): ActionFuncAsync<UserProfile>;
-export declare function saveCustomProfileAttribute(userID: string, attributeID: string, attributeValue: string): ActionFuncAsync;
+export declare function saveCustomProfileAttribute(userID: string, attributeID: string, attributeValue: string): ActionFuncAsync<Record<string, string>>;
 export declare function patchUser(user: UserProfile): ActionFuncAsync<UserProfile>;
 export declare function updateUserRoles(userId: string, roles: string): ActionFuncAsync;
 export declare function updateUserMfa(userId: string, activate: boolean, code?: string): ActionFuncAsync;
 export declare function updateUserPassword(userId: string, currentPassword: string, newPassword: string): ActionFuncAsync;
+export declare function resetFailedAttempts(userId: string): ActionFuncAsync<true>;
 export declare function updateUserActive(userId: string, active: boolean): ActionFuncAsync<true>;
 export declare function verifyUserEmail(token: string): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, AnyAction>;
 export declare function sendVerificationEmail(email: string): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, AnyAction>;

package/lib/actions/users.js

@@ -22,6 +22,7 @@ exports.batchGetProfilesInChannel = batchGetProfilesInChannel;
 exports.getProfilesInGroupChannels = getProfilesInGroupChannels;
 exports.getProfilesNotInChannel = getProfilesNotInChannel;
 exports.getMe = getMe;
+exports.getCustomProfileAttributeValues = getCustomProfileAttributeValues;
 exports.updateMyTermsOfServiceStatus = updateMyTermsOfServiceStatus;
 exports.getProfilesInGroup = getProfilesInGroup;
 exports.getProfilesNotInGroup = getProfilesNotInGroup;
@@ -50,6 +51,7 @@ exports.patchUser = patchUser;
 exports.updateUserRoles = updateUserRoles;
 exports.updateUserMfa = updateUserMfa;
 exports.updateUserPassword = updateUserPassword;
+exports.resetFailedAttempts = resetFailedAttempts;
 exports.updateUserActive = updateUserActive;
 exports.verifyUserEmail = verifyUserEmail;
 exports.sendVerificationEmail = sendVerificationEmail;
@@ -470,6 +472,22 @@ function getMe() {
         return me;
     };
 }
+function getCustomProfileAttributeValues(userID) {
+    return async (dispatch) => {
+        let data;
+        try {
+            data = await client_1.Client4.getUserCustomProfileAttributesValues(userID);
+        }
+        catch (error) {
+            return { error };
+        }
+        dispatch({
+            type: action_types_1.UserTypes.RECEIVED_CPA_VALUES,
+            data: { userID, customAttributeValues: data },
+        });
+        return { data };
+    };
+}
 function updateMyTermsOfServiceStatus(termsOfServiceId, accepted) {
     return async (dispatch, getState) => {
         const response = await dispatch((0, helpers_1.bindClientFunc)({
@@ -905,13 +923,14 @@ function updateMe(user) {
 function saveCustomProfileAttribute(userID, attributeID, attributeValue) {
     return async (dispatch) => {
         try {
-            await client_1.Client4.updateCustomProfileAttributeValues(attributeID, attributeValue);
+            const values = { [attributeID]: attributeValue.trim() };
+            const data = await client_1.Client4.updateCustomProfileAttributeValues(values);
+            return { data };
         }
         catch (error) {
             dispatch((0, errors_1.logError)(error));
             return { error };
         }
-        return { data: true };
     };
 }
 function patchUser(user) {
@@ -975,6 +994,22 @@ function updateUserPassword(userId, currentPassword, newPassword) {
         return { data: true };
     };
 }
+function resetFailedAttempts(userId) {
+    return async (dispatch, getState) => {
+        try {
+            await client_1.Client4.resetFailedAttempts(userId);
+        }
+        catch (error) {
+            dispatch((0, errors_1.logError)(error));
+            return { error };
+        }
+        const profile = getState().entities.users.profiles[userId];
+        if (profile) {
+            dispatch({ type: action_types_1.UserTypes.RECEIVED_PROFILE, data: { ...profile, failed_attempts: 0 } });
+        }
+        return { data: true };
+    };
+}
 function updateUserActive(userId, active) {
     return async (dispatch, getState) => {
         try {

package/lib/constants/stats.d.ts

@@ -5,8 +5,6 @@ declare const _default: {
     TOTAL_PRIVATE_GROUPS: "TOTAL_PRIVATE_GROUPS";
     TOTAL_POSTS: "TOTAL_POSTS";
     TOTAL_TEAMS: "TOTAL_TEAMS";
-    TOTAL_FILE_POSTS: "TOTAL_FILE_POSTS";
-    TOTAL_HASHTAG_POSTS: "TOTAL_HASHTAG_POSTS";
     TOTAL_IHOOKS: "TOTAL_IHOOKS";
     TOTAL_OHOOKS: "TOTAL_OHOOKS";
     TOTAL_COMMANDS: "TOTAL_COMMANDS";
@@ -22,5 +20,7 @@ declare const _default: {
     DAILY_ACTIVE_USERS: "DAILY_ACTIVE_USERS";
     MONTHLY_ACTIVE_USERS: "MONTHLY_ACTIVE_USERS";
     REGISTERED_USERS: "REGISTERED_USERS";
+    TOTAL_FILE_COUNT: "TOTAL_FILE_COUNT";
+    TOTAL_FILE_SIZE: "TOTAL_FILE_SIZE";
 };
 export default _default;

package/lib/constants/stats.js

@@ -13,8 +13,6 @@ exports.default = (0, key_mirror_1.default)({
     TOTAL_PRIVATE_GROUPS: null,
     TOTAL_POSTS: null,
     TOTAL_TEAMS: null,
-    TOTAL_FILE_POSTS: null,
-    TOTAL_HASHTAG_POSTS: null,
     TOTAL_IHOOKS: null,
     TOTAL_OHOOKS: null,
     TOTAL_COMMANDS: null,
@@ -30,4 +28,6 @@ exports.default = (0, key_mirror_1.default)({
     DAILY_ACTIVE_USERS: null,
     MONTHLY_ACTIVE_USERS: null,
     REGISTERED_USERS: null,
+    TOTAL_FILE_COUNT: null,
+    TOTAL_FILE_SIZE: null,
 });

package/lib/constants/telemetry.d.ts

@@ -3,8 +3,12 @@ export declare const TrackEnterpriseSKU = "enterprise";
 export declare const TrackGroupsFeature = "custom_groups";
 export declare const TrackPassiveKeywordsFeature = "passive_keywords";
 export declare const TrackScheduledPostsFeature = "scheduled_posts";
+export declare const TrackCrossTeamSearchFeature = "cross_team_search";
 export declare const TrackInviteGroupEvent = "invite_group_to_channel__add_member";
 export declare const TrackPassiveKeywordsEvent = "update_passive_keywords";
+export declare const TrackCrossTeamSearchCurrentTeamEvent = "cross_team_search__current_team";
+export declare const TrackCrossTeamSearchDifferentTeamEvent = "cross_team_search__different_team";
+export declare const TrackCrossTeamSearchAllTeamsEvent = "cross_team_search__all_teams";
 export declare const TrackActionCategory = "action";
 export declare const TrackMiscCategory = "miscellaneous";
 export declare const TrackPropertyUser = "user_actual_id";

package/lib/constants/telemetry.js

@@ -2,7 +2,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eventCategory = exports.eventSKUs = exports.TrackPropertyUserAgent = exports.TrackPropertyUser = exports.TrackMiscCategory = exports.TrackActionCategory = exports.TrackPassiveKeywordsEvent = exports.TrackInviteGroupEvent = exports.TrackScheduledPostsFeature = exports.TrackPassiveKeywordsFeature = exports.TrackGroupsFeature = exports.TrackEnterpriseSKU = exports.TrackProfessionalSKU = void 0;
+exports.eventCategory = exports.eventSKUs = exports.TrackPropertyUserAgent = exports.TrackPropertyUser = exports.TrackMiscCategory = exports.TrackActionCategory = exports.TrackCrossTeamSearchAllTeamsEvent = exports.TrackCrossTeamSearchDifferentTeamEvent = exports.TrackCrossTeamSearchCurrentTeamEvent = exports.TrackPassiveKeywordsEvent = exports.TrackInviteGroupEvent = exports.TrackCrossTeamSearchFeature = exports.TrackScheduledPostsFeature = exports.TrackPassiveKeywordsFeature = exports.TrackGroupsFeature = exports.TrackEnterpriseSKU = exports.TrackProfessionalSKU = void 0;
 // SKUs
 exports.TrackProfessionalSKU = 'professional';
 exports.TrackEnterpriseSKU = 'enterprise';
@@ -10,9 +10,13 @@ exports.TrackEnterpriseSKU = 'enterprise';
 exports.TrackGroupsFeature = 'custom_groups';
 exports.TrackPassiveKeywordsFeature = 'passive_keywords';
 exports.TrackScheduledPostsFeature = 'scheduled_posts';
+exports.TrackCrossTeamSearchFeature = 'cross_team_search';
 // Events
 exports.TrackInviteGroupEvent = 'invite_group_to_channel__add_member';
 exports.TrackPassiveKeywordsEvent = 'update_passive_keywords';
+exports.TrackCrossTeamSearchCurrentTeamEvent = 'cross_team_search__current_team';
+exports.TrackCrossTeamSearchDifferentTeamEvent = 'cross_team_search__different_team';
+exports.TrackCrossTeamSearchAllTeamsEvent = 'cross_team_search__all_teams';
 // Categories
 exports.TrackActionCategory = 'action';
 exports.TrackMiscCategory = 'miscellaneous';
@@ -26,4 +30,7 @@ exports.eventSKUs = {
 exports.eventCategory = {
     [exports.TrackInviteGroupEvent]: exports.TrackActionCategory,
     [exports.TrackPassiveKeywordsEvent]: exports.TrackActionCategory,
+    [exports.TrackCrossTeamSearchAllTeamsEvent]: exports.TrackActionCategory,
+    [exports.TrackCrossTeamSearchCurrentTeamEvent]: exports.TrackActionCategory,
+    [exports.TrackCrossTeamSearchDifferentTeamEvent]: exports.TrackActionCategory,
 };

package/lib/reducers/entities/admin.js

@@ -188,12 +188,6 @@ function convertAnalyticsRowsToStats(data, name) {
             case 'monthly_active_users':
                 key = constants_1.Stats.MONTHLY_ACTIVE_USERS;
                 break;
-            case 'file_post_count':
-                key = constants_1.Stats.TOTAL_FILE_POSTS;
-                break;
-            case 'hashtag_post_count':
-                key = constants_1.Stats.TOTAL_HASHTAG_POSTS;
-                break;
             case 'incoming_webhook_count':
                 key = constants_1.Stats.TOTAL_IHOOKS;
                 break;
@@ -209,6 +203,12 @@ function convertAnalyticsRowsToStats(data, name) {
             case 'registered_users':
                 key = constants_1.Stats.REGISTERED_USERS;
                 break;
+            case 'total_file_count':
+                key = constants_1.Stats.TOTAL_FILE_COUNT;
+                break;
+            case 'total_file_size':
+                key = constants_1.Stats.TOTAL_FILE_SIZE;
+                break;
         }
         if (key) {
             stats[key] = row.value;

package/lib/reducers/entities/general.js

@@ -32,13 +32,30 @@ function license(state = {}, action) {
     }
 }
 function customProfileAttributes(state = {}, action) {
-    const data = action.data;
     switch (action.type) {
-        case action_types_1.GeneralTypes.CUSTOM_PROFILE_ATTRIBUTES_RECEIVED:
+        case action_types_1.GeneralTypes.CUSTOM_PROFILE_ATTRIBUTE_FIELDS_RECEIVED: {
+            const data = action.data;
             return data.reduce((acc, field) => {
                 acc[field.id] = field;
                 return acc;
             }, {});
+        }
+        case action_types_1.GeneralTypes.CUSTOM_PROFILE_ATTRIBUTE_FIELD_DELETED: {
+            const nextState = { ...state };
+            const fieldId = action.data;
+            if (Object.hasOwn(nextState, fieldId)) {
+                Reflect.deleteProperty(nextState, fieldId);
+                return nextState;
+            }
+            return state;
+        }
+        case action_types_1.GeneralTypes.CUSTOM_PROFILE_ATTRIBUTE_FIELD_CREATED:
+        case action_types_1.GeneralTypes.CUSTOM_PROFILE_ATTRIBUTE_FIELD_PATCHED: {
+            return {
+                ...state,
+                [action.data.id]: action.data,
+            };
+        }
         default:
             return state;
     }

package/lib/reducers/entities/index.d.ts

@@ -67,7 +67,9 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     }>;
     preferences: import("redux").CombinedState<{
         myPreferences: any;
-        userPreferences: Record<string, import("@mattermost/types/preferences").PreferencesType>;
+        userPreferences: {
+            [key: string]: import("@mattermost/types/preferences").PreferencesType;
+        };
     }>;
     typing: import("@mattermost/types/typing").Typing;
     integrations: import("redux").CombinedState<{

package/lib/reducers/entities/posts.js

@@ -20,7 +20,6 @@ exports.limitedViews = limitedViews;
 exports.default = reducer;
 const action_types_1 = require("mattermost-redux/action_types");
 const constants_1 = require("mattermost-redux/constants");
-const posts_1 = require("mattermost-redux/constants/posts");
 const post_utils_1 = require("mattermost-redux/utils/post_utils");
 function removeUnneededMetadata(post) {
     if (!post.metadata) {
@@ -387,7 +386,7 @@ function postsInChannel(state = {}, action, prevPosts, nextPosts) {
         }
         case action_types_1.PostTypes.RECEIVED_NEW_POST: {
             const post = action.data;
-            if (action.features?.crtEnabled && post.root_id && post.type !== posts_1.PostTypes.EPHEMERAL) {
+            if (action.features?.crtEnabled && post.root_id) {
                 return state;
             }
             const postsForChannel = state[post.channel_id];

package/lib/reducers/entities/search.js

@@ -180,7 +180,8 @@ function current(state = {}, action) {
     switch (action.type) {
         case action_types_1.SearchTypes.RECEIVED_SEARCH_TERM: {
             const nextState = { ...state };
-            const { teamId, params, isEnd, isFilesEnd } = action.data;
+            const { params, isEnd, isFilesEnd } = action.data;
+            const teamId = action.data.teamId || 'ALL_TEAMS';
             return {
                 ...nextState,
                 [teamId]: {

package/lib/reducers/entities/threads/index.js

@@ -19,6 +19,7 @@ const threadsReducer = (state = {}, action, extra) => {
                 }, {}),
             };
         }
+        case action_types_1.PostTypes.POST_DELETED:
         case action_types_1.PostTypes.POST_REMOVED: {
             const post = action.data;
             if (post.root_id || !state[post.id]) {

package/lib/reducers/entities/threads/threadsInTeam.js

@@ -188,6 +188,7 @@ const threadsInTeamReducer = (state = {}, action, extra) => {
     switch (action.type) {
         case action_types_1.ThreadTypes.RECEIVED_THREAD:
             return handleReceivedThread(state, action, extra);
+        case action_types_1.PostTypes.POST_DELETED:
         case action_types_1.PostTypes.POST_REMOVED:
             return handlePostRemoved(state, action);
         case action_types_1.ThreadTypes.RECEIVED_THREADS:
@@ -230,6 +231,7 @@ const unreadThreadsInTeamReducer = (state = {}, action, extra) => {
                     threads: action.data.threads.filter((thread) => thread.unread_replies > 0 || thread.unread_mentions > 0),
                 },
             });
+        case action_types_1.PostTypes.POST_DELETED:
         case action_types_1.PostTypes.POST_REMOVED:
             return handlePostRemoved(state, action);
         case action_types_1.ThreadTypes.RECEIVED_UNREAD_THREADS:

package/lib/reducers/entities/users.js

@@ -187,6 +187,15 @@ function profiles(state = {}, action) {
             const user = action.data;
             return receiveUserProfile(state, user);
         }
+        case action_types_1.UserTypes.RECEIVED_CPA_VALUES: {
+            const { userID, customAttributeValues } = action.data;
+            const existingProfile = state[userID];
+            if (!existingProfile) {
+                return state;
+            }
+            const profileAttributes = { ...existingProfile.custom_profile_attributes, ...customAttributeValues };
+            return receiveUserProfile(state, { ...existingProfile, custom_profile_attributes: profileAttributes });
+        }
         case action_types_1.UserTypes.RECEIVED_PROFILES_LIST: {
             const users = action.data;
             return users.reduce(receiveUserProfile, state);

package/lib/reducers/index.d.ts

@@ -69,7 +69,9 @@ declare const _default: {
         }>;
         preferences: import("redux").CombinedState<{
             myPreferences: any;
-            userPreferences: Record<string, import("@mattermost/types/preferences").PreferencesType>;
+            userPreferences: {
+                [key: string]: import("@mattermost/types/preferences").PreferencesType;
+            };
         }>;
         typing: import("@mattermost/types/typing").Typing;
         integrations: import("redux").CombinedState<{

package/lib/selectors/entities/channels.d.ts

@@ -25,6 +25,7 @@ export declare function getMyChannelMembership(state: GlobalState, channelId: st
 export declare function makeGetChannelsForIds(): (state: GlobalState, ids: string[]) => Channel[];
 export declare const getCurrentChannel: (state: GlobalState) => Channel | undefined;
 export declare const getCurrentChannelNameForSearchShortcut: (state: GlobalState) => string | undefined;
+export declare const getChannelNameForSearchShortcut: (state: GlobalState, channelId: string) => string | undefined;
 export declare const getMyChannelMember: (state: GlobalState, channelId: string) => ChannelMembership | undefined;
 export declare const getCurrentChannelStats: (state: GlobalState) => ChannelStats | undefined;
 export declare function isCurrentChannelFavorite(state: GlobalState): boolean;

package/lib/selectors/entities/channels.js

@@ -5,7 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDeactivatedDirectChannel = exports.getRecentProfilesFromDMs = exports.getMyActiveChannelIds = exports.getRedirectChannelNameForTeam = exports.getMyFirstChannelForTeams = exports.getDefaultChannelForTeams = exports.getChannelsWithUserProfiles = exports.getDirectAndGroupChannels = exports.getSortedAllTeamsUnreadChannels = exports.sortUnreadChannels = exports.getUnsortedAllTeamsUnreadChannels = exports.getUnreadChannels = exports.getAllTeamsUnreadChannelIds = exports.getUnreadChannelIds = exports.getChannelIdsForAllTeams = exports.getChannelIdsInAllTeams = exports.getChannelIdsForCurrentTeam = exports.getChannelIdsInCurrentTeam = exports.getAllDirectChannelIds = exports.canManageChannelMembers = exports.getUnreadStatusInCurrentTeam = exports.getTeamsUnreadStatuses = exports.getUnreadStatus = exports.getMembersInCurrentChannel = exports.getOtherChannels = exports.getMyChannels = exports.getGroupChannels = exports.getAllDirectChannelsNameMapInCurrentTeam = exports.getAllDirectChannels = exports.getChannelNameToDisplayNameMap = exports.getChannelsNameMapInCurrentTeam = exports.getChannelsNameMapInTeam = exports.getChannelsInAllTeams = exports.getChannelsInCurrentTeam = exports.getChannelSetForAllTeams = exports.getChannelSetInCurrentTeam = exports.countCurrentChannelUnreadMessages = exports.isCurrentChannelDefault = exports.isCurrentChannelArchived = exports.isMutedChannel = exports.isCurrentChannelMuted = exports.getCurrentChannelStats = exports.getMyChannelMember = exports.getCurrentChannelNameForSearchShortcut = exports.getCurrentChannel = exports.getDirectChannelsSet = exports.getAllDmChannels = exports.getMyCurrentChannelMembership = exports.getMyChannelMemberships = exports.getCurrentChannelId = void 0;
+exports.getRecentProfilesFromDMs = exports.getMyActiveChannelIds = exports.getRedirectChannelNameForTeam = exports.getMyFirstChannelForTeams = exports.getDefaultChannelForTeams = exports.getChannelsWithUserProfiles = exports.getDirectAndGroupChannels = exports.getSortedAllTeamsUnreadChannels = exports.sortUnreadChannels = exports.getUnsortedAllTeamsUnreadChannels = exports.getUnreadChannels = exports.getAllTeamsUnreadChannelIds = exports.getUnreadChannelIds = exports.getChannelIdsForAllTeams = exports.getChannelIdsInAllTeams = exports.getChannelIdsForCurrentTeam = exports.getChannelIdsInCurrentTeam = exports.getAllDirectChannelIds = exports.canManageChannelMembers = exports.getUnreadStatusInCurrentTeam = exports.getTeamsUnreadStatuses = exports.getUnreadStatus = exports.getMembersInCurrentChannel = exports.getOtherChannels = exports.getMyChannels = exports.getGroupChannels = exports.getAllDirectChannelsNameMapInCurrentTeam = exports.getAllDirectChannels = exports.getChannelNameToDisplayNameMap = exports.getChannelsNameMapInCurrentTeam = exports.getChannelsNameMapInTeam = exports.getChannelsInAllTeams = exports.getChannelsInCurrentTeam = exports.getChannelSetForAllTeams = exports.getChannelSetInCurrentTeam = exports.countCurrentChannelUnreadMessages = exports.isCurrentChannelDefault = exports.isCurrentChannelArchived = exports.isMutedChannel = exports.isCurrentChannelMuted = exports.getCurrentChannelStats = exports.getMyChannelMember = exports.getChannelNameForSearchShortcut = exports.getCurrentChannelNameForSearchShortcut = exports.getCurrentChannel = exports.getDirectChannelsSet = exports.getAllDmChannels = exports.getMyCurrentChannelMembership = exports.getMyChannelMemberships = exports.getCurrentChannelId = void 0;
+exports.isDeactivatedDirectChannel = void 0;
 exports.getAllChannels = getAllChannels;
 exports.getAllChannelStats = getAllChannelStats;
 exports.getChannelsMemberCount = getChannelsMemberCount;
@@ -161,19 +162,29 @@ exports.getCurrentChannel = (0, create_selector_1.createSelector)('getCurrentCha
     }
     return channel;
 });
-exports.getCurrentChannelNameForSearchShortcut = (0, create_selector_1.createSelector)('getCurrentChannelNameForSearchShortcut', getAllChannels, exports.getCurrentChannelId, (state) => state.entities.users, (allChannels, currentChannelId, users) => {
-    const channel = allChannels[currentChannelId];
+const getChannelNameForSearch = (channel, users) => {
+    if (!channel) {
+        return undefined;
+    }
     // Only get the extra info from users if we need it
-    if (channel?.type === constants_1.General.DM_CHANNEL) {
+    if (channel.type === constants_1.General.DM_CHANNEL) {
         const dmChannelWithInfo = (0, channel_utils_1.completeDirectChannelInfo)(users, constants_1.Preferences.DISPLAY_PREFER_USERNAME, channel);
         return `@${dmChannelWithInfo.display_name}`;
     }
     // Replace spaces in GM channel names
-    if (channel?.type === constants_1.General.GM_CHANNEL) {
+    if (channel.type === constants_1.General.GM_CHANNEL) {
         const gmChannelWithInfo = (0, channel_utils_1.completeDirectGroupInfo)(users, constants_1.Preferences.DISPLAY_PREFER_USERNAME, channel, false);
         return `@${gmChannelWithInfo.display_name.replace(/\s/g, '')}`;
     }
-    return channel?.name;
+    return channel.name;
+};
+exports.getCurrentChannelNameForSearchShortcut = (0, create_selector_1.createSelector)('getCurrentChannelNameForSearchShortcut', getAllChannels, exports.getCurrentChannelId, (state) => state.entities.users, (allChannels, currentChannelId, users) => {
+    const channel = allChannels[currentChannelId];
+    return getChannelNameForSearch(channel, users);
+});
+exports.getChannelNameForSearchShortcut = (0, create_selector_1.createSelector)('getChannelNameForSearchShortcut', getAllChannels, (state) => state.entities.users, (state, channelId) => channelId, (allChannels, users, channelId) => {
+    const channel = allChannels[channelId];
+    return getChannelNameForSearch(channel, users);
 });
 exports.getMyChannelMember = (0, create_selector_1.createSelector)('getMyChannelMember', exports.getMyChannelMemberships, (state, channelId) => channelId, (channelMemberships, channelId) => {
     return channelMemberships[channelId];
@@ -333,19 +344,12 @@ function basicUnreadMeta(unreadStatus) {
     };
 }
 // muted channel will not be counted towards unreads
-exports.getUnreadStatus = (0, create_selector_1.createSelector)('getUnreadStatus', getAllChannels, exports.getMyChannelMemberships, getChannelMessageCounts, common_1.getUsers, users_1.getCurrentUserId, teams_1.getCurrentTeamId, teams_1.getMyTeams, teams_1.getTeamMemberships, preferences_1.isCollapsedThreadsEnabled, threads_1.getThreadCounts, threads_1.getThreadCountsIncludingDirect, (channels, myMembers, messageCounts, users, currentUserId, currentTeamId, myTeams, myTeamMemberships, collapsedThreads, threadCounts, threadCountsIncludingDirect) => {
-    const { messages: currentTeamUnreadMessages, mentions: currentTeamUnreadMentions, } = Object.entries(myMembers).reduce((counts, [channelId, membership]) => {
+exports.getUnreadStatus = (0, create_selector_1.createSelector)('getUnreadStatus', getAllChannels, exports.getMyChannelMemberships, getChannelMessageCounts, common_1.getUsers, users_1.getCurrentUserId, teams_1.getCurrentTeamId, preferences_1.isCollapsedThreadsEnabled, threads_1.getThreadCounts, threads_1.getThreadCountsIncludingDirect, (channels, myMembers, messageCounts, users, currentUserId, currentTeamId, collapsedThreads, threadCounts, threadCountsIncludingDirect) => {
+    const { messages: unreadMessages, mentions: unreadMentions, } = Object.entries(myMembers).reduce((counts, [channelId, membership]) => {
         const channel = channels[channelId];
         if (!channel || !membership) {
             return counts;
         }
-        if (
-        // other-team non-DM/non-GM channels
-        channel.team_id !== currentTeamId &&
-            channel.type !== constants_1.General.DM_CHANNEL &&
-            channel.type !== constants_1.General.GM_CHANNEL) {
-            return counts;
-        }
         const channelExists = channel.type === constants_1.General.DM_CHANNEL ? users[(0, channel_utils_1.getUserIdFromChannelName)(currentUserId, channel.name)]?.delete_at === 0 : channel.delete_at === 0;
         if (!channelExists) {
             return counts;
@@ -363,21 +367,8 @@ exports.getUnreadStatus = (0, create_selector_1.createSelector)('getUnreadStatus
         messages: 0,
         mentions: 0,
     });
-    // Includes mention count and message count from teams other than the current team
-    // This count does not include GM's and DM's
-    const { messages: otherTeamsUnreadMessages, mentions: otherTeamsUnreadMentions, } = myTeams.reduce((acc, team) => {
-        if (currentTeamId !== team.id) {
-            const member = myTeamMemberships[team.id];
-            acc.messages += collapsedThreads ? member.msg_count_root : member.msg_count;
-            acc.mentions += collapsedThreads ? member.mention_count_root : member.mention_count;
-        }
-        return acc;
-    }, {
-        messages: 0,
-        mentions: 0,
-    });
-    const totalUnreadMessages = currentTeamUnreadMessages + otherTeamsUnreadMessages;
-    let totalUnreadMentions = currentTeamUnreadMentions + otherTeamsUnreadMentions;
+    const totalUnreadMessages = unreadMessages;
+    let totalUnreadMentions = unreadMentions;
     let anyUnreadThreads = false;
     // when collapsed threads are enabled, we start with root-post counts from channels, then
     // add the same thread-reply counts from the global threads view

package/lib/selectors/entities/general.d.ts

@@ -1,7 +1,6 @@
 import type { ClientConfig, FeatureFlags, ClientLicense } from '@mattermost/types/config';
 import type { UserPropertyField } from '@mattermost/types/properties';
 import type { GlobalState } from '@mattermost/types/store';
-import type { IDMappedObjects } from '@mattermost/types/utilities';
 export declare function getConfig(state: GlobalState): Partial<ClientConfig>;
 /**
  * Safely get value of a specific or known FeatureFlag
@@ -30,4 +29,4 @@ export declare const isMarketplaceEnabled: (state: GlobalState) => boolean;
 export declare const getUsersStatusAndProfileFetchingPollInterval: (state: GlobalState) => number | null;
 export declare function developerModeEnabled(state: GlobalState): boolean;
 export declare function testingEnabled(state: GlobalState): boolean;
-export declare function getCustomProfileAttributes(state: GlobalState): IDMappedObjects<UserPropertyField>;
+export declare const getCustomProfileAttributes: (state: GlobalState) => UserPropertyField[];

package/lib/selectors/entities/general.js

@@ -2,7 +2,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUsersStatusAndProfileFetchingPollInterval = exports.isMarketplaceEnabled = exports.getServerVersion = exports.getManagedResourcePaths = exports.getAutolinkedUrlSchemes = exports.canDownloadFilesOnMobile = exports.canUploadFilesOnMobile = exports.isCloudLicense = exports.getPasswordConfig = void 0;
+exports.getCustomProfileAttributes = exports.getUsersStatusAndProfileFetchingPollInterval = exports.isMarketplaceEnabled = exports.getServerVersion = exports.getManagedResourcePaths = exports.getAutolinkedUrlSchemes = exports.canDownloadFilesOnMobile = exports.canUploadFilesOnMobile = exports.isCloudLicense = exports.getPasswordConfig = void 0;
 exports.getConfig = getConfig;
 exports.getFeatureFlagValue = getFeatureFlagValue;
 exports.getLicense = getLicense;
@@ -12,7 +12,6 @@ exports.getFirstAdminSetupComplete = getFirstAdminSetupComplete;
 exports.isPerformanceDebuggingEnabled = isPerformanceDebuggingEnabled;
 exports.developerModeEnabled = developerModeEnabled;
 exports.testingEnabled = testingEnabled;
-exports.getCustomProfileAttributes = getCustomProfileAttributes;
 const constants_1 = require("mattermost-redux/constants");
 const create_selector_1 = require("mattermost-redux/selectors/create_selector");
 const helpers_1 = require("mattermost-redux/utils/helpers");
@@ -97,6 +96,6 @@ function developerModeEnabled(state) {
 function testingEnabled(state) {
     return state.entities.general.config.EnableTesting === 'true';
 }
-function getCustomProfileAttributes(state) {
-    return state.entities.general.customProfileAttributes;
-}
+exports.getCustomProfileAttributes = (0, create_selector_1.createSelector)('getCustomProfileAttributes', (state) => state.entities.general.customProfileAttributes, (fields) => {
+    return Object.values(fields).sort((a, b) => (a.attrs?.sort_order ?? 0) - (b.attrs?.sort_order ?? 0));
+});

package/lib/selectors/entities/groups.js

@@ -116,13 +116,13 @@ exports.getMyGroups = (0, create_selector_1.createSelector)('getGroupsNotAssocia
     return (0, group_utils_1.sortGroups)(getGroupInfoForIds(allGroups, myGroupIds));
 });
 exports.getGroupsNotAssociatedToTeam = (0, create_selector_1.createSelector)('getGroupsNotAssociatedToTeam', getAllGroups, (state, teamID) => getTeamGroupIDSet(state, teamID), (allGroups, teamGroupIDSet) => {
-    return Object.entries(allGroups).filter(([groupID, group]) => !teamGroupIDSet.has(groupID) && group.source === groups_1.GroupSource.Ldap).map((entry) => entry[1]);
+    return Object.entries(allGroups).filter(([groupID, group]) => !teamGroupIDSet.has(groupID) && (0, group_utils_1.isSyncableSource)(group.source)).map((entry) => entry[1]);
 });
 exports.getGroupsAssociatedToTeam = (0, create_selector_1.createSelector)('getGroupsAssociatedToTeam', getAllGroups, (state, teamID) => getTeamGroupIDSet(state, teamID), (allGroups, teamGroupIDSet) => {
     return Object.entries(allGroups).filter(([groupID]) => teamGroupIDSet.has(groupID)).map((entry) => entry[1]);
 });
 exports.getGroupsNotAssociatedToChannel = (0, create_selector_1.createSelector)('getGroupsNotAssociatedToChannel', getAllGroups, (state, channelID) => getChannelGroupIDSet(state, channelID), (state, channelID, teamID) => (0, teams_1.getTeam)(state, teamID), (state, channelID, teamID) => (0, exports.getGroupsAssociatedToTeam)(state, teamID), (allGroups, channelGroupIDSet, team, teamGroups) => {
-    let result = Object.values(allGroups).filter((group) => !channelGroupIDSet.has(group.id) && group.source === groups_1.GroupSource.Ldap);
+    let result = Object.values(allGroups).filter((group) => !channelGroupIDSet.has(group.id) && (0, group_utils_1.isSyncableSource)(group.source));
     if (team?.group_constrained) {
         const gids = teamGroups.map((group) => group.id);
         result = result.filter((group) => gids?.includes(group.id));

package/lib/selectors/entities/roles.js

@@ -13,6 +13,7 @@ const create_selector_1 = require("mattermost-redux/selectors/create_selector");
 const common_1 = require("mattermost-redux/selectors/entities/common");
 const roles_helpers_1 = require("mattermost-redux/selectors/entities/roles_helpers");
 const teams_1 = require("mattermost-redux/selectors/entities/teams");
+const group_utils_1 = require("mattermost-redux/utils/group_utils");
 // Re-define these types to ensure that these are typed correctly when mattermost-redux is published
 exports.getMySystemPermissions = roles_helpers_1.getMySystemPermissions;
 exports.getMySystemRoles = roles_helpers_1.getMySystemRoles;
@@ -60,9 +61,9 @@ exports.getGroupListPermissions = (0, create_selector_1.createSelector)('getGrou
     const groupPermissionsMap = {};
     groups.forEach((g) => {
         groupPermissionsMap[g.id] = {
-            can_delete: permissions.has(constants_1.Permissions.DELETE_CUSTOM_GROUP) && g.source.toLowerCase() !== 'ldap' && g.delete_at === 0,
-            can_manage_members: permissions.has(constants_1.Permissions.MANAGE_CUSTOM_GROUP_MEMBERS) && g.source.toLowerCase() !== 'ldap' && g.delete_at === 0,
-            can_restore: permissions.has(constants_1.Permissions.RESTORE_CUSTOM_GROUP) && g.source.toLowerCase() !== 'ldap' && g.delete_at !== 0,
+            can_delete: permissions.has(constants_1.Permissions.DELETE_CUSTOM_GROUP) && !(0, group_utils_1.isSyncableSource)(g.source) && g.delete_at === 0,
+            can_manage_members: permissions.has(constants_1.Permissions.MANAGE_CUSTOM_GROUP_MEMBERS) && !(0, group_utils_1.isSyncableSource)(g.source) && g.delete_at === 0,
+            can_restore: permissions.has(constants_1.Permissions.RESTORE_CUSTOM_GROUP) && !(0, group_utils_1.isSyncableSource)(g.source) && g.delete_at !== 0,
         };
     });
     return groupPermissionsMap;
@@ -120,12 +121,12 @@ function haveITeamPermission(state, teamId, permission) {
 }
 exports.haveIGroupPermission = (0, create_selector_1.createSelector)('haveIGroupPermission', exports.getMySystemPermissions, getMyPermissionsByGroup, (state, groupID) => state.entities.groups.groups[groupID], (state, groupID, permission) => permission, (systemPermissions, permissionGroups, group, permission) => {
     if (permission === constants_1.Permissions.RESTORE_CUSTOM_GROUP) {
-        if ((group.source !== 'ldap' && group.delete_at !== 0) && (systemPermissions.has(permission) || (permissionGroups[group.id] && permissionGroups[group.id].has(permission)))) {
+        if ((!(0, group_utils_1.isSyncableSource)(group.source) && group.delete_at !== 0) && (systemPermissions.has(permission) || (permissionGroups[group.id] && permissionGroups[group.id].has(permission)))) {
             return true;
         }
         return false;
     }
-    if (group.source === 'ldap' || group.delete_at !== 0) {
+    if ((0, group_utils_1.isSyncableSource)(group.source) || group.delete_at !== 0) {
         return false;
     }
     if (systemPermissions.has(permission)) {

package/lib/selectors/entities/threads.d.ts

@@ -13,7 +13,7 @@ export declare const getThreadCountsInCurrentTeam: (state: GlobalState) => Threa
 export declare function getThreads(state: GlobalState): IDMappedObjects<UserThread>;
 export declare function getThread(state: GlobalState, threadId?: UserThread['id']): UserThread | null;
 export declare function makeGetThreadOrSynthetic(): (state: GlobalState, rootPost: Post) => UserThread | UserThreadSynthetic;
-export declare const getThreadOrderInCurrentTeam: (state: GlobalState, selectedThreadIdInTeam?: UserThread['id']) => Array<UserThread['id']>;
+export declare const getThreadOrderInCurrentTeam: (state: GlobalState) => Array<UserThread['id']>;
 export declare const getNewestThreadInTeam: (state: GlobalState, teamID: string) => (UserThread | null);
-export declare const getUnreadThreadOrderInCurrentTeam: (state: GlobalState, selectedThreadIdInTeam?: UserThread['id']) => Array<UserThread['id']>;
+export declare const getUnreadThreadOrderInCurrentTeam: (state: GlobalState) => Array<UserThread['id']>;
 export declare const getThreadsInChannel: (state: GlobalState, channelID: string) => UserThread[];

package/lib/selectors/entities/threads.js

@@ -64,11 +64,8 @@ function makeGetThreadOrSynthetic() {
         };
     });
 }
-exports.getThreadOrderInCurrentTeam = (0, create_selector_1.createSelector)('getThreadOrderInCurrentTeam', exports.getThreadsInCurrentTeam, getThreads, (state, selectedThreadIdInTeam) => selectedThreadIdInTeam, (threadsInTeam, threads, selectedThreadIdInTeam) => {
+exports.getThreadOrderInCurrentTeam = (0, create_selector_1.createSelector)('getThreadOrderInCurrentTeam', exports.getThreadsInCurrentTeam, getThreads, (threadsInTeam, threads) => {
     const ids = [...threadsInTeam.filter((id) => threads[id].is_following)];
-    if (selectedThreadIdInTeam && !ids.includes(selectedThreadIdInTeam)) {
-        ids.push(selectedThreadIdInTeam);
-    }
     return sortByLastReply(ids, threads);
 });
 exports.getNewestThreadInTeam = (0, create_selector_1.createSelector)('getNewestThreadInTeam', getThreadsInTeam, getThreads, (state, teamID) => teamID, (threadsInTeam, threads, teamID) => {
@@ -79,14 +76,11 @@ exports.getNewestThreadInTeam = (0, create_selector_1.createSelector)('getNewest
     const ids = [...threadsInGivenTeam.filter((id) => threads[id].is_following)];
     return threads[sortByLastReply(ids, threads)[0]];
 });
-exports.getUnreadThreadOrderInCurrentTeam = (0, create_selector_1.createSelector)('getUnreadThreadOrderInCurrentTeam', exports.getUnreadThreadsInCurrentTeam, getThreads, (state, selectedThreadIdInTeam) => selectedThreadIdInTeam, (threadsInTeam, threads, selectedThreadIdInTeam) => {
+exports.getUnreadThreadOrderInCurrentTeam = (0, create_selector_1.createSelector)('getUnreadThreadOrderInCurrentTeam', exports.getUnreadThreadsInCurrentTeam, getThreads, (threadsInTeam, threads) => {
     const ids = threadsInTeam.filter((id) => {
         const thread = threads[id];
         return thread.is_following && (thread.unread_replies || thread.unread_mentions);
     });
-    if (selectedThreadIdInTeam && !ids.includes(selectedThreadIdInTeam)) {
-        ids.push(selectedThreadIdInTeam);
-    }
     return sortByLastReply(ids, threads);
 });
 function sortByLastReply(ids, threads) {

package/lib/store/initial_state.js

@@ -131,6 +131,7 @@ const state = {
             commands: {},
             appsBotIDs: [],
             appsOAuthAppIDs: [],
+            dialogTriggerId: '',
             outgoingOAuthConnections: {},
         },
         files: {

package/lib/utils/channel_utils.js

@@ -157,6 +157,10 @@ function completeDirectGroupInfo(usersState, teammateNameDisplay, channel, omitC
     const profilesIds = profilesInChannel[channel.id];
     const gm = { ...channel };
     if (profilesIds) {
+        // sometimes the current user is not part of the profilesInChannel
+        if (!omitCurrentUser) {
+            profilesIds.add(currentUserId);
+        }
         gm.display_name = getGroupDisplayNameFromUserIds(profilesIds, profiles, currentUserId, teammateNameDisplay, omitCurrentUser);
         return gm;
     }

package/lib/utils/file_utils.d.ts

@@ -1,5 +1,5 @@
 import type { FileInfo } from '@mattermost/types/files';
-export declare function getFormattedFileSize(file: FileInfo): string;
+export declare function getFormattedFileSize(bytes: number): string;
 export declare function getFileType(file: FileInfo): string;
 export declare function getFileUrl(fileId: string): string;
 export declare function getFileDownloadUrl(fileId: string): string;

package/lib/utils/file_utils.js

@@ -12,8 +12,7 @@ exports.getFileMiniPreviewUrl = getFileMiniPreviewUrl;
 exports.sortFileInfos = sortFileInfos;
 const client_1 = require("mattermost-redux/client");
 const constants_1 = require("../constants");
-function getFormattedFileSize(file) {
-    const bytes = file.size;
+function getFormattedFileSize(bytes) {
     const fileSizes = [
         ['TB', 1024 * 1024 * 1024 * 1024],
         ['GB', 1024 * 1024 * 1024],

package/lib/utils/group_utils.d.ts

@@ -1,3 +1,4 @@
 import type { Group } from '@mattermost/types/groups';
+export declare function isSyncableSource(source: string): boolean;
 export declare function filterGroupsMatchingTerm(groups: Group[], term: string): Group[];
 export declare function sortGroups(groups?: Group[], locale?: string): Group[];

package/lib/utils/group_utils.js

@@ -2,10 +2,15 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSyncableSource = isSyncableSource;
 exports.filterGroupsMatchingTerm = filterGroupsMatchingTerm;
 exports.sortGroups = sortGroups;
+const groups_1 = require("@mattermost/types/groups");
 const user_utils_1 = require("./user_utils");
 const constants_1 = require("../constants");
+function isSyncableSource(source) {
+    return source.toLowerCase() === groups_1.GroupSource.Ldap || source.toLowerCase().startsWith(groups_1.PluginGroupSourcePrefix.Plugin);
+}
 function filterGroupsMatchingTerm(groups, term) {
     const lowercasedTerm = term.toLowerCase();
     let trimmedTerm = lowercasedTerm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mattermost-redux",
-  "version": "10.6.0-0",
+  "version": "10.7.0",
   "description": "Common code (API client, Redux stores, logic, utility functions) for building a Mattermost client",
   "keywords": [
     "mattermost"
@@ -31,8 +31,8 @@
     "directory": "webapp/platform/mattermost-redux"
   },
   "dependencies": {
-    "@mattermost/client": "10.6.0-0",
-    "@mattermost/types": "10.6.0-0",
+    "@mattermost/client": "10.6.0",
+    "@mattermost/types": "10.6.0",
     "@redux-devtools/extension": "^3.2.3",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.38",
@@ -54,8 +54,6 @@
   "scripts": {
     "build": "tsc --build --verbose",
     "postbuild": "cp ../../channels/src/packages/mattermost-redux/src/selectors/create_selector/index.d.ts lib/selectors/create_selector/index.d.ts",
-    "check": "eslint --ext .js,.jsx,.tsx,.ts ./src --quiet",
-    "run": "tsc --watch --preserveWatchOutput",
     "clean": "rm -rf lib node_modules *.tsbuildinfo"
   }
 }

package/lib/client/rudder.d.ts

@@ -1,8 +0,0 @@
-import * as rudderAnalytics from 'rudder-sdk-js';
-import type { TelemetryHandler } from '@mattermost/client';
-export { rudderAnalytics };
-export declare class RudderTelemetryHandler implements TelemetryHandler {
-    trackEvent(userId: string, userRoles: string, category: string, event: string, props?: Record<string, unknown>): void;
-    trackFeatureEvent(userId: string, userRoles: string, featureName: string, event: string, props?: Record<string, unknown>): void;
-    pageVisited(userId: string, userRoles: string, category: string, name: string): void;
-}

package/lib/client/rudder.js

@@ -1,112 +0,0 @@
-"use strict";
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RudderTelemetryHandler = exports.rudderAnalytics = void 0;
-// As per rudder-sdk-js documentation, import this only once and use like a singleton.
-// See https://github.com/rudderlabs/rudder-sdk-js#step-1-install-rudderstack-using-the-code-snippet
-const rudderAnalytics = __importStar(require("rudder-sdk-js"));
-exports.rudderAnalytics = rudderAnalytics;
-const telemetry_1 = require("mattermost-redux/constants/telemetry");
-const user_utils_1 = require("mattermost-redux/utils/user_utils");
-class RudderTelemetryHandler {
-    trackEvent(userId, userRoles, category, event, props = {}) {
-        const properties = Object.assign({
-            category,
-            type: event,
-            user_actual_role: getActualRoles(userRoles),
-            [telemetry_1.TrackPropertyUser]: userId,
-        }, props);
-        const options = {
-            context: {
-                ip: '0.0.0.0',
-            },
-            page: {
-                path: '',
-                referrer: '',
-                search: '',
-                title: '',
-                url: '',
-            },
-            anonymousId: '00000000000000000000000000',
-        };
-        rudderAnalytics.track('event', properties, options);
-    }
-    trackFeatureEvent(userId, userRoles, featureName, event, props = {}) {
-        const properties = Object.assign({
-            category: getEventCategory(event),
-            type: event,
-            [telemetry_1.TrackPropertyUser]: userId,
-            user_actual_role: getActualRoles(userRoles),
-        }, props);
-        const options = {
-            context: {
-                feature: {
-                    name: featureName,
-                    skus: getSKUs(event),
-                },
-            },
-        };
-        rudderAnalytics.track(event, properties, options);
-    }
-    pageVisited(userId, userRoles, category, name) {
-        rudderAnalytics.page(category, name, {
-            path: '',
-            referrer: '',
-            search: '',
-            title: '',
-            url: '',
-            user_actual_role: getActualRoles(userRoles),
-            [telemetry_1.TrackPropertyUser]: userId,
-        }, {
-            context: {
-                ip: '0.0.0.0',
-            },
-            anonymousId: '00000000000000000000000000',
-        });
-    }
-}
-exports.RudderTelemetryHandler = RudderTelemetryHandler;
-function getActualRoles(userRoles) {
-    return userRoles && (0, user_utils_1.isSystemAdmin)(userRoles) ? 'system_admin, system_user' : 'system_user';
-}
-function getSKUs(eventName) {
-    const skus = telemetry_1.eventSKUs[eventName];
-    if (skus === undefined) {
-        // Next line is to be aware if you've forgotten to add a SKU, add an empty array for Team edition
-        // eslint-disable-next-line
-        console.warn(`Event ${eventName} has no SKUs attached`);
-    }
-    return skus ?? [];
-}
-function getEventCategory(eventName) {
-    const category = telemetry_1.eventCategory[eventName];
-    if (category === undefined) {
-        // eslint-disable-next-line
-        console.warn(`Event ${eventName} doesn't have a category`);
-    }
-    return category ?? telemetry_1.TrackMiscCategory;
-}