mattermost-redux 10.6.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/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/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/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[]>;
@@ -60,6 +61,7 @@ export declare function patchUser(user: UserProfile): ActionFuncAsync<UserProfil
 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)({
@@ -976,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/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/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/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/selectors/entities/channels.js

@@ -344,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;
@@ -374,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/store/initial_state.js

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

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",
+  "version": "10.7.0",
   "description": "Common code (API client, Redux stores, logic, utility functions) for building a Mattermost client",
   "keywords": [
     "mattermost"