mattermost-redux 11.6.0 → 11.7.0

package/lib/action_types/channel_categories.d.ts

@@ -5,5 +5,8 @@ declare const _default: {
     CATEGORY_COLLAPSED: "CATEGORY_COLLAPSED";
     CATEGORY_EXPANDED: "CATEGORY_EXPANDED";
     CATEGORY_DELETED: "CATEGORY_DELETED";
+    RECEIVED_MANAGED_CATEGORY_MAPPINGS: "RECEIVED_MANAGED_CATEGORY_MAPPINGS";
+    MANAGED_CATEGORY_MAPPING_SET: "MANAGED_CATEGORY_MAPPING_SET";
+    MANAGED_CATEGORY_MAPPING_REMOVED: "MANAGED_CATEGORY_MAPPING_REMOVED";
 };
 export default _default;

package/lib/action_types/channel_categories.js

@@ -13,4 +13,7 @@ exports.default = (0, key_mirror_1.default)({
     CATEGORY_COLLAPSED: null,
     CATEGORY_EXPANDED: null,
     CATEGORY_DELETED: null,
+    RECEIVED_MANAGED_CATEGORY_MAPPINGS: null,
+    MANAGED_CATEGORY_MAPPING_SET: null,
+    MANAGED_CATEGORY_MAPPING_REMOVED: null,
 });

package/lib/action_types/index.d.ts

@@ -22,6 +22,7 @@ import PlaybookType from './playbooks';
 import PluginTypes from './plugins';
 import PostTypes from './posts';
 import PreferenceTypes from './preferences';
+import PropertyTypes from './properties';
 import RecapTypes from './recaps';
 import RoleTypes from './roles';
 import SchemeTypes from './schemes';
@@ -32,7 +33,7 @@ import TeamTypes from './teams';
 import ThreadTypes from './threads';
 import UserTypes from './users';
 import WebSocketTypes from './websocket';
-export { ErrorTypes, GeneralTypes, UserTypes, TeamTypes, ChannelTypes, PostTypes, FileTypes, PreferenceTypes, RecapTypes, IntegrationTypes, EmojiTypes, AdminTypes, JobTypes, LimitsTypes, SearchTypes, RoleTypes, SchemeTypes, GroupTypes, BotTypes, PluginTypes, ChannelCategoryTypes, CloudTypes, AppsTypes, ThreadTypes, HostedCustomerTypes, DraftTypes, PlaybookType, ChannelBookmarkTypes, ScheduledPostTypes, SharedChannelTypes, ContentFlaggingTypes, AgentTypes, WebSocketTypes, };
+export { ErrorTypes, GeneralTypes, UserTypes, TeamTypes, ChannelTypes, PostTypes, FileTypes, PreferenceTypes, RecapTypes, IntegrationTypes, EmojiTypes, AdminTypes, JobTypes, LimitsTypes, SearchTypes, RoleTypes, SchemeTypes, GroupTypes, BotTypes, PluginTypes, ChannelCategoryTypes, CloudTypes, AppsTypes, ThreadTypes, HostedCustomerTypes, DraftTypes, PlaybookType, ChannelBookmarkTypes, ScheduledPostTypes, SharedChannelTypes, ContentFlaggingTypes, PropertyTypes, AgentTypes, WebSocketTypes, };
 /**
  * An MMReduxAction is any non-Thunk Redux action accepted by mattermost-redux.
  */

package/lib/action_types/index.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketTypes = exports.AgentTypes = exports.ContentFlaggingTypes = exports.SharedChannelTypes = exports.ScheduledPostTypes = exports.ChannelBookmarkTypes = exports.PlaybookType = exports.DraftTypes = exports.HostedCustomerTypes = exports.ThreadTypes = exports.AppsTypes = exports.CloudTypes = exports.ChannelCategoryTypes = exports.PluginTypes = exports.BotTypes = exports.GroupTypes = exports.SchemeTypes = exports.RoleTypes = exports.SearchTypes = exports.LimitsTypes = exports.JobTypes = exports.AdminTypes = exports.EmojiTypes = exports.IntegrationTypes = exports.RecapTypes = exports.PreferenceTypes = exports.FileTypes = exports.PostTypes = exports.ChannelTypes = exports.TeamTypes = exports.UserTypes = exports.GeneralTypes = exports.ErrorTypes = void 0;
+exports.WebSocketTypes = exports.AgentTypes = exports.PropertyTypes = exports.ContentFlaggingTypes = exports.SharedChannelTypes = exports.ScheduledPostTypes = exports.ChannelBookmarkTypes = exports.PlaybookType = exports.DraftTypes = exports.HostedCustomerTypes = exports.ThreadTypes = exports.AppsTypes = exports.CloudTypes = exports.ChannelCategoryTypes = exports.PluginTypes = exports.BotTypes = exports.GroupTypes = exports.SchemeTypes = exports.RoleTypes = exports.SearchTypes = exports.LimitsTypes = exports.JobTypes = exports.AdminTypes = exports.EmojiTypes = exports.IntegrationTypes = exports.RecapTypes = exports.PreferenceTypes = exports.FileTypes = exports.PostTypes = exports.ChannelTypes = exports.TeamTypes = exports.UserTypes = exports.GeneralTypes = exports.ErrorTypes = void 0;
 const admin_1 = __importDefault(require("./admin"));
 exports.AdminTypes = admin_1.default;
 const agents_1 = __importDefault(require("./agents"));
@@ -52,6 +52,8 @@ const posts_1 = __importDefault(require("./posts"));
 exports.PostTypes = posts_1.default;
 const preferences_1 = __importDefault(require("./preferences"));
 exports.PreferenceTypes = preferences_1.default;
+const properties_1 = __importDefault(require("./properties"));
+exports.PropertyTypes = properties_1.default;
 const recaps_1 = __importDefault(require("./recaps"));
 exports.RecapTypes = recaps_1.default;
 const roles_1 = __importDefault(require("./roles"));

package/lib/action_types/properties.d.ts

@@ -0,0 +1,10 @@
+declare const _default: {
+    RECEIVED_PROPERTY_FIELDS: "RECEIVED_PROPERTY_FIELDS";
+    PROPERTY_FIELD_DELETED: "PROPERTY_FIELD_DELETED";
+    RECEIVED_PROPERTY_VALUES: "RECEIVED_PROPERTY_VALUES";
+    PROPERTY_VALUE_DELETED: "PROPERTY_VALUE_DELETED";
+    PROPERTY_VALUES_DELETED_FOR_FIELD: "PROPERTY_VALUES_DELETED_FOR_FIELD";
+    PROPERTY_VALUES_DELETED_FOR_TARGET: "PROPERTY_VALUES_DELETED_FOR_TARGET";
+    RECEIVED_PROPERTY_GROUP: "RECEIVED_PROPERTY_GROUP";
+};
+export default _default;

package/lib/action_types/properties.js

@@ -0,0 +1,20 @@
+"use strict";
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const key_mirror_1 = __importDefault(require("mattermost-redux/utils/key_mirror"));
+exports.default = (0, key_mirror_1.default)({
+    // Field actions
+    RECEIVED_PROPERTY_FIELDS: null,
+    PROPERTY_FIELD_DELETED: null,
+    // Value actions
+    RECEIVED_PROPERTY_VALUES: null,
+    PROPERTY_VALUE_DELETED: null,
+    PROPERTY_VALUES_DELETED_FOR_FIELD: null,
+    PROPERTY_VALUES_DELETED_FOR_TARGET: null,
+    // Group actions
+    RECEIVED_PROPERTY_GROUP: null,
+});

package/lib/actions/access_control.d.ts

@@ -1,20 +1,23 @@
 import type { AccessControlPoliciesResult, AccessControlPolicy, AccessControlPolicyActiveUpdate, 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, channelId?: 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 getAccessControlPolicy(id: string, channelId?: string, teamId?: string): ActionFuncAsync<AccessControlPolicy, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function createAccessControlPolicy(policy: AccessControlPolicy, teamId?: string): ActionFuncAsync<AccessControlPolicy>;
+export declare function deleteAccessControlPolicy(id: string, teamId?: 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, channelId?: string): ActionFuncAsync<import("@mattermost/types/properties").UserPropertyField[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
-export declare function searchUsersForExpression(expression: string, term: string, after: string, limit: number, channelId?: string): ActionFuncAsync<AccessControlTestResult>;
-export declare function getVisualAST(expression: string, channelId?: string): ActionFuncAsync<import("@mattermost/types/access_control").AccessControlVisualAST, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
-export declare function validateExpressionAgainstRequester(expression: string, channelId?: string): ActionFuncAsync<{
+export declare function searchPermissionPolicies(term: string, after: string, limit: number): ActionFuncAsync<AccessControlPoliciesResult>;
+export declare function searchTeamAccessControlPolicies(teamId: string, term: string, type: string, after: string, limit: number): ActionFuncAsync<AccessControlPoliciesResult>;
+export declare function searchAccessControlPolicyChannels(id: string, term: string, opts: ChannelSearchOpts, teamId?: string): ActionFuncAsync<ChannelsWithTotalCount>;
+export declare function assignChannelsToAccessControlPolicy(policyId: string, channelIds: string[], teamId?: string): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function unassignChannelsFromAccessControlPolicy(policyId: string, channelIds: string[], teamId?: string): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function getAccessControlFields(after: string, limit: number, channelId?: string, teamId?: string): ActionFuncAsync<import("@mattermost/types/properties").UserPropertyField[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function searchUsersForExpression(expression: string, term: string, after: string, limit: number, channelId?: string, teamId?: string): ActionFuncAsync<AccessControlTestResult>;
+export declare function getVisualAST(expression: string, channelId?: string, teamId?: string): ActionFuncAsync<import("@mattermost/types/access_control").AccessControlVisualAST, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function validateExpressionAgainstRequester(expression: string, channelId?: string, teamId?: string): ActionFuncAsync<{
     requester_matches: boolean;
 }>;
 export declare function createAccessControlSyncJob(jobData: {
-    policy_id: string;
+    policy_id?: string;
+    team_id?: string;
 }): ActionFuncAsync<any>;
-export declare function updateAccessControlPoliciesActive(states: AccessControlPolicyActiveUpdate[]): ActionFuncAsync<AccessControlPolicy[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function updateAccessControlPoliciesActive(states: AccessControlPolicyActiveUpdate[], teamId?: string): ActionFuncAsync<AccessControlPolicy[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;

package/lib/actions/access_control.js

@@ -6,6 +6,8 @@ exports.getAccessControlPolicy = getAccessControlPolicy;
 exports.createAccessControlPolicy = createAccessControlPolicy;
 exports.deleteAccessControlPolicy = deleteAccessControlPolicy;
 exports.searchAccessControlPolicies = searchAccessControlPolicies;
+exports.searchPermissionPolicies = searchPermissionPolicies;
+exports.searchTeamAccessControlPolicies = searchTeamAccessControlPolicies;
 exports.searchAccessControlPolicyChannels = searchAccessControlPolicyChannels;
 exports.assignChannelsToAccessControlPolicy = assignChannelsToAccessControlPolicy;
 exports.unassignChannelsFromAccessControlPolicy = unassignChannelsFromAccessControlPolicy;
@@ -19,21 +21,18 @@ 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, channelId) {
+function getAccessControlPolicy(id, channelId, teamId) {
     return (0, helpers_1.bindClientFunc)({
-        clientFunc: client_1.Client4.getAccessControlPolicy,
+        clientFunc: () => client_1.Client4.getAccessControlPolicy(id, channelId, teamId),
         onSuccess: [action_types_1.AdminTypes.RECEIVED_ACCESS_CONTROL_POLICY],
-        params: [
-            id,
-            channelId,
-        ],
+        params: [],
     });
 }
-function createAccessControlPolicy(policy) {
+function createAccessControlPolicy(policy, teamId) {
     return async (dispatch, getState) => {
         let data;
         try {
-            data = await client_1.Client4.updateOrCreateAccessControlPolicy(policy);
+            data = await client_1.Client4.updateOrCreateAccessControlPolicy(policy, teamId);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
@@ -43,13 +42,11 @@ function createAccessControlPolicy(policy) {
         return { data };
     };
 }
-function deleteAccessControlPolicy(id) {
+function deleteAccessControlPolicy(id, teamId) {
     return (0, helpers_1.bindClientFunc)({
-        clientFunc: client_1.Client4.deleteAccessControlPolicy,
+        clientFunc: () => client_1.Client4.deleteAccessControlPolicy(id, teamId),
         onSuccess: [action_types_1.AdminTypes.DELETE_ACCESS_CONTROL_POLICY_SUCCESS],
-        params: [
-            id,
-        ],
+        params: [],
     });
 }
 function searchAccessControlPolicies(term, type, after, limit) {
@@ -66,11 +63,42 @@ function searchAccessControlPolicies(term, type, after, limit) {
         return { data };
     };
 }
-function searchAccessControlPolicyChannels(id, term, opts) {
+function searchPermissionPolicies(term, after, limit) {
     return async (dispatch, getState) => {
         let data;
         try {
-            data = await client_1.Client4.searchChildAccessControlPolicyChannels(id, term, opts);
+            data = await client_1.Client4.searchPermissionPolicies(term, 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 searchTeamAccessControlPolicies(teamId, term, type, after, limit) {
+    return async (dispatch, getState) => {
+        if (!teamId) {
+            return { error: new Error('teamId is required for team-scoped policy search') };
+        }
+        let data;
+        try {
+            data = await client_1.Client4.searchAccessControlPolicies(term, type, after, limit, teamId);
+        }
+        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, teamId) {
+    return async (dispatch, getState) => {
+        let data;
+        try {
+            data = await client_1.Client4.searchChildAccessControlPolicyChannels(id, term, opts, teamId);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
@@ -85,41 +113,31 @@ function searchAccessControlPolicyChannels(id, term, opts) {
         return { data };
     };
 }
-function assignChannelsToAccessControlPolicy(policyId, channelIds) {
+function assignChannelsToAccessControlPolicy(policyId, channelIds, teamId) {
     return (0, helpers_1.bindClientFunc)({
-        clientFunc: client_1.Client4.assignChannelsToAccessControlPolicy,
+        clientFunc: () => client_1.Client4.assignChannelsToAccessControlPolicy(policyId, channelIds, teamId),
         onSuccess: [action_types_1.AdminTypes.ASSIGN_CHANNELS_TO_ACCESS_CONTROL_POLICY_SUCCESS],
-        params: [
-            policyId,
-            channelIds,
-        ],
+        params: [],
     });
 }
-function unassignChannelsFromAccessControlPolicy(policyId, channelIds) {
+function unassignChannelsFromAccessControlPolicy(policyId, channelIds, teamId) {
     return (0, helpers_1.bindClientFunc)({
-        clientFunc: client_1.Client4.unassignChannelsFromAccessControlPolicy,
+        clientFunc: () => client_1.Client4.unassignChannelsFromAccessControlPolicy(policyId, channelIds, teamId),
         onSuccess: [action_types_1.AdminTypes.UNASSIGN_CHANNELS_FROM_ACCESS_CONTROL_POLICY_SUCCESS],
-        params: [
-            policyId,
-            channelIds,
-        ],
+        params: [],
     });
 }
-function getAccessControlFields(after, limit, channelId) {
+function getAccessControlFields(after, limit, channelId, teamId) {
     return (0, helpers_1.bindClientFunc)({
-        clientFunc: client_1.Client4.getAccessControlFields,
-        params: [
-            after,
-            limit,
-            channelId,
-        ],
+        clientFunc: () => client_1.Client4.getAccessControlFields(after, limit, channelId, teamId),
+        params: [],
     });
 }
-function searchUsersForExpression(expression, term, after, limit, channelId) {
+function searchUsersForExpression(expression, term, after, limit, channelId, teamId) {
     return async (dispatch, getState) => {
         let data;
         try {
-            data = await client_1.Client4.testAccessControlExpression(expression, term, after, limit, channelId);
+            data = await client_1.Client4.testAccessControlExpression(expression, term, after, limit, channelId, teamId);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
@@ -129,17 +147,17 @@ function searchUsersForExpression(expression, term, after, limit, channelId) {
         return { data };
     };
 }
-function getVisualAST(expression, channelId) {
+function getVisualAST(expression, channelId, teamId) {
     return (0, helpers_1.bindClientFunc)({
-        clientFunc: client_1.Client4.expressionToVisualFormat,
-        params: [expression, channelId],
+        clientFunc: () => client_1.Client4.expressionToVisualFormat(expression, channelId, teamId),
+        params: [],
     });
 }
-function validateExpressionAgainstRequester(expression, channelId) {
+function validateExpressionAgainstRequester(expression, channelId, teamId) {
     return async (dispatch, getState) => {
         let data;
         try {
-            data = await client_1.Client4.validateExpressionAgainstRequester(expression, channelId);
+            data = await client_1.Client4.validateExpressionAgainstRequester(expression, channelId, teamId);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
@@ -161,9 +179,9 @@ function createAccessControlSyncJob(jobData) {
         return { data };
     };
 }
-function updateAccessControlPoliciesActive(states) {
+function updateAccessControlPoliciesActive(states, teamId) {
     return (0, helpers_1.bindClientFunc)({
         clientFunc: client_1.Client4.updateAccessControlPoliciesActive,
-        params: [states],
+        params: [states, teamId],
     });
 }

package/lib/actions/channel_categories.d.ts

@@ -1,12 +1,13 @@
 import type { ChannelCategory } from '@mattermost/types/channel_categories';
 import { CategorySorting } from '@mattermost/types/channel_categories';
 import type { Channel } from '@mattermost/types/channels';
+import type { PropertyValuesUpdated } from '@mattermost/types/properties';
+import type { Team } from '@mattermost/types/teams';
 import type { ActionFuncAsync, ThunkActionFunc } from 'mattermost-redux/types/actions';
 export declare function setCategoryCollapsed(categoryId: string, collapsed: boolean): ActionFuncAsync;
 export declare function setCategorySorting(categoryId: string, sorting: CategorySorting): ActionFuncAsync;
 export declare function patchCategory(categoryId: string, patch: Partial<ChannelCategory>): ActionFuncAsync;
 export declare function setCategoryMuted(categoryId: string, muted: boolean): ActionFuncAsync;
-export declare function fetchMyCategories(teamId: string, isWebSocket?: boolean): ThunkActionFunc<unknown>;
 export declare function addChannelToInitialCategory(channel: Channel, setOnServer?: boolean): ActionFuncAsync;
 export declare function addChannelToCategory(categoryId: string, channelId: string): ActionFuncAsync;
 export declare function moveChannelToCategory(categoryId: string, channelId: string, newIndex: number, setManualSorting?: boolean): ActionFuncAsync;
@@ -22,3 +23,21 @@ export declare function receivedCategoryOrder(teamId: string, order: string[]):
 export declare function createCategory(teamId: string, displayName: string, channelIds?: Array<Channel['id']>): ActionFuncAsync<ChannelCategory>;
 export declare function renameCategory(categoryId: string, displayName: string): ActionFuncAsync;
 export declare function deleteCategory(categoryId: string): ActionFuncAsync;
+export declare function addChannelToManagedCategory(teamId: Team['id'], channelId: Channel['id'], categoryName: string): {
+    type: "MANAGED_CATEGORY_MAPPING_SET";
+    data: {
+        id: string;
+        team_id: string;
+        category_name: string;
+    };
+};
+export declare function removeChannelFromManagedCategory(teamId: Team['id'], channelId: Channel['id']): {
+    type: "MANAGED_CATEGORY_MAPPING_REMOVED";
+    data: {
+        id: string;
+        team_id: string;
+    };
+};
+export declare function fetchChannelManagedCategoryMapping(channel: Channel): ActionFuncAsync;
+export declare function handleManagedCategoryPropertyValuesUpdated(parsedPropertyValuesUpdated: PropertyValuesUpdated<string>): ThunkActionFunc<void>;
+export declare function fetchMyCategories(teamId: string, isWebSocket?: boolean): ThunkActionFunc<unknown>;

package/lib/actions/channel_categories.js

@@ -6,7 +6,6 @@ exports.setCategoryCollapsed = setCategoryCollapsed;
 exports.setCategorySorting = setCategorySorting;
 exports.patchCategory = patchCategory;
 exports.setCategoryMuted = setCategoryMuted;
-exports.fetchMyCategories = fetchMyCategories;
 exports.addChannelToInitialCategory = addChannelToInitialCategory;
 exports.addChannelToCategory = addChannelToCategory;
 exports.moveChannelToCategory = moveChannelToCategory;
@@ -16,6 +15,11 @@ exports.receivedCategoryOrder = receivedCategoryOrder;
 exports.createCategory = createCategory;
 exports.renameCategory = renameCategory;
 exports.deleteCategory = deleteCategory;
+exports.addChannelToManagedCategory = addChannelToManagedCategory;
+exports.removeChannelFromManagedCategory = removeChannelFromManagedCategory;
+exports.fetchChannelManagedCategoryMapping = fetchChannelManagedCategoryMapping;
+exports.handleManagedCategoryPropertyValuesUpdated = handleManagedCategoryPropertyValuesUpdated;
+exports.fetchMyCategories = fetchMyCategories;
 const redux_batched_actions_1 = require("redux-batched-actions");
 const channel_categories_1 = require("@mattermost/types/channel_categories");
 const action_types_1 = require("mattermost-redux/action_types");
@@ -24,6 +28,8 @@ const helpers_1 = require("mattermost-redux/actions/helpers");
 const client_1 = require("mattermost-redux/client");
 const channel_categories_2 = require("mattermost-redux/constants/channel_categories");
 const channel_categories_3 = require("mattermost-redux/selectors/entities/channel_categories");
+const channels_1 = require("mattermost-redux/selectors/entities/channels");
+const properties_1 = require("mattermost-redux/selectors/entities/properties");
 const users_1 = require("mattermost-redux/selectors/entities/users");
 const array_utils_1 = require("mattermost-redux/utils/array_utils");
 const constants_1 = require("../constants");
@@ -110,7 +116,7 @@ function updateCategory(category) {
         return { data: updatedCategory };
     };
 }
-function fetchMyCategories(teamId, isWebSocket) {
+function fetchNonManagedCategories(teamId, isWebSocket) {
     return async (dispatch, getState) => {
         const currentUserId = (0, users_1.getCurrentUserId)(getState());
         let data;
@@ -166,6 +172,9 @@ function addChannelToInitialCategory(channel, setOnServer = false) {
                 })),
             });
         }
+        if ((0, channel_categories_3.areManagedCategoriesEnabled)(state)) {
+            dispatch(fetchChannelManagedCategoryMapping(channel));
+        }
         // Add the new channel to the Channels category on the channel's team
         if (categories.some((category) => category.channel_ids.some((channelId) => channelId === channel.id))) {
             return { data: false };
@@ -320,7 +329,7 @@ function moveChannelsToCategory(categoryId, channelIds, newIndex, setManualSorti
 function moveCategory(teamId, categoryId, newIndex) {
     return async (dispatch, getState) => {
         const state = getState();
-        const order = (0, channel_categories_3.getCategoryIdsForTeam)(state, teamId);
+        const order = (0, channel_categories_3.getNonManagedCategoryOrderForTeam)(state, teamId);
         const currentUserId = (0, users_1.getCurrentUserId)(state);
         const newOrder = (0, array_utils_1.insertWithoutDuplicates)(order, categoryId, newIndex);
         // Optimistically update the category order
@@ -402,3 +411,128 @@ function deleteCategory(categoryId) {
         return { data: true };
     };
 }
+function addChannelToManagedCategory(teamId, channelId, categoryName) {
+    return {
+        type: action_types_1.ChannelCategoryTypes.MANAGED_CATEGORY_MAPPING_SET,
+        data: {
+            id: channelId,
+            team_id: teamId,
+            category_name: categoryName,
+        },
+    };
+}
+function removeChannelFromManagedCategory(teamId, channelId) {
+    return {
+        type: action_types_1.ChannelCategoryTypes.MANAGED_CATEGORY_MAPPING_REMOVED,
+        data: {
+            id: channelId,
+            team_id: teamId,
+        },
+    };
+}
+function fetchChannelManagedCategoryMapping(channel) {
+    return async (dispatch, getState) => {
+        try {
+            const values = await client_1.Client4.getPropertyValues(channel_categories_2.ManagedCategoryPropertyGroupName, 'channel', channel.id);
+            const categoryValue = values[0];
+            if (categoryValue && channel.team_id) {
+                dispatch(addChannelToManagedCategory(channel.team_id, channel.id, categoryValue.value));
+            }
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            dispatch((0, errors_1.logError)(error));
+        }
+        return { data: true };
+    };
+}
+function handleManagedCategoryPropertyValuesUpdated(parsedPropertyValuesUpdated) {
+    return (doDispatch, doGetState) => {
+        const state = doGetState();
+        if (!(0, channel_categories_3.areManagedCategoriesEnabled)(state)) {
+            return;
+        }
+        if (!parsedPropertyValuesUpdated.target_id) {
+            return;
+        }
+        if (!parsedPropertyValuesUpdated.values?.length) {
+            return;
+        }
+        const first = parsedPropertyValuesUpdated.values[0];
+        const propertyGroup = (0, properties_1.getPropertyGroupById)(state, first.group_id);
+        const propertyField = (0, properties_1.getPropertyFieldById)(state, first.field_id);
+        if (propertyField?.name !== channel_categories_2.ManagedCategoryPropertyFieldName || propertyGroup?.name !== channel_categories_2.ManagedCategoryPropertyGroupName) {
+            return;
+        }
+        const categoryName = first.value;
+        const teamId = (0, channels_1.getChannel)(doGetState(), parsedPropertyValuesUpdated.target_id)?.team_id;
+        if (!teamId) {
+            return;
+        }
+        if (categoryName) {
+            doDispatch(addChannelToManagedCategory(teamId, parsedPropertyValuesUpdated.target_id, categoryName));
+        }
+        else {
+            doDispatch(removeChannelFromManagedCategory(teamId, parsedPropertyValuesUpdated.target_id));
+        }
+    };
+}
+function fetchManagedCategories(teamId) {
+    return async (dispatch, getState) => {
+        if (!(0, channel_categories_3.areManagedCategoriesEnabled)(getState())) {
+            return {};
+        }
+        const state = getState();
+        const propertyGroup = (0, properties_1.getPropertyGroupByName)(state, channel_categories_2.ManagedCategoryPropertyGroupName);
+        if (!propertyGroup) {
+            try {
+                const fields = await client_1.Client4.getPropertyFields(channel_categories_2.ManagedCategoryPropertyGroupName, 'channel', 'system');
+                if (fields.length === 0) {
+                    return { error: new Error(`No property fields found for ${channel_categories_2.ManagedCategoryPropertyGroupName}`) };
+                }
+                dispatch((0, redux_batched_actions_1.batchActions)([
+                    {
+                        type: action_types_1.PropertyTypes.RECEIVED_PROPERTY_FIELDS,
+                        data: { fields },
+                    },
+                    {
+                        type: action_types_1.PropertyTypes.RECEIVED_PROPERTY_GROUP,
+                        data: {
+                            id: fields[0].group_id,
+                            name: channel_categories_2.ManagedCategoryPropertyGroupName,
+                        },
+                    },
+                ]));
+            }
+            catch (error) {
+                (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+                dispatch((0, errors_1.logError)(error));
+                return { error };
+            }
+        }
+        try {
+            const managedMappings = await client_1.Client4.getManagedCategories(teamId);
+            return dispatch({
+                type: action_types_1.ChannelCategoryTypes.RECEIVED_MANAGED_CATEGORY_MAPPINGS,
+                data: {
+                    team_id: teamId,
+                    mappings: managedMappings,
+                },
+            });
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            dispatch((0, errors_1.logError)(error));
+            return { error };
+        }
+    };
+}
+function fetchMyCategories(teamId, isWebSocket) {
+    return async (dispatch) => {
+        const [nonManagedResult] = await Promise.all([
+            dispatch(fetchNonManagedCategories(teamId, isWebSocket)),
+            dispatch(fetchManagedCategories(teamId)),
+        ]);
+        return nonManagedResult;
+    };
+}

package/lib/actions/jobs.d.ts

@@ -22,5 +22,5 @@ export declare function getJob(id: string): import("../types/actions").ActionFun
     data: any;
 }, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function getJobs(page?: number, perPage?: number): import("../types/actions").ActionFuncAsync<import("@mattermost/types/jobs").Job[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
-export declare function getJobsByType(type: JobType, page?: number, perPage?: number): import("../types/actions").ActionFuncAsync<import("@mattermost/types/jobs").Job[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function getJobsByType(type: JobType, page?: number, perPage?: number, teamId?: string): import("../types/actions").ActionFuncAsync<import("@mattermost/types/jobs").Job[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function cancelJob(job: string): import("../types/actions").ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;

package/lib/actions/jobs.js

@@ -39,7 +39,7 @@ function getJobs(page = 0, perPage = constants_1.General.JOBS_CHUNK_SIZE) {
         ],
     });
 }
-function getJobsByType(type, page = 0, perPage = constants_1.General.JOBS_CHUNK_SIZE) {
+function getJobsByType(type, page = 0, perPage = constants_1.General.JOBS_CHUNK_SIZE, teamId) {
     return (0, helpers_1.bindClientFunc)({
         clientFunc: client_1.Client4.getJobsByType,
         onSuccess: [action_types_1.JobTypes.RECEIVED_JOBS, action_types_1.JobTypes.RECEIVED_JOBS_BY_TYPE],
@@ -47,6 +47,7 @@ function getJobsByType(type, page = 0, perPage = constants_1.General.JOBS_CHUNK_
             type,
             page,
             perPage,
+            teamId,
         ],
     });
 }

package/lib/actions/users.js

@@ -656,19 +656,19 @@ function getStatusesByIds(userIds) {
 }
 function setStatus(status) {
     return async (dispatch, getState) => {
-        let recievedStatus;
+        let receivedStatus;
         try {
-            recievedStatus = await client_1.Client4.updateStatus(status);
+            receivedStatus = await client_1.Client4.updateStatus(status);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
             dispatch((0, errors_1.logError)(error));
             return { error };
         }
-        const updatedStatus = { [recievedStatus.user_id]: recievedStatus.status };
-        const dndEndTimes = { [recievedStatus.user_id]: recievedStatus?.dnd_end_time ?? 0 };
-        const isManualStatus = { [recievedStatus.user_id]: recievedStatus?.manual ?? false };
-        const lastActivity = { [recievedStatus.user_id]: recievedStatus?.last_activity_at ?? 0 };
+        const updatedStatus = { [receivedStatus.user_id]: receivedStatus.status };
+        const dndEndTimes = { [receivedStatus.user_id]: receivedStatus?.dnd_end_time ?? 0 };
+        const isManualStatus = { [receivedStatus.user_id]: receivedStatus?.manual ?? false };
+        const lastActivity = { [receivedStatus.user_id]: receivedStatus?.last_activity_at ?? 0 };
         dispatch((0, redux_batched_actions_1.batchActions)([
             {
                 type: action_types_1.UserTypes.RECEIVED_STATUSES,
@@ -687,7 +687,7 @@ function setStatus(status) {
                 data: lastActivity,
             },
         ], 'BATCHING_STATUS'));
-        return { data: recievedStatus };
+        return { data: receivedStatus };
     };
 }
 function setCustomStatus(customStatus) {
@@ -919,7 +919,7 @@ function saveCustomProfileAttribute(userID, attributeID, attributeValue) {
         }
         catch (error) {
             // Extract user-friendly error message from server response
-            let errorMessage = 'Failed to update custom profile attribute';
+            let errorMessage = 'Failed to update user attribute';
             if (error && typeof error === 'object' && 'message' in error && error.message) {
                 errorMessage = error.message;
             }

package/lib/constants/channel_categories.d.ts

@@ -2,3 +2,5 @@ import type { ChannelCategoryType } from '@mattermost/types/channel_categories';
 export declare const CategoryTypes: {
     [name: string]: ChannelCategoryType;
 };
+export declare const ManagedCategoryPropertyGroupName = "managed_channel_categories";
+export declare const ManagedCategoryPropertyFieldName = "category_name";

package/lib/constants/channel_categories.js

@@ -2,10 +2,13 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CategoryTypes = void 0;
+exports.ManagedCategoryPropertyFieldName = exports.ManagedCategoryPropertyGroupName = exports.CategoryTypes = void 0;
 exports.CategoryTypes = {
     FAVORITES: 'favorites',
     CHANNELS: 'channels',
     DIRECT_MESSAGES: 'direct_messages',
     CUSTOM: 'custom',
+    MANAGED: 'managed',
 };
+exports.ManagedCategoryPropertyGroupName = 'managed_channel_categories';
+exports.ManagedCategoryPropertyFieldName = 'category_name';

package/lib/constants/general.d.ts

@@ -33,7 +33,6 @@ declare const _default: {
     SYSTEM_READ_ONLY_ADMIN_ROLE: string;
     SYSTEM_MANAGER_ROLE: string;
     SHARED_CHANNEL_MANAGER_ROLE: string;
-    SECURE_CONNECTION_MANAGER_ROLE: string;
     SYSTEM_USER_ACCESS_TOKEN_ROLE: string;
     SYSTEM_POST_ALL_ROLE: string;
     SYSTEM_POST_ALL_PUBLIC_ROLE: string;