mattermost-redux 10.9.0 → 10.10.0

package/lib/action_types/general.d.ts

@@ -21,5 +21,8 @@ declare const _default: {
     FIRST_ADMIN_VISIT_MARKETPLACE_STATUS_RECEIVED: "FIRST_ADMIN_VISIT_MARKETPLACE_STATUS_RECEIVED";
     FIRST_ADMIN_COMPLETE_SETUP_RECEIVED: "FIRST_ADMIN_COMPLETE_SETUP_RECEIVED";
     SHOW_LAUNCHING_WORKSPACE: "SHOW_LAUNCHING_WORKSPACE";
+    CWS_AVAILABILITY_CHECK_REQUEST: "CWS_AVAILABILITY_CHECK_REQUEST";
+    CWS_AVAILABILITY_CHECK_SUCCESS: "CWS_AVAILABILITY_CHECK_SUCCESS";
+    CWS_AVAILABILITY_CHECK_FAILURE: "CWS_AVAILABILITY_CHECK_FAILURE";
 };
 export default _default;

package/lib/action_types/general.js

@@ -29,4 +29,7 @@ exports.default = (0, key_mirror_1.default)({
     FIRST_ADMIN_VISIT_MARKETPLACE_STATUS_RECEIVED: null,
     FIRST_ADMIN_COMPLETE_SETUP_RECEIVED: null,
     SHOW_LAUNCHING_WORKSPACE: null,
+    CWS_AVAILABILITY_CHECK_REQUEST: null,
+    CWS_AVAILABILITY_CHECK_SUCCESS: null,
+    CWS_AVAILABILITY_CHECK_FAILURE: null,
 });

package/lib/action_types/index.d.ts

@@ -24,10 +24,11 @@ import RoleTypes from './roles';
 import SchemeTypes from './schemes';
 import ScheduledPostTypes from './scheudled_posts';
 import SearchTypes from './search';
+import SharedChannelTypes from './shared_channels';
 import TeamTypes from './teams';
 import ThreadTypes from './threads';
 import UserTypes from './users';
-export { ErrorTypes, GeneralTypes, UserTypes, TeamTypes, ChannelTypes, PostTypes, FileTypes, PreferenceTypes, IntegrationTypes, EmojiTypes, AdminTypes, JobTypes, LimitsTypes, SearchTypes, RoleTypes, SchemeTypes, GroupTypes, BotTypes, PluginTypes, ChannelCategoryTypes, CloudTypes, AppsTypes, ThreadTypes, HostedCustomerTypes, DraftTypes, PlaybookType, ChannelBookmarkTypes, ScheduledPostTypes, };
+export { ErrorTypes, GeneralTypes, UserTypes, TeamTypes, ChannelTypes, PostTypes, FileTypes, PreferenceTypes, IntegrationTypes, EmojiTypes, AdminTypes, JobTypes, LimitsTypes, SearchTypes, RoleTypes, SchemeTypes, GroupTypes, BotTypes, PluginTypes, ChannelCategoryTypes, CloudTypes, AppsTypes, ThreadTypes, HostedCustomerTypes, DraftTypes, PlaybookType, ChannelBookmarkTypes, ScheduledPostTypes, SharedChannelTypes, };
 /**
  * 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.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.PreferenceTypes = exports.FileTypes = exports.PostTypes = exports.ChannelTypes = exports.TeamTypes = exports.UserTypes = exports.GeneralTypes = exports.ErrorTypes = void 0;
+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.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 apps_1 = __importDefault(require("./apps"));
@@ -56,6 +56,8 @@ const scheudled_posts_1 = __importDefault(require("./scheudled_posts"));
 exports.ScheduledPostTypes = scheudled_posts_1.default;
 const search_1 = __importDefault(require("./search"));
 exports.SearchTypes = search_1.default;
+const shared_channels_1 = __importDefault(require("./shared_channels"));
+exports.SharedChannelTypes = shared_channels_1.default;
 const teams_1 = __importDefault(require("./teams"));
 exports.TeamTypes = teams_1.default;
 const threads_1 = __importDefault(require("./threads"));

package/lib/action_types/integrations.d.ts

@@ -20,6 +20,7 @@ declare const _default: {
     RECEIVED_OUTGOING_OAUTH_CONNECTION: "RECEIVED_OUTGOING_OAUTH_CONNECTION";
     DELETED_OUTGOING_OAUTH_CONNECTION: "DELETED_OUTGOING_OAUTH_CONNECTION";
     RECEIVED_DIALOG_TRIGGER_ID: "RECEIVED_DIALOG_TRIGGER_ID";
+    RECEIVED_DIALOG_ARGUMENTS: "RECEIVED_DIALOG_ARGUMENTS";
     RECEIVED_DIALOG: "RECEIVED_DIALOG";
 };
 export default _default;

package/lib/action_types/integrations.js

@@ -28,5 +28,6 @@ exports.default = (0, key_mirror_1.default)({
     RECEIVED_OUTGOING_OAUTH_CONNECTION: null,
     DELETED_OUTGOING_OAUTH_CONNECTION: null,
     RECEIVED_DIALOG_TRIGGER_ID: null,
+    RECEIVED_DIALOG_ARGUMENTS: null,
     RECEIVED_DIALOG: null,
 });

package/lib/action_types/shared_channels.d.ts

@@ -0,0 +1,5 @@
+declare const _default: {
+    RECEIVED_CHANNEL_REMOTES: "RECEIVED_CHANNEL_REMOTES";
+    RECEIVED_REMOTE_CLUSTER_INFO: "RECEIVED_REMOTE_CLUSTER_INFO";
+};
+export default _default;

package/lib/action_types/shared_channels.js

@@ -0,0 +1,12 @@
+"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)({
+    RECEIVED_CHANNEL_REMOTES: null,
+    RECEIVED_REMOTE_CLUSTER_INFO: null,
+});

package/lib/actions/admin.d.ts

@@ -1,7 +1,7 @@
 import type { LogFilter } from '@mattermost/types/admin';
 import type { Channel, ChannelSearchOpts } from '@mattermost/types/channels';
 import type { Compliance } from '@mattermost/types/compliance';
-import type { AdminConfig, AllowedIPRange } from '@mattermost/types/config';
+import type { AdminConfig, AllowedIPRange, LdapSettings } from '@mattermost/types/config';
 import type { CreateDataRetentionCustomPolicy, DataRetentionCustomPolicies, GetDataRetentionCustomPoliciesRequest, PatchDataRetentionCustomPolicy } from '@mattermost/types/data_retention';
 import type { GroupSearchOpts } from '@mattermost/types/groups';
 import type { CompleteOnboardingRequest } from '@mattermost/types/setup';
@@ -27,6 +27,10 @@ export declare function uploadBrandImage(imageData: File): ActionFuncAsync<impor
 export declare function deleteBrandImage(): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function getClusterStatus(): ActionFuncAsync<import("@mattermost/types/admin").ClusterInfo[], import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function testLdap(): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function testLdapConnection(settings: LdapSettings): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function testLdapFilters(settings: LdapSettings): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function testLdapAttributes(settings: LdapSettings): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
+export declare function testLdapGroupAttributes(settings: LdapSettings): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function syncLdap(): ActionFuncAsync<import("@mattermost/types/client4").StatusOK, import("@mattermost/types/store").GlobalState, import("redux").AnyAction>;
 export declare function getLdapGroups(page?: number, perPage?: number, opts?: GroupSearchOpts): ActionFuncAsync<{
     count: number;

package/lib/actions/admin.js

@@ -21,6 +21,10 @@ exports.uploadBrandImage = uploadBrandImage;
 exports.deleteBrandImage = deleteBrandImage;
 exports.getClusterStatus = getClusterStatus;
 exports.testLdap = testLdap;
+exports.testLdapConnection = testLdapConnection;
+exports.testLdapFilters = testLdapFilters;
+exports.testLdapAttributes = testLdapAttributes;
+exports.testLdapGroupAttributes = testLdapGroupAttributes;
 exports.syncLdap = syncLdap;
 exports.getLdapGroups = getLdapGroups;
 exports.linkLdapGroup = linkLdapGroup;
@@ -232,6 +236,38 @@ function testLdap() {
         clientFunc: client_1.Client4.testLdap,
     });
 }
+function testLdapConnection(settings) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.testLdapConnection,
+        params: [
+            settings,
+        ],
+    });
+}
+function testLdapFilters(settings) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.testLdapFilters,
+        params: [
+            settings,
+        ],
+    });
+}
+function testLdapAttributes(settings) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.testLdapAttributes,
+        params: [
+            settings,
+        ],
+    });
+}
+function testLdapGroupAttributes(settings) {
+    return (0, helpers_1.bindClientFunc)({
+        clientFunc: client_1.Client4.testLdapGroupAttributes,
+        params: [
+            settings,
+        ],
+    });
+}
 function syncLdap() {
     return (0, helpers_1.bindClientFunc)({
         clientFunc: client_1.Client4.syncLdap,

package/lib/actions/general.d.ts

@@ -12,6 +12,7 @@ export declare function setServerVersion(serverVersion: string): ActionFuncAsync
 export declare function setUrl(url: string): boolean;
 export declare function setFirstAdminVisitMarketplaceStatus(): ActionFuncAsync;
 export declare function getFirstAdminSetupComplete(): ActionFuncAsync<SystemSetting>;
+export declare function checkCWSAvailability(): ActionFuncAsync;
 declare const _default: {
     getClientConfig: typeof getClientConfig;
     getLicenseConfig: typeof getLicenseConfig;

package/lib/actions/general.js

@@ -10,6 +10,7 @@ exports.setServerVersion = setServerVersion;
 exports.setUrl = setUrl;
 exports.setFirstAdminVisitMarketplaceStatus = setFirstAdminVisitMarketplaceStatus;
 exports.getFirstAdminSetupComplete = getFirstAdminSetupComplete;
+exports.checkCWSAvailability = checkCWSAvailability;
 const redux_batched_actions_1 = require("redux-batched-actions");
 const client4_1 = require("@mattermost/types/client4");
 const action_types_1 = require("mattermost-redux/action_types");
@@ -99,6 +100,27 @@ function getFirstAdminSetupComplete() {
         return { data };
     };
 }
+function checkCWSAvailability() {
+    return async (dispatch, getState) => {
+        const state = getState();
+        const config = state.entities.general.config;
+        const isEnterpriseReady = config.BuildEnterpriseReady === 'true';
+        if (!isEnterpriseReady) {
+            dispatch({ type: action_types_1.GeneralTypes.CWS_AVAILABILITY_CHECK_SUCCESS, data: 'not_applicable' });
+            return { data: 'not_applicable' };
+        }
+        dispatch({ type: action_types_1.GeneralTypes.CWS_AVAILABILITY_CHECK_REQUEST });
+        try {
+            await client_1.Client4.cwsAvailabilityCheck();
+            dispatch({ type: action_types_1.GeneralTypes.CWS_AVAILABILITY_CHECK_SUCCESS, data: 'available' });
+            return { data: 'available' };
+        }
+        catch (error) {
+            dispatch({ type: action_types_1.GeneralTypes.CWS_AVAILABILITY_CHECK_FAILURE });
+            return { data: 'unavailable' };
+        }
+    };
+}
 exports.default = {
     getClientConfig,
     getLicenseConfig,

package/lib/actions/integrations.js

@@ -472,8 +472,10 @@ function deleteOutgoingOAuthConnection(id) {
 function submitInteractiveDialog(submission) {
     return async (dispatch, getState) => {
         const state = getState();
-        submission.channel_id = (0, channels_1.getCurrentChannelId)(state);
+        // Use the current channel as fallback
+        submission.channel_id ||= (0, channels_1.getCurrentChannelId)(state);
         submission.team_id = (0, teams_1.getCurrentTeamId)(state);
+        submission.user_id = (0, users_1.getCurrentUserId)(state);
         let data;
         try {
             data = await client_1.Client4.submitInteractiveDialog(submission);

package/lib/actions/posts.js

@@ -1123,6 +1123,14 @@ function doPostActionWithCookie(postId, actionId, actionCookie, selectedOption =
                 type: action_types_1.IntegrationTypes.RECEIVED_DIALOG_TRIGGER_ID,
                 data: data.trigger_id,
             });
+            const state = getState();
+            const post = PostSelectors.getPost(state, postId);
+            dispatch({
+                type: action_types_1.IntegrationTypes.RECEIVED_DIALOG_ARGUMENTS,
+                data: {
+                    channel_id: post.channel_id,
+                }
+            });
         }
         return { data };
     };

package/lib/actions/shared_channels.d.ts

@@ -0,0 +1,18 @@
+import type { RemoteClusterInfo } from '@mattermost/types/shared_channels';
+import type { ActionFuncAsync } from 'mattermost-redux/types/actions';
+export declare function receivedChannelRemotes(channelId: string, remotes: RemoteClusterInfo[]): {
+    type: "RECEIVED_CHANNEL_REMOTES";
+    data: {
+        channelId: string;
+        remotes: RemoteClusterInfo[];
+    };
+};
+export declare function receivedRemoteClusterInfo(remoteId: string, remoteInfo: RemoteClusterInfo): {
+    type: "RECEIVED_REMOTE_CLUSTER_INFO";
+    data: {
+        remoteId: string;
+        remoteInfo: RemoteClusterInfo;
+    };
+};
+export declare function fetchChannelRemotes(channelId: string, forceRefresh?: boolean): ActionFuncAsync<RemoteClusterInfo[]>;
+export declare function fetchRemoteClusterInfo(remoteId: string, forceRefresh?: boolean): ActionFuncAsync<RemoteClusterInfo>;

package/lib/actions/shared_channels.js

@@ -0,0 +1,80 @@
+"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 });
+exports.receivedChannelRemotes = receivedChannelRemotes;
+exports.receivedRemoteClusterInfo = receivedRemoteClusterInfo;
+exports.fetchChannelRemotes = fetchChannelRemotes;
+exports.fetchRemoteClusterInfo = fetchRemoteClusterInfo;
+const errors_1 = require("mattermost-redux/actions/errors");
+const helpers_1 = require("mattermost-redux/actions/helpers");
+const client_1 = require("mattermost-redux/client");
+const shared_channels_1 = __importDefault(require("../action_types/shared_channels"));
+function receivedChannelRemotes(channelId, remotes) {
+    return {
+        type: shared_channels_1.default.RECEIVED_CHANNEL_REMOTES,
+        data: {
+            channelId,
+            remotes,
+        },
+    };
+}
+function receivedRemoteClusterInfo(remoteId, remoteInfo) {
+    return {
+        type: shared_channels_1.default.RECEIVED_REMOTE_CLUSTER_INFO,
+        data: {
+            remoteId,
+            remoteInfo,
+        },
+    };
+}
+function fetchChannelRemotes(channelId, forceRefresh = false) {
+    return async (dispatch, getState) => {
+        // Check if we already have the data in the Redux store
+        const state = getState();
+        const remotes = state.entities?.sharedChannels?.remotes?.[channelId];
+        // If we already have the data and no refresh is requested, use the cached data
+        if (!forceRefresh && remotes && remotes.length > 0) {
+            return { data: remotes };
+        }
+        let data;
+        try {
+            data = await client_1.Client4.getSharedChannelRemoteInfos(channelId);
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            dispatch((0, errors_1.logError)(error));
+            return { error };
+        }
+        if (data) {
+            dispatch(receivedChannelRemotes(channelId, data));
+        }
+        return { data };
+    };
+}
+function fetchRemoteClusterInfo(remoteId, forceRefresh = false) {
+    return async (dispatch, getState) => {
+        // Check if we already have the remote info cached
+        const state = getState();
+        const cachedRemote = state.entities?.sharedChannels?.remotesByRemoteId?.[remoteId];
+        if (!forceRefresh && cachedRemote) {
+            return { data: cachedRemote };
+        }
+        let data;
+        try {
+            data = await client_1.Client4.getRemoteClusterInfo(remoteId);
+        }
+        catch (error) {
+            (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);
+            dispatch((0, errors_1.logError)(error));
+            return { error };
+        }
+        if (data) {
+            dispatch(receivedRemoteClusterInfo(remoteId, data));
+        }
+        return { data };
+    };
+}

package/lib/actions/users.d.ts

@@ -28,7 +28,7 @@ export declare function getProfilesInChannel(channelId: string, page: number, pe
 }): ActionFuncAsync<UserProfile[]>;
 export declare function batchGetProfilesInChannel(channelId: string): ActionFuncAsync<Array<Channel['id']>>;
 export declare function getProfilesInGroupChannels(channelsIds: string[]): ActionFuncAsync;
-export declare function getProfilesNotInChannel(teamId: string, channelId: string, groupConstrained: boolean, page: number, perPage?: number): ActionFuncAsync<UserProfile[]>;
+export declare function getProfilesNotInChannel(teamId: string, channelId: string, groupConstrained: boolean, page: number, perPage?: number, cursorId?: string): ActionFuncAsync<UserProfile[]>;
 export declare function getMe(): ActionFuncAsync<UserProfile>;
 export declare function getCustomProfileAttributeValues(userID: string): ActionFuncAsync<Record<string, string>>;
 export declare function updateMyTermsOfServiceStatus(termsOfServiceId: string, accepted: boolean): ActionFuncAsync;

package/lib/actions/users.js

@@ -433,11 +433,11 @@ function getProfilesInGroupChannels(channelsIds) {
         return { data: channelProfiles };
     };
 }
-function getProfilesNotInChannel(teamId, channelId, groupConstrained, page, perPage = constants_1.General.PROFILE_CHUNK_SIZE) {
+function getProfilesNotInChannel(teamId, channelId, groupConstrained, page, perPage = constants_1.General.PROFILE_CHUNK_SIZE, cursorId = '') {
     return async (dispatch, getState) => {
         let profiles;
         try {
-            profiles = await client_1.Client4.getProfilesNotInChannel(teamId, channelId, groupConstrained, page, perPage);
+            profiles = await client_1.Client4.getProfilesNotInChannel(teamId, channelId, groupConstrained, page, perPage, cursorId);
         }
         catch (error) {
             (0, helpers_1.forceLogoutIfNecessary)(error, dispatch, getState);

package/lib/constants/preferences.d.ts

@@ -40,6 +40,7 @@ declare const Preferences: {
     SHOW_UNREAD_SECTION: string;
     CATEGORY_ADVANCED_SETTINGS: string;
     ADVANCED_FILTER_JOIN_LEAVE: string;
+    RENDER_EMOTICONS_AS_EMOJI: string;
     ADVANCED_CODE_BLOCK_ON_CTRL_ENTER: string;
     ADVANCED_SEND_ON_CTRL_ENTER: string;
     ADVANCED_SYNC_DRAFTS: string;

package/lib/constants/preferences.js

@@ -44,6 +44,7 @@ const Preferences = {
     SHOW_UNREAD_SECTION: 'show_unread_section',
     CATEGORY_ADVANCED_SETTINGS: 'advanced_settings',
     ADVANCED_FILTER_JOIN_LEAVE: 'join_leave',
+    RENDER_EMOTICONS_AS_EMOJI: 'render_emoticons_as_emoji',
     ADVANCED_CODE_BLOCK_ON_CTRL_ENTER: 'code_block_ctrl_enter',
     ADVANCED_SEND_ON_CTRL_ENTER: 'send_on_ctrl_enter',
     ADVANCED_SYNC_DRAFTS: 'sync_drafts',

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

@@ -1,5 +1,6 @@
 import type { UserPropertyField } from '@mattermost/types/properties';
 import type { IDMappedObjects } from '@mattermost/types/utilities';
+export type CWSAvailabilityState = 'pending' | 'available' | 'unavailable' | 'not_applicable';
 declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     config: any;
     license: any;
@@ -7,5 +8,6 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     serverVersion: any;
     firstAdminVisitMarketplaceStatus: any;
     firstAdminCompleteSetup: any;
+    cwsAvailability: CWSAvailabilityState;
 }>, import("redux").AnyAction>;
 export default _default;

package/lib/reducers/entities/general.js

@@ -86,6 +86,20 @@ function firstAdminCompleteSetup(state = false, action) {
             return state;
     }
 }
+function cwsAvailability(state = 'pending', action) {
+    switch (action.type) {
+        case action_types_1.GeneralTypes.CWS_AVAILABILITY_CHECK_REQUEST:
+            return 'pending';
+        case action_types_1.GeneralTypes.CWS_AVAILABILITY_CHECK_SUCCESS:
+            return action.data;
+        case action_types_1.GeneralTypes.CWS_AVAILABILITY_CHECK_FAILURE:
+            return 'unavailable';
+        case action_types_1.UserTypes.LOGOUT_SUCCESS:
+            return 'pending';
+        default:
+            return state;
+    }
+}
 exports.default = (0, redux_1.combineReducers)({
     config,
     license,
@@ -93,4 +107,5 @@ exports.default = (0, redux_1.combineReducers)({
     serverVersion,
     firstAdminVisitMarketplaceStatus,
     firstAdminCompleteSetup,
+    cwsAvailability,
 });

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

@@ -6,6 +6,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         serverVersion: any;
         firstAdminVisitMarketplaceStatus: any;
         firstAdminCompleteSetup: any;
+        cwsAvailability: import("./general").CWSAvailabilityState;
     }>;
     users: import("redux").CombinedState<{
         currentUserId: any;
@@ -82,6 +83,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
         appsBotIDs: any;
         outgoingOAuthConnections: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/integrations").OutgoingOAuthConnection>;
         systemCommands: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/integrations").Command>;
+        dialogArguments: any;
         dialogTriggerId: any;
         dialog: any;
     }>;
@@ -241,5 +243,9 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
             [teamId: string]: string[];
         };
     }>;
+    sharedChannels: import("redux").CombinedState<{
+        remotes: Record<string, import("@mattermost/types/shared_channels").RemoteClusterInfo[]>;
+        remotesByRemoteId: Record<string, import("@mattermost/types/shared_channels").RemoteClusterInfo>;
+    }>;
 }>, import("redux").AnyAction>;
 export default _default;

package/lib/reducers/entities/index.js

@@ -27,6 +27,7 @@ const roles_1 = __importDefault(require("./roles"));
 const scheduled_posts_1 = __importDefault(require("./scheduled_posts"));
 const schemes_1 = __importDefault(require("./schemes"));
 const search_1 = __importDefault(require("./search"));
+const shared_channels_1 = __importDefault(require("./shared_channels"));
 const teams_1 = __importDefault(require("./teams"));
 const threads_1 = __importDefault(require("./threads"));
 const typing_1 = __importDefault(require("./typing"));
@@ -59,4 +60,5 @@ exports.default = (0, redux_1.combineReducers)({
     hostedCustomer: hosted_customer_1.default,
     channelBookmarks: channel_bookmarks_1.default,
     scheduledPosts: scheduled_posts_1.default,
+    sharedChannels: shared_channels_1.default,
 });

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

@@ -10,6 +10,7 @@ declare const _default: import("redux").Reducer<import("redux").CombinedState<{
     appsBotIDs: any;
     outgoingOAuthConnections: IDMappedObjects<OutgoingOAuthConnection>;
     systemCommands: IDMappedObjects<Command>;
+    dialogArguments: any;
     dialogTriggerId: any;
     dialog: any;
 }>, import("redux").AnyAction>;

package/lib/reducers/entities/integrations.js

@@ -262,6 +262,14 @@ function appsBotIDs(state = [], action) {
             return state;
     }
 }
+function dialogArguments(state = null, action) {
+    switch (action.type) {
+        case action_types_1.IntegrationTypes.RECEIVED_DIALOG_ARGUMENTS:
+            return action.data;
+        default:
+            return state;
+    }
+}
 function dialogTriggerId(state = '', action) {
     switch (action.type) {
         case action_types_1.IntegrationTypes.RECEIVED_DIALOG_TRIGGER_ID:
@@ -297,6 +305,8 @@ exports.default = (0, redux_1.combineReducers)({
     outgoingOAuthConnections,
     // object to represent built-in slash commands
     systemCommands,
+    // object containing arguments for interactive dialog
+    dialogArguments,
     // trigger ID for interactive dialogs
     dialogTriggerId,
     // data for an interactive dialog to display

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

@@ -0,0 +1,9 @@
+import type { AnyAction } from 'redux';
+import type { RemoteClusterInfo } from '@mattermost/types/shared_channels';
+export declare function remotes(state: Record<string, RemoteClusterInfo[]> | undefined, action: AnyAction): Record<string, RemoteClusterInfo[]>;
+export declare function remotesByRemoteId(state: Record<string, RemoteClusterInfo> | undefined, action: AnyAction): Record<string, RemoteClusterInfo>;
+declare const _default: import("redux").Reducer<import("redux").CombinedState<{
+    remotes: Record<string, RemoteClusterInfo[]>;
+    remotesByRemoteId: Record<string, RemoteClusterInfo>;
+}>, AnyAction>;
+export default _default;

package/lib/reducers/entities/shared_channels.js

@@ -0,0 +1,41 @@
+"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 });
+exports.remotes = remotes;
+exports.remotesByRemoteId = remotesByRemoteId;
+const redux_1 = require("redux");
+const shared_channels_1 = __importDefault(require("../../action_types/shared_channels"));
+function remotes(state = {}, action) {
+    switch (action.type) {
+        case shared_channels_1.default.RECEIVED_CHANNEL_REMOTES: {
+            const { channelId, remotes } = action.data;
+            return {
+                ...state,
+                [channelId]: remotes,
+            };
+        }
+        default:
+            return state;
+    }
+}
+function remotesByRemoteId(state = {}, action) {
+    switch (action.type) {
+        case shared_channels_1.default.RECEIVED_REMOTE_CLUSTER_INFO: {
+            const { remoteId, remoteInfo } = action.data;
+            return {
+                ...state,
+                [remoteId]: remoteInfo,
+            };
+        }
+        default:
+            return state;
+    }
+}
+exports.default = (0, redux_1.combineReducers)({
+    remotes,
+    remotesByRemoteId,
+});

package/lib/reducers/index.d.ts

@@ -8,6 +8,7 @@ declare const _default: {
             serverVersion: any;
             firstAdminVisitMarketplaceStatus: any;
             firstAdminCompleteSetup: any;
+            cwsAvailability: import("./entities/general").CWSAvailabilityState;
         }>;
         users: import("redux").CombinedState<{
             currentUserId: any;
@@ -84,6 +85,7 @@ declare const _default: {
             appsBotIDs: any;
             outgoingOAuthConnections: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/integrations").OutgoingOAuthConnection>;
             systemCommands: import("@mattermost/types/utilities").IDMappedObjects<import("@mattermost/types/integrations").Command>;
+            dialogArguments: any;
             dialogTriggerId: any;
             dialog: any;
         }>;
@@ -243,6 +245,10 @@ declare const _default: {
                 [teamId: string]: string[];
             };
         }>;
+        sharedChannels: import("redux").CombinedState<{
+            remotes: Record<string, import("@mattermost/types/shared_channels").RemoteClusterInfo[]>;
+            remotesByRemoteId: Record<string, import("@mattermost/types/shared_channels").RemoteClusterInfo>;
+        }>;
     }>, import("redux").AnyAction>;
     errors: (state: Array<{
         error: any;

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

@@ -1,6 +1,7 @@
 import type { ClientConfig, FeatureFlags, ClientLicense } from '@mattermost/types/config';
 import type { UserPropertyField } from '@mattermost/types/properties';
 import type { GlobalState } from '@mattermost/types/store';
+import type { CWSAvailabilityState } from '../../reducers/entities/general';
 export declare function getConfig(state: GlobalState): Partial<ClientConfig>;
 /**
  * Safely get value of a specific or known FeatureFlag
@@ -31,3 +32,4 @@ export declare function developerModeEnabled(state: GlobalState): boolean;
 export declare function testingEnabled(state: GlobalState): boolean;
 export declare const getCustomProfileAttributes: (state: GlobalState) => UserPropertyField[];
 export declare function getIsCrossTeamSearchEnabled(state: GlobalState): boolean;
+export declare function getCWSAvailability(state: GlobalState): CWSAvailabilityState;

package/lib/selectors/entities/general.js

@@ -13,6 +13,7 @@ exports.isPerformanceDebuggingEnabled = isPerformanceDebuggingEnabled;
 exports.developerModeEnabled = developerModeEnabled;
 exports.testingEnabled = testingEnabled;
 exports.getIsCrossTeamSearchEnabled = getIsCrossTeamSearchEnabled;
+exports.getCWSAvailability = getCWSAvailability;
 const constants_1 = require("mattermost-redux/constants");
 const create_selector_1 = require("mattermost-redux/selectors/create_selector");
 const helpers_1 = require("mattermost-redux/utils/helpers");
@@ -103,3 +104,6 @@ exports.getCustomProfileAttributes = (0, create_selector_1.createSelector)('getC
 function getIsCrossTeamSearchEnabled(state) {
     return state.entities.general.config.EnableCrossTeamSearch === 'true';
 }
+function getCWSAvailability(state) {
+    return state.entities.general.cwsAvailability;
+}

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

@@ -7,6 +7,7 @@ export declare function getOutgoingHooks(state: GlobalState): IDMappedObjects<Ou
 export declare function getCommands(state: GlobalState): IDMappedObjects<Command>;
 export declare function getOAuthApps(state: GlobalState): IDMappedObjects<import("@mattermost/types/integrations").OAuthApp>;
 export declare function getOutgoingOAuthConnections(state: GlobalState): IDMappedObjects<import("@mattermost/types/integrations").OutgoingOAuthConnection>;
+export declare function getDialogArguments(state: GlobalState): import("@mattermost/types/integrations").DialogArgs | undefined;
 export declare const getFilteredIncomingHooks: (state: GlobalState) => IncomingWebhook[];
 export declare const getAppsOAuthAppIDs: (state: GlobalState) => string[];
 export declare const getAppsBotIDs: (state: GlobalState) => string[];

package/lib/selectors/entities/integrations.js

@@ -9,6 +9,7 @@ exports.getOutgoingHooks = getOutgoingHooks;
 exports.getCommands = getCommands;
 exports.getOAuthApps = getOAuthApps;
 exports.getOutgoingOAuthConnections = getOutgoingOAuthConnections;
+exports.getDialogArguments = getDialogArguments;
 exports.getSystemCommands = getSystemCommands;
 const create_selector_1 = require("mattermost-redux/selectors/create_selector");
 const teams_1 = require("mattermost-redux/selectors/entities/teams");
@@ -31,6 +32,9 @@ function getOAuthApps(state) {
 function getOutgoingOAuthConnections(state) {
     return state.entities.integrations.outgoingOAuthConnections;
 }
+function getDialogArguments(state) {
+    return state.entities.integrations.dialogArguments;
+}
 exports.getFilteredIncomingHooks = (0, create_selector_1.createSelector)('getFilteredIncomingHooks', teams_1.getCurrentTeamId, getIncomingHooks, (teamId, hooks) => {
     return Object.keys(hooks).
         map((key) => hooks[key]).

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

@@ -0,0 +1,6 @@
+import type { RemoteClusterInfo } from '@mattermost/types/shared_channels';
+import type { GlobalState } from '@mattermost/types/store';
+export declare function getRemoteNamesForChannel(state: GlobalState, channelId: string): string[];
+export declare function getRemotesForChannel(state: GlobalState, channelId: string): RemoteClusterInfo[];
+export declare function getRemoteClusterInfo(state: GlobalState, remoteId: string): RemoteClusterInfo | null;
+export declare function getRemoteDisplayName(state: GlobalState, remoteId: string): string | null;

package/lib/selectors/entities/shared_channels.js

@@ -0,0 +1,25 @@
+"use strict";
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRemoteNamesForChannel = getRemoteNamesForChannel;
+exports.getRemotesForChannel = getRemotesForChannel;
+exports.getRemoteClusterInfo = getRemoteClusterInfo;
+exports.getRemoteDisplayName = getRemoteDisplayName;
+function getRemoteNamesForChannel(state, channelId) {
+    const remotes = state.entities?.sharedChannels?.remotes?.[channelId];
+    if (remotes && remotes.length > 0) {
+        return remotes.map((remote) => remote.display_name);
+    }
+    return [];
+}
+function getRemotesForChannel(state, channelId) {
+    return state.entities?.sharedChannels?.remotes?.[channelId] || [];
+}
+function getRemoteClusterInfo(state, remoteId) {
+    return state.entities?.sharedChannels?.remotesByRemoteId?.[remoteId] || null;
+}
+function getRemoteDisplayName(state, remoteId) {
+    const remote = getRemoteClusterInfo(state, remoteId);
+    return remote?.display_name || null;
+}

package/lib/store/initial_state.js

@@ -12,6 +12,7 @@ const state = {
             firstAdminVisitMarketplaceStatus: false,
             firstAdminCompleteSetup: false,
             customProfileAttributes: {},
+            cwsAvailability: 'pending',
         },
         users: {
             currentUserId: '',

package/lib/utils/user_utils.js

@@ -47,7 +47,7 @@ function displayUsername(user, teammateNameDisplay, useFallbackUsername = true)
             name = getFullName(user);
         }
         else {
-            name = user.username;
+            name = (user.remote_id && user.props?.RemoteUsername) ? user.props.RemoteUsername : user.username;
         }
         if (!name || name.trim().length === 0) {
             name = user.username;
@@ -155,12 +155,8 @@ function nameSuggestionsForUser(user) {
     profileSuggestions.push((user.nickname || '').toLowerCase());
     const positionSuggestions = getSuggestionsSplitBy((user.position || '').toLowerCase(), ' ');
     profileSuggestions.push(...positionSuggestions);
-    const email = (user.email || '').toLowerCase();
+    const email = (user.email || '').toLowerCase().split('@')[0];
     profileSuggestions.push(email);
-    const split = email.split('@');
-    if (split.length > 1) {
-        profileSuggestions.push(split[1]);
-    }
     return profileSuggestions;
 }
 function filterProfilesStartingWithTerm(users, term) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mattermost-redux",
-  "version": "10.9.0",
+  "version": "10.10.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.9.0",
-    "@mattermost/types": "10.9.0",
+    "@mattermost/client": "10.10.0",
+    "@mattermost/types": "10.10.0",
     "@redux-devtools/extension": "^3.2.3",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.38",

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

@@ -1,4 +0,0 @@
-import type { Product } from '@mattermost/types/cloud';
-import type { GlobalState } from '@mattermost/types/store';
-export declare function getSelfHostedProducts(state: GlobalState): Record<string, Product>;
-export declare function getSelfHostedProductsLoaded(state: GlobalState): boolean;

package/lib/selectors/entities/hosted_customer.js

@@ -1,12 +0,0 @@
-"use strict";
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSelfHostedProducts = getSelfHostedProducts;
-exports.getSelfHostedProductsLoaded = getSelfHostedProductsLoaded;
-function getSelfHostedProducts(state) {
-    return state.entities.hostedCustomer.products.products;
-}
-function getSelfHostedProductsLoaded(state) {
-    return state.entities.hostedCustomer.products.productsLoaded;
-}