mattermost-redux 10.8.0 → 10.9.0

package/lib/action_types/admin.d.ts

@@ -47,5 +47,13 @@ declare const _default: {
     REMOVE_DATA_RETENTION_CUSTOM_POLICY_TEAMS_FAILURE: "REMOVE_DATA_RETENTION_CUSTOM_POLICY_TEAMS_FAILURE";
     REMOVE_DATA_RETENTION_CUSTOM_POLICY_CHANNELS_SUCCESS: "REMOVE_DATA_RETENTION_CUSTOM_POLICY_CHANNELS_SUCCESS";
     REMOVE_DATA_RETENTION_CUSTOM_POLICY_CHANNELS_FAILURE: "REMOVE_DATA_RETENTION_CUSTOM_POLICY_CHANNELS_FAILURE";
+    RECEIVED_ACCESS_CONTROL_POLICIES: "RECEIVED_ACCESS_CONTROL_POLICIES";
+    RECEIVED_ACCESS_CONTROL_POLICY: "RECEIVED_ACCESS_CONTROL_POLICY";
+    CREATE_ACCESS_CONTROL_POLICY_SUCCESS: "CREATE_ACCESS_CONTROL_POLICY_SUCCESS";
+    DELETE_ACCESS_CONTROL_POLICY_SUCCESS: "DELETE_ACCESS_CONTROL_POLICY_SUCCESS";
+    RECEIVED_ACCESS_CONTROL_CHILD_POLICIES: "RECEIVED_ACCESS_CONTROL_CHILD_POLICIES";
+    RECEIVED_ACCESS_CONTROL_POLICIES_SEARCH: "RECEIVED_ACCESS_CONTROL_POLICIES_SEARCH";
+    ASSIGN_CHANNELS_TO_ACCESS_CONTROL_POLICY_SUCCESS: "ASSIGN_CHANNELS_TO_ACCESS_CONTROL_POLICY_SUCCESS";
+    UNASSIGN_CHANNELS_FROM_ACCESS_CONTROL_POLICY_SUCCESS: "UNASSIGN_CHANNELS_FROM_ACCESS_CONTROL_POLICY_SUCCESS";
 };
 export default _default;

package/lib/action_types/admin.js

@@ -55,4 +55,12 @@ exports.default = (0, key_mirror_1.default)({
     REMOVE_DATA_RETENTION_CUSTOM_POLICY_TEAMS_FAILURE: null,
     REMOVE_DATA_RETENTION_CUSTOM_POLICY_CHANNELS_SUCCESS: null,
     REMOVE_DATA_RETENTION_CUSTOM_POLICY_CHANNELS_FAILURE: null,
+    RECEIVED_ACCESS_CONTROL_POLICIES: null,
+    RECEIVED_ACCESS_CONTROL_POLICY: null,
+    CREATE_ACCESS_CONTROL_POLICY_SUCCESS: null,
+    DELETE_ACCESS_CONTROL_POLICY_SUCCESS: null,
+    RECEIVED_ACCESS_CONTROL_CHILD_POLICIES: null,
+    RECEIVED_ACCESS_CONTROL_POLICIES_SEARCH: null,
+    ASSIGN_CHANNELS_TO_ACCESS_CONTROL_POLICY_SUCCESS: null,
+    UNASSIGN_CHANNELS_FROM_ACCESS_CONTROL_POLICY_SUCCESS: null,
 });

package/lib/action_types/users.d.ts

@@ -61,5 +61,6 @@ declare const _default: {
     RECEIVED_FILTERED_USER_STATS: "RECEIVED_FILTERED_USER_STATS";
     PROFILE_NO_LONGER_VISIBLE: "PROFILE_NO_LONGER_VISIBLE";
     LOGIN: "LOGIN";
+    CLEAR_CPA_VALUES: "CLEAR_CPA_VALUES";
 };
 export default _default;

package/lib/action_types/users.js

@@ -69,4 +69,5 @@ exports.default = (0, key_mirror_1.default)({
     RECEIVED_FILTERED_USER_STATS: null,
     PROFILE_NO_LONGER_VISIBLE: null,
     LOGIN: null,
+    CLEAR_CPA_VALUES: null,
 });

package/lib/actions/access_control.d.ts

@@ -0,0 +1,14 @@
+import type { AccessControlPoliciesResult, AccessControlPolicy, AccessControlTestResult } from '@mattermost/types/access_control';
+import type { ChannelSearchOpts, ChannelsWithTotalCount } from '@mattermost/types/channels';
+import type { ActionFuncAsync } from 'mattermost-redux/types/actions';
+export declare function getAccessControlPolicy(id: string): ActionFuncAsync<AccessControlPolicy, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function createAccessControlPolicy(policy: AccessControlPolicy): ActionFuncAsync<AccessControlPolicy>;
+export declare function deleteAccessControlPolicy(id: string): ActionFuncAsync<AccessControlPolicy, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function searchAccessControlPolicies(term: string, type: string, after: string, limit: number): ActionFuncAsync<AccessControlPoliciesResult>;
+export declare function searchAccessControlPolicyChannels(id: string, term: string, opts: ChannelSearchOpts): ActionFuncAsync<ChannelsWithTotalCount>;
+export declare function assignChannelsToAccessControlPolicy(policyId: string, channelIds: string[]): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function unassignChannelsFromAccessControlPolicy(policyId: string, channelIds: string[]): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function getAccessControlFields(after: string, limit: number): ActionFuncAsync<import("@mattermost/types/properties").UserPropertyField[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function updateAccessControlPolicyActive(policyId: string, active: boolean): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function searchUsersForExpression(expression: string, term: string, after: string, limit: number): ActionFuncAsync<AccessControlTestResult>;
+export declare function getVisualAST(expression: string): ActionFuncAsync<import("@mattermost/types/access_control").AccessControlVisualAST, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;

package/lib/actions/access_control.js

@@ -0,0 +1,142 @@
+"use strict";
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAccessControlPolicy = getAccessControlPolicy;
+exports.createAccessControlPolicy = createAccessControlPolicy;
+exports.deleteAccessControlPolicy = deleteAccessControlPolicy;
+exports.searchAccessControlPolicies = searchAccessControlPolicies;
+exports.searchAccessControlPolicyChannels = searchAccessControlPolicyChannels;
+exports.assignChannelsToAccessControlPolicy = assignChannelsToAccessControlPolicy;
+exports.unassignChannelsFromAccessControlPolicy = unassignChannelsFromAccessControlPolicy;
+exports.getAccessControlFields = getAccessControlFields;
+exports.updateAccessControlPolicyActive = updateAccessControlPolicyActive;
+exports.searchUsersForExpression = searchUsersForExpression;
+exports.getVisualAST = getVisualAST;
+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 helpers_1 = require("./helpers");
+function getAccessControlPolicy(id) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.getAccessControlPolicy,
+        onSuccess: [action_types_1.AdminTypes.RECEIVED_ACCESS_CONTROL_POLICY],
+        params: [
+            id,
+        ],
+    });
+}
+function createAccessControlPolicy(policy) {
+    return async (dispatch, getState) => {
+        let data;
+        try {
+            data = await client_1.Client4.updateOrCreateAccessControlPolicy(policy);
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            return { error };
+        }
+        dispatch({ type: action_types_1.AdminTypes.CREATE_ACCESS_CONTROL_POLICY_SUCCESS, data });
+        return { data };
+    };
+}
+function deleteAccessControlPolicy(id) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.deleteAccessControlPolicy,
+        onSuccess: [action_types_1.AdminTypes.DELETE_ACCESS_CONTROL_POLICY_SUCCESS],
+        params: [
+            id,
+        ],
+    });
+}
+function searchAccessControlPolicies(term, type, after, limit) {
+    return async (dispatch, getState) => {
+        let data;
+        try {
+            data = await client_1.Client4.searchAccessControlPolicies(term, type, after, limit);
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            return { error };
+        }
+        dispatch({ type: action_types_1.AdminTypes.RECEIVED_ACCESS_CONTROL_POLICIES_SEARCH, data: data.policies });
+        return { data };
+    };
+}
+function searchAccessControlPolicyChannels(id, term, opts) {
+    return async (dispatch, getState) => {
+        let data;
+        try {
+            data = await client_1.Client4.searchChildAccessControlPolicyChannels(id, term, opts);
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            return { error };
+        }
+        const childs = {};
+        childs[id] = data.channels.map((channel) => channel.id);
+        dispatch((0, redux_batched_actions_1.batchActions)([
+            { type: action_types_1.AdminTypes.RECEIVED_ACCESS_CONTROL_CHILD_POLICIES, data: childs },
+            { type: action_types_1.ChannelTypes.RECEIVED_CHANNELS, data: data.channels },
+        ]));
+        return { data };
+    };
+}
+function assignChannelsToAccessControlPolicy(policyId, channelIds) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.assignChannelsToAccessControlPolicy,
+        onSuccess: [action_types_1.AdminTypes.ASSIGN_CHANNELS_TO_ACCESS_CONTROL_POLICY_SUCCESS],
+        params: [
+            policyId,
+            channelIds,
+        ],
+    });
+}
+function unassignChannelsFromAccessControlPolicy(policyId, channelIds) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.unassignChannelsFromAccessControlPolicy,
+        onSuccess: [action_types_1.AdminTypes.UNASSIGN_CHANNELS_FROM_ACCESS_CONTROL_POLICY_SUCCESS],
+        params: [
+            policyId,
+            channelIds,
+        ],
+    });
+}
+function getAccessControlFields(after, limit) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.getAccessControlFields,
+        params: [
+            after,
+            limit,
+        ],
+    });
+}
+function updateAccessControlPolicyActive(policyId, active) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.updateAccessControlPolicyActive,
+        params: [
+            policyId,
+            active,
+        ],
+    });
+}
+function searchUsersForExpression(expression, term, after, limit) {
+    return async (dispatch, getState) => {
+        let data;
+        try {
+            data = await client_1.Client4.testAccessControlExpression(expression, term, after, limit);
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            return { error };
+        }
+        dispatch({ type: action_types_1.UserTypes.RECEIVED_PROFILES, data: data.users });
+        return { data };
+    };
+}
+function getVisualAST(expression) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.expressionToVisualFormat,
+        params: [expression],
+    });
+}

package/lib/actions/admin.d.ts

@@ -40,6 +40,8 @@ export declare function uploadPrivateSamlCertificate(fileData: File): ActionFunc
 export declare function uploadPublicLdapCertificate(fileData: File): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function uploadPrivateLdapCertificate(fileData: File): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function uploadIdpSamlCertificate(fileData: File): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function uploadAuditCertificate(fileData: File): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function removeAuditCertificate(): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function removePublicSamlCertificate(): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function removePrivateSamlCertificate(): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function removePublicLdapCertificate(): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;

package/lib/actions/admin.js

@@ -31,6 +31,8 @@ exports.uploadPrivateSamlCertificate = uploadPrivateSamlCertificate;
 exports.uploadPublicLdapCertificate = uploadPublicLdapCertificate;
 exports.uploadPrivateLdapCertificate = uploadPrivateLdapCertificate;
 exports.uploadIdpSamlCertificate = uploadIdpSamlCertificate;
+exports.uploadAuditCertificate = uploadAuditCertificate;
+exports.removeAuditCertificate = removeAuditCertificate;
 exports.removePublicSamlCertificate = removePublicSamlCertificate;
 exports.removePrivateSamlCertificate = removePrivateSamlCertificate;
 exports.removePublicLdapCertificate = removePublicLdapCertificate;
@@ -334,6 +336,19 @@ function uploadIdpSamlCertificate(fileData) {
         ],
     });
 }
+function uploadAuditCertificate(fileData) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.uploadAuditLogCertificate,
+        params: [
+            fileData,
+        ],
+    });
+}
+function removeAuditCertificate() {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.removeAuditLogCertificate,
+    });
+}
 function removePublicSamlCertificate() {
     return (0, helpers_1.bindClientFunc)({
         clientFunc: client_1.Client4.deletePublicSamlCertificate,

package/lib/actions/channels.d.ts

@@ -1,4 +1,5 @@
 import type { AnyAction } from 'redux';
+import type { AccessControlAttributes } from '@mattermost/types/access_control';
 import type { Channel, ChannelNotifyProps, ChannelMembership, ChannelModerationPatch, ChannelsWithTotalCount, ChannelSearchOpts, ServerChannel, ChannelStats, ChannelWithTeamData } from '@mattermost/types/channels';
 import type { OptsSignalExt } from '@mattermost/types/client4';
 import type { GetStateFunc, ActionFunc, ActionFuncAsync } from 'mattermost-redux/types/actions';
@@ -40,8 +41,8 @@ export declare function unsetActiveChannelOnServer(): ActionFuncAsync;
 export declare function readMultipleChannels(channelIds: string[]): ActionFuncAsync;
 export declare function getChannels(teamId: string, page?: number, perPage?: number): ActionFuncAsync<Channel[]>;
 export declare function getArchivedChannels(teamId: string, page?: number, perPage?: number): ActionFuncAsync<Channel[]>;
-export declare function getAllChannelsWithCount(page?: number, perPage?: number, notAssociatedToGroup?: string, excludeDefaultChannels?: boolean, includeDeleted?: boolean, excludePolicyConstrained?: boolean): ActionFuncAsync<ChannelsWithTotalCount>;
-export declare function getAllChannels(page?: number, perPage?: number, notAssociatedToGroup?: string, excludeDefaultChannels?: boolean, excludePolicyConstrained?: boolean): ActionFuncAsync<ChannelWithTeamData[]>;
+export declare function getAllChannelsWithCount(page?: number, perPage?: number, notAssociatedToGroup?: string, excludeDefaultChannels?: boolean, includeDeleted?: boolean, excludePolicyConstrained?: boolean, accessControlPolicyEnforced?: boolean, excludeAccessControlPolicyEnforced?: boolean): ActionFuncAsync<ChannelsWithTotalCount>;
+export declare function getAllChannels(page?: number, perPage?: number, notAssociatedToGroup?: string, excludeDefaultChannels?: boolean, excludePolicyConstrained?: boolean, excludeAccessControlPolicyEnforced?: boolean, accessControlPolicyEnforced?: boolean): ActionFuncAsync<ChannelWithTeamData[]>;
 export declare function autocompleteChannels(teamId: string, term: string): ActionFuncAsync<Channel[]>;
 export declare function autocompleteChannelsForSearch(teamId: string, term: string): ActionFuncAsync<Channel[]>;
 export declare function searchChannels(teamId: string, term: string, archived?: boolean): ActionFuncAsync<Channel[]>;
@@ -91,6 +92,7 @@ export declare function getChannelMemberCountsByGroup(channelId: string): Action
     memberCounts: import("@mattermost/types/channels").ChannelMemberCountsByGroup;
 }, import("@mattermost/types/store").GlobalState, AnyAction>;
 export declare function fetchMissingChannels(channelIDs: string[]): ActionFuncAsync<Array<Channel['id']>>;
+export declare function getChannelAccessControlAttributes(channelId: string): ActionFuncAsync<AccessControlAttributes>;
 declare const _default: {
     selectChannel: typeof selectChannel;
     createChannel: typeof createChannel;
@@ -120,5 +122,6 @@ declare const _default: {
     membersMinusGroupMembers: typeof membersMinusGroupMembers;
     getChannelModerations: typeof getChannelModerations;
     getChannelMemberCountsByGroup: typeof getChannelMemberCountsByGroup;
+    getChannelAccessControlAttributes: typeof getChannelAccessControlAttributes;
 };
 export default _default;

package/lib/actions/channels.js

@@ -58,6 +58,7 @@ exports.getChannelModerations = getChannelModerations;
 exports.patchChannelModerations = patchChannelModerations;
 exports.getChannelMemberCountsByGroup = getChannelMemberCountsByGroup;
 exports.fetchMissingChannels = fetchMissingChannels;
+exports.getChannelAccessControlAttributes = getChannelAccessControlAttributes;
 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");
@@ -411,8 +412,8 @@ function getChannelTimezones(channelId) {
 }
 function fetchChannelsAndMembers(teamId) {
     return async (dispatch, getState) => {
-        let channels;
-        let channelMembers;
+        let channels = [];
+        let channelMembers = [];
         try {
             [channels, channelMembers] = await Promise.all([
                 client_1.Client4.getMyChannels(teamId),
@@ -451,32 +452,32 @@ function fetchAllMyChannelMembers() {
     return async (dispatch, getState) => {
         const state = getState();
         const { currentUserId } = state.entities.users;
-        let channelsMembers = [];
-        let hasMoreMembers = true;
-        let page = 0;
+        let channelMembers = [];
         try {
-            while (hasMoreMembers) {
-                // Expected to disable since we don't have number of pages, so we can't use Promise.all
-                // eslint-disable-next-line no-await-in-loop
-                const data = await client_1.Client4.getAllChannelsMembers(currentUserId, page, 200);
-                channelsMembers = [...channelsMembers, ...data];
-                if (data.length < 200) {
-                    hasMoreMembers = false;
-                }
-                page++;
-            }
+            // The server exposes a streaming API if page is set to -1
+            // We don't need to paginate through the responses, and thefore pageSize doesn't matter
+            channelMembers = await client_1.Client4.getAllChannelsMembers(currentUserId, -1);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
             dispatch((0, errors_1.logError)(error));
             return { error };
         }
+        const roles = new Set();
+        for (const member of channelMembers) {
+            for (const role of member.roles.split(' ')) {
+                roles.add(role);
+            }
+        }
+        if (roles.size > 0) {
+            dispatch((0, roles_1.loadRolesIfNeeded)(roles));
+        }
         dispatch({
             type: action_types_1.ChannelTypes.RECEIVED_MY_CHANNEL_MEMBERS,
-            data: channelsMembers,
+            data: channelMembers,
             currentUserId,
         });
-        return { data: channelsMembers };
+        return { data: channelMembers };
     };
 }
 function fetchAllMyTeamsChannels() {
@@ -491,7 +492,7 @@ function fetchAllMyTeamsChannels() {
             return { error };
         }
         dispatch({
-            type: action_types_1.ChannelTypes.RECEIVED_ALL_CHANNELS,
+            type: action_types_1.ChannelTypes.RECEIVED_CHANNELS,
             data: channels,
         });
         return { data: channels };
@@ -735,12 +736,12 @@ function getArchivedChannels(teamId, page = 0, perPage = constants_1.General.CHA
         return { data: channels };
     };
 }
-function getAllChannelsWithCount(page = 0, perPage = constants_1.General.CHANNELS_CHUNK_SIZE, notAssociatedToGroup = '', excludeDefaultChannels = false, includeDeleted = false, excludePolicyConstrained = false) {
+function getAllChannelsWithCount(page = 0, perPage = constants_1.General.CHANNELS_CHUNK_SIZE, notAssociatedToGroup = '', excludeDefaultChannels = false, includeDeleted = false, excludePolicyConstrained = false, accessControlPolicyEnforced = false, excludeAccessControlPolicyEnforced = false) {
     return async (dispatch, getState) => {
         dispatch({ type: action_types_1.ChannelTypes.GET_ALL_CHANNELS_REQUEST, data: null });
         let payload;
         try {
-            payload = await client_1.Client4.getAllChannels(page, perPage, notAssociatedToGroup, excludeDefaultChannels, true, includeDeleted, excludePolicyConstrained);
+            payload = await client_1.Client4.getAllChannels(page, perPage, notAssociatedToGroup, excludeDefaultChannels, true, includeDeleted, excludePolicyConstrained, accessControlPolicyEnforced, excludeAccessControlPolicyEnforced);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
@@ -764,12 +765,12 @@ function getAllChannelsWithCount(page = 0, perPage = constants_1.General.CHANNEL
         return { data: payload };
     };
 }
-function getAllChannels(page = 0, perPage = constants_1.General.CHANNELS_CHUNK_SIZE, notAssociatedToGroup = '', excludeDefaultChannels = false, excludePolicyConstrained = false) {
+function getAllChannels(page = 0, perPage = constants_1.General.CHANNELS_CHUNK_SIZE, notAssociatedToGroup = '', excludeDefaultChannels = false, excludePolicyConstrained = false, excludeAccessControlPolicyEnforced = false, accessControlPolicyEnforced = false) {
     return async (dispatch, getState) => {
         dispatch({ type: action_types_1.ChannelTypes.GET_ALL_CHANNELS_REQUEST, data: null });
         let channels;
         try {
-            channels = await client_1.Client4.getAllChannels(page, perPage, notAssociatedToGroup, excludeDefaultChannels, false, false, excludePolicyConstrained);
+            channels = await client_1.Client4.getAllChannels(page, perPage, notAssociatedToGroup, excludeDefaultChannels, false, false, excludePolicyConstrained, accessControlPolicyEnforced, excludeAccessControlPolicyEnforced);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
@@ -1317,6 +1318,20 @@ function fetchMissingChannels(channelIDs) {
         };
     };
 }
+function getChannelAccessControlAttributes(channelId) {
+    return async (dispatch, getState) => {
+        let data;
+        try {
+            data = await client_1.Client4.getChannelAccessControlAttributes(channelId);
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            dispatch((0, errors_1.logError)(error));
+            return { error };
+        }
+        return { data };
+    };
+}
 exports.default = {
     selectChannel,
     createChannel,
@@ -1346,4 +1361,5 @@ exports.default = {
     membersMinusGroupMembers,
     getChannelModerations,
     getChannelMemberCountsByGroup,
+    getChannelAccessControlAttributes,
 };

package/lib/actions/posts.d.ts

@@ -97,7 +97,7 @@ export declare function addReaction(postId: string, emojiName: string): ActionFu
 export declare function removeReaction(postId: string, emojiName: string): ActionFuncAsync<SubmitReactionReturnType>;
 export declare function getCustomEmojiForReaction(name: string): ActionFuncAsync;
 export declare function flagPost(postId: string): ActionFuncAsync;
-export declare function getPostThread(rootId: string, fetchThreads?: boolean): ActionFuncAsync<PostList>;
+export declare function getPostThread(rootId: string, fetchThreads?: boolean, lastUpdateAt?: number): ActionFuncAsync<PostList>;
 export declare function getNewestPostThread(rootId: string): ActionFuncAsync;
 export declare function getPosts(channelId: string, page?: number, perPage?: number, fetchThreads?: boolean, collapsedThreadsExtended?: boolean): ActionFuncAsync<PostList>;
 export declare function getPostsUnread(channelId: string, fetchThreads?: boolean, collapsedThreadsExtended?: boolean): ActionFuncAsync<PostList>;

package/lib/actions/posts.js

@@ -587,23 +587,41 @@ async function getPaginatedPostThread(rootId, options, prevList) {
     if (result.has_next) {
         const [nextPostId] = list.order.slice(-1);
         const nextPostPointer = list.posts[nextPostId];
-        const newOptions = {
-            ...options,
-            fromCreateAt: nextPostPointer.create_at,
-            fromPost: nextPostId,
-        };
+        let newOptions;
+        if (options.updatesOnly) {
+            newOptions = {
+                ...options,
+                fromUpdateAt: nextPostPointer.update_at,
+                fromPost: nextPostId,
+            };
+        }
+        else {
+            newOptions = {
+                ...options,
+                fromCreateAt: nextPostPointer.create_at,
+                fromPost: nextPostId,
+            };
+        }
         return getPaginatedPostThread(rootId, newOptions, list);
     }
     return list;
 }
-function getPostThread(rootId, fetchThreads = true) {
+function getPostThread(rootId, fetchThreads = true, lastUpdateAt = 0) {
     return async (dispatch, getState) => {
         const state = getState();
         const collapsedThreadsEnabled = (0, preferences_2.isCollapsedThreadsEnabled)(state);
         const enabledUserStatuses = (0, common_1.getIsUserStatusesConfigEnabled)(state);
         let posts;
+        const options = {
+            fetchThreads,
+            collapsedThreads: collapsedThreadsEnabled,
+        };
+        if (lastUpdateAt !== 0) {
+            options.updatesOnly = true;
+            options.fromUpdateAt = lastUpdateAt;
+        }
         try {
-            posts = await getPaginatedPostThread(rootId, { fetchThreads, collapsedThreads: collapsedThreadsEnabled });
+            posts = await getPaginatedPostThread(rootId, options);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);

package/lib/constants/general.d.ts

@@ -74,6 +74,6 @@ declare const _default: {
     CUSTOM_GROUP_USER_ROLE: string;
     MAX_GET_ROLES_BY_NAMES: number;
     SKUEnterprise: string;
-    SKUPremium: string;
+    SKUEnterpriseAdvanced: string;
 };
 export default _default;

package/lib/constants/general.js

@@ -78,5 +78,5 @@ exports.default = {
     CUSTOM_GROUP_USER_ROLE: 'custom_group_user',
     MAX_GET_ROLES_BY_NAMES: 100,
     SKUEnterprise: 'enterprise',
-    SKUPremium: 'premium',
+    SKUEnterpriseAdvanced: 'advanced',
 };

package/lib/constants/permissions.d.ts

@@ -27,6 +27,8 @@ declare const values: {
     DELETE_PUBLIC_CHANNEL: string;
     CONVERT_PUBLIC_CHANNEL_TO_PRIVATE: string;
     CONVERT_PRIVATE_CHANNEL_TO_PUBLIC: string;
+    MANAGE_PUBLIC_CHANNEL_BANNER: string;
+    MANAGE_PRIVATE_CHANNEL_BANNER: string;
     DELETE_PRIVATE_CHANNEL: string;
     EDIT_OTHER_USERS: string;
     READ_CHANNEL: string;

package/lib/constants/permissions.js

@@ -31,6 +31,8 @@ const values = {
     DELETE_PUBLIC_CHANNEL: 'delete_public_channel',
     CONVERT_PUBLIC_CHANNEL_TO_PRIVATE: 'convert_public_channel_to_private',
     CONVERT_PRIVATE_CHANNEL_TO_PUBLIC: 'convert_private_channel_to_public',
+    MANAGE_PUBLIC_CHANNEL_BANNER: 'manage_public_channel_banner',
+    MANAGE_PRIVATE_CHANNEL_BANNER: 'manage_private_channel_banner',
     DELETE_PRIVATE_CHANNEL: 'delete_private_channel',
     EDIT_OTHER_USERS: 'edit_other_users',
     READ_CHANNEL: 'read_channel',

package/lib/constants/permissions_sysconsole.d.ts

@@ -15,6 +15,10 @@ export declare const RESOURCE_KEYS: {
         PERMISSIONS: string;
         SYSTEM_ROLES: string;
     };
+    SYSTEM_ATTRIBUTES: {
+        USER_ATTRIBUTES: string;
+        ATTRIBUTE_BASED_ACCESS_CONTROL: string;
+    };
     AUTHENTICATION: {
         SIGNUP: string;
         EMAIL: string;

package/lib/constants/permissions_sysconsole.js

@@ -24,6 +24,10 @@ exports.RESOURCE_KEYS = {
         PERMISSIONS: 'user_management.permissions',
         SYSTEM_ROLES: 'user_management.system_roles',
     },
+    SYSTEM_ATTRIBUTES: {
+        USER_ATTRIBUTES: 'system_attributes.user_attributes',
+        ATTRIBUTE_BASED_ACCESS_CONTROL: 'system_attributes.attribute_based_access_control',
+    },
     AUTHENTICATION: {
         SIGNUP: 'authentication.signup',
         EMAIL: 'authentication.email',
@@ -96,6 +100,8 @@ exports.ResourceToSysConsolePermissionsTable = {
     [exports.RESOURCE_KEYS.USER_MANAGEMENT.CHANNELS]: [permissions_1.default.SYSCONSOLE_READ_USERMANAGEMENT_CHANNELS, permissions_1.default.SYSCONSOLE_WRITE_USERMANAGEMENT_CHANNELS],
     [exports.RESOURCE_KEYS.USER_MANAGEMENT.PERMISSIONS]: [permissions_1.default.SYSCONSOLE_READ_USERMANAGEMENT_PERMISSIONS, permissions_1.default.SYSCONSOLE_WRITE_USERMANAGEMENT_PERMISSIONS],
     [exports.RESOURCE_KEYS.USER_MANAGEMENT.SYSTEM_ROLES]: [permissions_1.default.SYSCONSOLE_READ_USERMANAGEMENT_SYSTEM_ROLES, permissions_1.default.SYSCONSOLE_WRITE_USERMANAGEMENT_SYSTEM_ROLES],
+    [exports.RESOURCE_KEYS.SYSTEM_ATTRIBUTES.USER_ATTRIBUTES]: [permissions_1.default.SYSCONSOLE_READ_USERMANAGEMENT_USERS, permissions_1.default.SYSCONSOLE_WRITE_USERMANAGEMENT_USERS],
+    [exports.RESOURCE_KEYS.SYSTEM_ATTRIBUTES.ATTRIBUTE_BASED_ACCESS_CONTROL]: [permissions_1.default.SYSCONSOLE_READ_USERMANAGEMENT_SYSTEM_ROLES, permissions_1.default.SYSCONSOLE_WRITE_USERMANAGEMENT_SYSTEM_ROLES],
     [exports.RESOURCE_KEYS.SITE.CUSTOMIZATION]: [permissions_1.default.SYSCONSOLE_READ_SITE_CUSTOMIZATION, permissions_1.default.SYSCONSOLE_WRITE_SITE_CUSTOMIZATION],
     [exports.RESOURCE_KEYS.SITE.LOCALIZATION]: [permissions_1.default.SYSCONSOLE_READ_SITE_LOCALIZATION, permissions_1.default.SYSCONSOLE_WRITE_SITE_LOCALIZATION],
     [exports.RESOURCE_KEYS.SITE.USERS_AND_TEAMS]: [permissions_1.default.SYSCONSOLE_READ_SITE_USERS_AND_TEAMS, permissions_1.default.SYSCONSOLE_WRITE_SITE_USERS_AND_TEAMS],

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

@@ -1,3 +1,4 @@
+import type { AccessControlPolicy } from '@mattermost/types/access_control';
 import type { AnalyticsRow, AnalyticsState } from '@mattermost/types/admin';
 import type { Audit } from '@mattermost/types/audits';
 import type { Compliance } from '@mattermost/types/compliance';
@@ -27,5 +28,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     dataRetentionCustomPolicies: IDMappedObjects<DataRetentionCustomPolicy>;
     dataRetentionCustomPoliciesCount: any;
     prevTrialLicense: any;
+    accessControlPolicies: IDMappedObjects<AccessControlPolicy>;
+    channelsForAccessControlPolicy: any;
 }>, import("redux").AnyAction>;
 export default _default;

package/lib/reducers/entities/admin.js

@@ -572,6 +572,62 @@ function dataRetentionCustomPoliciesCount(state = 0, action) {
             return state;
     }
 }
+function accessControlPolicies(state = {}, action) {
+    switch (action.type) {
+        case action_types_1.AdminTypes.CREATE_ACCESS_CONTROL_POLICY_SUCCESS:
+        case action_types_1.AdminTypes.RECEIVED_ACCESS_CONTROL_POLICY:
+            return {
+                ...state,
+                [action.data.id]: action.data,
+            };
+        case action_types_1.AdminTypes.RECEIVED_ACCESS_CONTROL_POLICIES: {
+            const nextState = {};
+            for (const policy of action.data) {
+                nextState[policy.id] = policy;
+            }
+            return nextState;
+        }
+        case action_types_1.AdminTypes.DELETE_ACCESS_CONTROL_POLICY_SUCCESS: {
+            const nextState = { ...state };
+            Reflect.deleteProperty(nextState, action.data.id);
+            return nextState;
+        }
+        case action_types_1.AdminTypes.RECEIVED_ACCESS_CONTROL_POLICIES_SEARCH: {
+            const nextState = { ...state };
+            for (const policy of action.data) {
+                nextState[policy.id] = policy;
+            }
+            return nextState;
+        }
+        case action_types_1.UserTypes.LOGOUT_SUCCESS:
+            return {};
+        default:
+            return state;
+    }
+}
+function channelsForAccessControlPolicy(state = {}, action) {
+    switch (action.type) {
+        case action_types_1.AdminTypes.RECEIVED_ACCESS_CONTROL_CHILD_POLICIES:
+            if (action.data) {
+                return { ...state, ...action.data };
+            }
+            return state;
+        case action_types_1.AdminTypes.ASSIGN_CHANNELS_TO_ACCESS_CONTROL_POLICY_SUCCESS:
+            return {
+                ...state,
+                [action.data.policyId]: action.data.channelIds,
+            };
+        case action_types_1.AdminTypes.UNASSIGN_CHANNELS_FROM_ACCESS_CONTROL_POLICY_SUCCESS:
+            return {
+                ...state,
+                [action.data.policyId]: action.data.channelIds,
+            };
+        case action_types_1.UserTypes.LOGOUT_SUCCESS:
+            return {};
+        default:
+            return state;
+    }
+}
 exports.default = (0, redux_1.combineReducers)({
     // array of LogObjects each representing a log entry (JSON)
     logs,
@@ -614,4 +670,8 @@ exports.default = (0, redux_1.combineReducers)({
     dataRetentionCustomPoliciesCount,
     // the last trial license the server used.
     prevTrialLicense,
+    // object with policy ids as keys and objects representing the policies as values
+    accessControlPolicies,
+    // object with policy ids as keys and arrays of channel ids as values
+    channelsForAccessControlPolicy,
 });

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

@@ -110,6 +110,8 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         dataRetentionCustomPolicies: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/data_retention").DataRetentionCustomPolicy>;
         dataRetentionCustomPoliciesCount: any;
         prevTrialLicense: any;
+        accessControlPolicies: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/access_control").AccessControlPolicy>;
+        channelsForAccessControlPolicy: any;
     }>;
     jobs: import("redux").CombinedState<{
         jobs: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/jobs").Job>;

package/lib/reducers/entities/users.js

@@ -196,6 +196,24 @@ function profiles(state = {}, action) {
             const profileAttributes = { ...existingProfile.custom_profile_attributes, ...customAttributeValues };
             return receiveUserProfile(state, { ...existingProfile, custom_profile_attributes: profileAttributes });
         }
+        case action_types_1.UserTypes.CLEAR_CPA_VALUES: {
+            const { fieldId } = action.data;
+            return Object.values(state).reduce((nextState, profile) => {
+                // Only modify profiles that have this field value
+                if (profile.custom_profile_attributes && profile.custom_profile_attributes[fieldId] !== undefined) {
+                    const newAttributes = { ...profile.custom_profile_attributes };
+                    delete newAttributes[fieldId];
+                    nextState[profile.id] = {
+                        ...profile,
+                        custom_profile_attributes: newAttributes,
+                    };
+                }
+                else {
+                    nextState[profile.id] = profile;
+                }
+                return nextState;
+            }, {});
+        }
         case action_types_1.UserTypes.RECEIVED_PROFILES_LIST: {
             const users = action.data;
             return users.reduce(receiveUserProfile, state);

package/lib/reducers/index.d.ts

@@ -112,6 +112,8 @@ declare const _default: {
             dataRetentionCustomPolicies: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/data_retention").DataRetentionCustomPolicy>;
             dataRetentionCustomPoliciesCount: any;
             prevTrialLicense: any;
+            accessControlPolicies: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/access_control").AccessControlPolicy>;
+            channelsForAccessControlPolicy: any;
         }>;
         jobs: import("redux").CombinedState<{
             jobs: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/jobs").Job>;

package/lib/selectors/create_selector/index.js

@@ -3,30 +3,10 @@
 // See LICENSE.txt for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSelector = void 0;
-exports.generateId = generateId;
 exports.defaultMemoize = defaultMemoize;
 exports.createSelectorCreator = createSelectorCreator;
 exports.createStructuredSelector = createStructuredSelector;
-exports.getSortedTrackedSelectors = getSortedTrackedSelectors;
 /* eslint-disable */
-// Generates a RFC-4122 version 4 compliant globally unique identifier.
-function generateId() {
-    // implementation taken from http://stackoverflow.com/a/2117523
-    let id = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
-    id = id.replace(/[xy]/g, (c) => {
-        const r = Math.floor(Math.random() * 16);
-        let v;
-        if (c === 'x') {
-            v = r;
-        }
-        else {
-            // eslint-disable-next-line no-mixed-operators
-            v = r & 0x3 | 0x8;
-        }
-        return v.toString(16);
-    });
-    return id;
-}
 function defaultEqualityCheck(a, b) {
     return a === b;
 }
@@ -43,7 +23,7 @@ function areArgumentsShallowlyEqual(equalityCheck, prev, next) {
     }
     return true;
 }
-function defaultMemoize(func, measure, equalityCheck = defaultEqualityCheck) {
+function defaultMemoize(func, equalityCheck = defaultEqualityCheck) {
     let lastArgs = null;
     let lastResult = null;
     // we reference arguments instead of spreading them for performance reasons
@@ -52,9 +32,6 @@ function defaultMemoize(func, measure, equalityCheck = defaultEqualityCheck) {
             // apply arguments instead of spreading for performance.
             lastResult = func.apply(null, arguments);
         }
-        if (measure) {
-            measure();
-        }
         lastArgs = arguments;
         return lastResult;
     };
@@ -68,20 +45,14 @@ function getDependencies(funcs) {
     }
     return dependencies;
 }
-const trackedSelectors = {};
 function createSelectorCreator(memoize, ...memoizeOptions) {
     return (name, ...funcs) => {
-        const id = generateId();
-        let recomputations = 0;
-        let calls = 0;
         const resultFunc = funcs.pop();
         const dependencies = getDependencies(funcs);
         const memoizedResultFunc = memoize(function () {
-            recomputations++;
-            trackedSelectors[id].recomputations++;
             // apply arguments instead of spreading for performance.
             return resultFunc?.apply(null, arguments);
-        }, null, ...memoizeOptions);
+        }, ...memoizeOptions);
         // If a selector is called with the exact same arguments we don't need to traverse our dependencies again.
         const selector = memoize(function () {
             const params = [];
@@ -92,20 +63,9 @@ function createSelectorCreator(memoize, ...memoizeOptions) {
             }
             // apply arguments instead of spreading for performance.
             return memoizedResultFunc.apply(null, params);
-        }, () => {
-            calls++;
-            trackedSelectors[id].calls++;
         });
         selector.resultFunc = resultFunc;
         selector.dependencies = dependencies;
-        selector.recomputations = () => recomputations;
-        selector.resetRecomputations = () => recomputations = 0;
-        trackedSelectors[id] = {
-            id,
-            name,
-            calls: 0,
-            recomputations: 0,
-        };
         return selector;
     };
 }
@@ -123,43 +83,3 @@ function createStructuredSelector(selectors, selectorCreator = exports.createSel
         }, {});
     });
 }
-// resetTrackedSelectors resets all the measurements for memoization effectiveness.
-function resetTrackedSelectors() {
-    Object.values(trackedSelectors).forEach((selector) => {
-        selector.calls = 0;
-        selector.recomputations = 0;
-    });
-}
-// getSortedTrackedSelectors returns an array, sorted by effectivness, containing mesaurement data on all tracked selectors.
-function getSortedTrackedSelectors() {
-    let selectors = Object.values(trackedSelectors);
-    // Filter out any selector not called
-    selectors = selectors.filter(selector => selector.calls > 0);
-    const selectorsData = selectors.map((selector) => ({ name: selector.name, effectiveness: effectiveness(selector), recomputations: selector.recomputations, calls: selector.calls }));
-    selectorsData.sort((a, b) => {
-        // Sort effectiveness ascending
-        if (a.effectiveness !== b.effectiveness) {
-            return a.effectiveness - b.effectiveness;
-        }
-        // And everything else descending
-        if (a.recomputations !== b.recomputations) {
-            return b.recomputations - a.recomputations;
-        }
-        if (a.calls !== b.calls) {
-            return b.calls - a.calls;
-        }
-        return a.name.localeCompare(b.name);
-    });
-    return selectorsData;
-}
-function effectiveness(selector) {
-    return 100 - ((selector.recomputations / selector.calls) * 100);
-}
-// dumpTrackedSelectorsStatistics prints to console a table containing the measurement data on all tracked selectors.
-function dumpTrackedSelectorsStatistics() {
-    const selectors = getSortedTrackedSelectors();
-    console.table(selectors); //eslint-disable-line no-console
-}
-window.dumpTrackedSelectorsStatistics = dumpTrackedSelectorsStatistics;
-window.resetTrackedSelectors = resetTrackedSelectors;
-window.getSortedTrackedSelectors = getSortedTrackedSelectors;

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

@@ -0,0 +1,8 @@
+import type { Channel, ChannelWithTeamData, ChannelSearchOpts } from '@mattermost/types/channels';
+import type { GlobalState } from '@mattermost/types/store';
+export declare function getAccessControlPolicy(state: GlobalState, id: string): import("@mattermost/types/access_control").AccessControlPolicy;
+export declare const getChannelIdsForAccessControlPolicy: (state: GlobalState, parentId: string) => string[];
+export declare function makeGetChannelsInAccessControlPolicy(): (b: GlobalState, a: {
+    policyId: string;
+}) => ChannelWithTeamData[];
+export declare function searchChannelsInheritsPolicy(state: GlobalState, policyId: string, term: string, filters: ChannelSearchOpts): Channel[];

package/lib/selectors/entities/access_control.js

@@ -0,0 +1,44 @@
+"use strict";
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChannelIdsForAccessControlPolicy = void 0;
+exports.getAccessControlPolicy = getAccessControlPolicy;
+exports.makeGetChannelsInAccessControlPolicy = makeGetChannelsInAccessControlPolicy;
+exports.searchChannelsInheritsPolicy = searchChannelsInheritsPolicy;
+const channel_utils_1 = require("mattermost-redux/utils/channel_utils");
+const channels_1 = require("./channels");
+const create_selector_1 = require("../create_selector");
+function getAccessControlPolicy(state, id) {
+    return state.entities.admin.accessControlPolicies[id];
+}
+exports.getChannelIdsForAccessControlPolicy = (0, create_selector_1.createSelector)('getChannelIdsForAccessControlPolicy', (state, parentId) => state.entities.admin.channelsForAccessControlPolicy[parentId], (channelIds) => (Array.isArray(channelIds) ? channelIds : []));
+function makeGetChannelsInAccessControlPolicy() {
+    return (0, create_selector_1.createSelector)('getChannelsInAccessControlPolicy', (state) => state.entities.channels.channels, (state, props) => (0, exports.getChannelIdsForAccessControlPolicy)(state, props.policyId), (state) => state.entities.teams.teams, (channels, ids, teams) => {
+        if (!ids) {
+            return [];
+        }
+        const policyChannels = [];
+        ids.forEach((channelId) => {
+            const channel = channels[channelId];
+            if (channel) {
+                const team = teams[channel.team_id] || {};
+                policyChannels.push({
+                    ...channel,
+                    team_id: channel.team_id,
+                    team_display_name: team.display_name || '',
+                    team_name: team.name || '',
+                    team_update_at: team.update_at || 0,
+                });
+            }
+        });
+        return policyChannels;
+    });
+}
+function searchChannelsInheritsPolicy(state, policyId, term, filters) {
+    const channelsInPolicy = makeGetChannelsInAccessControlPolicy();
+    const channelArray = channelsInPolicy(state, { policyId });
+    let channels = (0, channels_1.filterChannelList)(channelArray, filters);
+    channels = (0, channel_utils_1.filterChannelsMatchingTerm)(channels, term);
+    return channels;
+}

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

@@ -1,2 +1,3 @@
 import type { GlobalState } from '@mattermost/types/store';
+export declare const selectChannelBannerEnabled: (state: GlobalState) => boolean;
 export declare const selectShowChannelBanner: (state: GlobalState, channelId: string) => boolean;

package/lib/selectors/entities/channel_banner.js

@@ -2,17 +2,24 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectShowChannelBanner = void 0;
+exports.selectShowChannelBanner = exports.selectChannelBannerEnabled = void 0;
 const channels_1 = require("@mattermost/types/channels");
 const constants_1 = require("mattermost-redux/constants");
 const channels_2 = require("mattermost-redux/selectors/entities/channels");
 const general_1 = require("mattermost-redux/selectors/entities/general");
-const selectShowChannelBanner = (state, channelId) => {
+const selectChannelBannerEnabled = (state) => {
     const license = (0, general_1.getLicense)(state);
-    const isPremiumLicense = license?.SkuShortName === constants_1.General.SKUPremium;
+    return license?.SkuShortName === constants_1.General.SKUEnterpriseAdvanced;
+};
+exports.selectChannelBannerEnabled = selectChannelBannerEnabled;
+const selectShowChannelBanner = (state, channelId) => {
+    const enabled = (0, exports.selectChannelBannerEnabled)(state);
+    if (!enabled) {
+        return false;
+    }
     const channelBannerInfo = (0, channels_2.getChannelBanner)(state, channelId);
     const channel = (0, channels_2.getChannel)(state, channelId);
     const isValidChannelType = Boolean(channel && (channel.type === constants_1.General.OPEN_CHANNEL || channel.type === constants_1.General.PRIVATE_CHANNEL));
-    return isPremiumLicense && isValidChannelType && (0, channels_1.channelBannerEnabled)(channelBannerInfo);
+    return isValidChannelType && (0, channels_1.channelBannerEnabled)(channelBannerInfo);
 };
 exports.selectShowChannelBanner = selectShowChannelBanner;

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

@@ -0,0 +1,3 @@
+import type { GlobalState } from '@mattermost/types/store';
+export declare function getReportAProblemLink(state: GlobalState): string;
+export declare const getSystemInfoMailtoLink: import("mattermost-redux/selectors/create_selector").OutputParametricSelector<GlobalState, string | undefined, string, (res1: string, res2: string, res3: string | undefined, res4: string | undefined, res5: string | undefined, res6: string | undefined) => string>;

package/lib/selectors/entities/report_a_problem.js

@@ -0,0 +1,46 @@
+"use strict";
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSystemInfoMailtoLink = void 0;
+exports.getReportAProblemLink = getReportAProblemLink;
+const create_selector_1 = require("mattermost-redux/selectors/create_selector");
+const browser_info_1 = require("mattermost-redux/utils/browser_info");
+const general_1 = require("./general");
+const teams_1 = require("./teams");
+const users_1 = require("./users");
+function getReportAProblemLink(state) {
+    const config = (0, general_1.getConfig)(state);
+    const type = config.ReportAProblemType;
+    switch (type) {
+        case 'email':
+            return (0, exports.getSystemInfoMailtoLink)(state, config.ReportAProblemMail);
+        case 'link':
+            if (config.ReportAProblemLink) {
+                return config.ReportAProblemLink;
+            }
+        // falls through
+        case 'default': {
+            const isLicensed = (0, general_1.getLicense)(state).IsLicensed === 'true';
+            if (isLicensed) {
+                return 'https://mattermost.com/pl/report_a_problem_licensed';
+            }
+            return 'https://mattermost.com/pl/report_a_problem_unlicensed';
+        }
+    }
+    return '';
+}
+exports.getSystemInfoMailtoLink = (0, create_selector_1.createSelector)('getSystemInfoMailtoLink', users_1.getCurrentUserId, teams_1.getCurrentTeamId, (state) => (0, general_1.getConfig)(state).Version, (state) => (0, general_1.getConfig)(state).BuildNumber, (state) => (0, general_1.getConfig)(state).SiteName, (state, supportEmail) => supportEmail, (currentUserId, currentTeamId, version, buildNumber, siteName, supportEmail) => {
+    const { browser, browserVersion } = (0, browser_info_1.getBrowserInfo)();
+    const platformName = (0, browser_info_1.getPlatformInfo)();
+    const subject = `Problem with ${siteName || 'Mattermost'} app`;
+    const body = `
+System Information:
+- User ID: ${currentUserId}
+- Team ID: ${currentTeamId}
+- Server Version: ${version} (${buildNumber})
+- Browser: ${browser} ${browserVersion}
+- Platform: ${platformName}
+`.trim();
+    return `mailto:${supportEmail || ''}?subject=${encodeURIComponent(subject)}&body=${encodeURIComponent(body)}`;
+});

package/lib/store/initial_state.js

@@ -117,6 +117,8 @@ const state = {
             dataRetentionCustomPolicies: {},
             dataRetentionCustomPoliciesCount: 0,
             prevTrialLicense: {},
+            accessControlPolicies: {},
+            channelsForAccessControlPolicy: {},
         },
         jobs: {
             jobs: {},

package/lib/utils/browser_info.d.ts

@@ -0,0 +1,5 @@
+export declare function getBrowserInfo(): {
+    browser: string;
+    browserVersion: string;
+};
+export declare function getPlatformInfo(): string;

package/lib/utils/browser_info.js

@@ -0,0 +1,96 @@
+"use strict";
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBrowserInfo = getBrowserInfo;
+exports.getPlatformInfo = getPlatformInfo;
+function getBrowserInfo() {
+    const userAgent = window.navigator.userAgent.toLowerCase();
+    let browser = 'Unknown';
+    let browserVersion = 'Unknown';
+    // Check if it's Mattermost Desktop App first
+    if (userAgent.includes('mattermost')) {
+        browser = 'Mattermost Desktop App';
+        const match = userAgent.match(/mattermost\/(\d+(\.\d+)*)/i);
+        if (match && match[1]) {
+            browserVersion = match[1];
+        }
+        return { browser, browserVersion };
+    }
+    // Simple browser detection - order matters!
+    if (userAgent.includes('edge/')) {
+        browser = 'Edge';
+    }
+    else if (userAgent.includes('edg/')) {
+        browser = 'Edge Chromium';
+    }
+    else if (userAgent.includes('chrome/')) {
+        if (userAgent.includes('opr/')) {
+            browser = 'Opera';
+        }
+        else {
+            browser = 'Chrome';
+        }
+    }
+    else if (userAgent.includes('safari/') && userAgent.includes('version/')) {
+        browser = 'Safari';
+    }
+    else if (userAgent.includes('firefox/')) {
+        browser = 'Firefox';
+    }
+    // Get browser version
+    let match;
+    if (browser === 'Edge') {
+        match = userAgent.match(/edge\/(\d+)/i);
+    }
+    else if (browser === 'Edge Chromium') {
+        match = userAgent.match(/edg\/(\d+)/i);
+    }
+    else if (browser === 'Opera') {
+        match = userAgent.match(/opr\/(\d+)/i);
+    }
+    else if (browser === 'Safari') {
+        match = userAgent.match(/version\/(\d+)/i);
+    }
+    else {
+        match = userAgent.match(/(firefox|chrome)\/(\d+)/i);
+        if (match) {
+            match[1] = match[2]; // Align with other matches where version is in group 1
+        }
+    }
+    if (match && match[1]) {
+        browserVersion = match[1];
+    }
+    return { browser, browserVersion };
+}
+function getPlatformInfo() {
+    // Casting to undefined in case it is deprecated in any browser
+    const platform = window.navigator.platform;
+    const userAgent = window.navigator.userAgent.toLowerCase();
+    let platformName = 'Unknown';
+    // First try using platform
+    if (platform) {
+        if (platform.toLowerCase().includes('win')) {
+            platformName = 'Windows';
+        }
+        else if (platform.toLowerCase().includes('mac')) {
+            platformName = 'MacOS';
+        }
+        else if (platform.toLowerCase().includes('linux')) {
+            platformName = 'Linux';
+        }
+    }
+    // Fallback to userAgent if platform didn't work
+    if (platformName === 'Unknown') {
+        if (userAgent.includes('windows')) {
+            platformName = 'Windows';
+        }
+        else if (userAgent.includes('mac os x')) {
+            platformName = 'MacOS';
+        }
+        else if (userAgent.includes('linux')) {
+            platformName = 'Linux';
+        }
+    }
+    return platformName;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mattermost-redux",
-  "version": "10.8.0",
+  "version": "10.9.0",
   "description": "Common code (API client, Redux stores, logic, utility functions) for building a Mattermost client",
   "keywords": [
     "mattermost"
@@ -39,8 +39,8 @@
     "directory": "webapp/platform/mattermost-redux"
   },
   "dependencies": {
-    "@mattermost/client": "10.6.0",
-    "@mattermost/types": "10.6.0",
+    "@mattermost/client": "10.9.0",
+    "@mattermost/types": "10.9.0",
     "@redux-devtools/extension": "^3.2.3",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.38",