@@ -459,11 +480,25 @@ function ChannelSettingsInfoTab({
onChange={handleChannelTypeChange}
/>
)}
- {/* Admin Sidebar Category Selector */}
- {showManagedCategorySelector && (
-
+ )}
+ {/* Managed Sidebar Category Selector */}
+ {showManagedCategoryField && (
+
diff --git a/webapp/channels/src/components/channel_settings_modal/managed_category_selector.test.tsx b/webapp/channels/src/components/channel_settings_modal/managed_category_selector.test.tsx
deleted file mode 100644
index 7fdb795a713..00000000000
--- a/webapp/channels/src/components/channel_settings_modal/managed_category_selector.test.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React from 'react';
-
-import {renderWithContext, screen, userEvent} from 'tests/react_testing_utils';
-
-import ManagedCategorySelector from './managed_category_selector';
-
-const baseState = {
- entities: {
- general: {
- config: {EnableManagedChannelCategories: 'true'},
- },
- teams: {
- currentTeamId: 'team1',
- },
- channelCategories: {
- byId: {},
- orderByTeam: {},
- managedCategoryMappings: {
- team1: {
- channel1: 'Operations',
- channel2: 'Operations',
- channel3: 'Intel',
- },
- },
- },
- },
-};
-
-describe('ManagedCategorySelector', () => {
- const baseProps = {
- value: '',
- onChange: jest.fn(),
- };
-
- beforeEach(() => {
- baseProps.onChange.mockClear();
- });
-
- it('should render with the selected value', () => {
- renderWithContext(
-
,
- baseState,
- );
-
- expect(screen.getByText('Operations')).toBeInTheDocument();
- });
-
- it('should show existing categories as options', async () => {
- renderWithContext(
, baseState);
-
- const input = screen.getByRole('combobox');
- await userEvent.click(input);
-
- expect(screen.getByText('Operations')).toBeInTheDocument();
- expect(screen.getByText('Intel')).toBeInTheDocument();
- });
-
- it('should call onChange when a category is selected', async () => {
- renderWithContext(
, baseState);
-
- const input = screen.getByRole('combobox');
- await userEvent.click(input);
- await userEvent.click(screen.getByText('Operations'));
-
- expect(baseProps.onChange).toHaveBeenCalledWith('Operations');
- });
-
- it('should be disabled when disabled prop is true', () => {
- const {container} = renderWithContext(
-
,
- baseState,
- );
-
- const selectControl = container.querySelector('.ManagedCategory__control--is-disabled');
- expect(selectControl).toBeInTheDocument();
- });
-
- it('should not show create option for single character input', async () => {
- renderWithContext(
, baseState);
-
- const input = screen.getByRole('combobox');
- await userEvent.click(input);
- await userEvent.type(input, 'N');
-
- expect(screen.queryByText(/Create new category/)).not.toBeInTheDocument();
- });
-});
diff --git a/webapp/channels/src/components/new_channel_modal/new_channel_modal.tsx b/webapp/channels/src/components/new_channel_modal/new_channel_modal.tsx
index 841213b8b31..b9ecc8ec33b 100644
--- a/webapp/channels/src/components/new_channel_modal/new_channel_modal.tsx
+++ b/webapp/channels/src/components/new_channel_modal/new_channel_modal.tsx
@@ -2,7 +2,7 @@
// See LICENSE.txt for license information.
import classNames from 'classnames';
-import React, {useCallback, useState} from 'react';
+import React, {useCallback, useRef, useState} from 'react';
import {FormattedMessage, useIntl} from 'react-intl';
import {useDispatch, useSelector} from 'react-redux';
@@ -16,7 +16,7 @@ import {setNewChannelWithBoardPreference} from 'mattermost-redux/actions/boards'
import {createChannel} from 'mattermost-redux/actions/channels';
import Permissions from 'mattermost-redux/constants/permissions';
import Preferences from 'mattermost-redux/constants/preferences';
-import {areManagedCategoriesEnabled} from 'mattermost-redux/selectors/entities/channel_categories';
+import {areManagedCategoriesEnabled, isChannelCategorySortingEnabled, makeGetSidebarCategoryNamesForTeam} from 'mattermost-redux/selectors/entities/channel_categories';
import {get as getPreference} from 'mattermost-redux/selectors/entities/preferences';
import {haveICurrentChannelPermission} from 'mattermost-redux/selectors/entities/roles';
import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
@@ -24,8 +24,8 @@ import {getCurrentTeam} from 'mattermost-redux/selectors/entities/teams';
import {switchToChannel} from 'actions/views/channel';
import {closeModal} from 'actions/views/modals';
+import CategorySelector from 'components/category_selector/category_selector';
import ChannelNameFormField from 'components/channel_name_form_field/channel_name_form_field';
-import ManagedCategorySelector from 'components/channel_settings_modal/managed_category_selector';
import Input from 'components/widgets/inputs/input/input';
import PublicPrivateSelector from 'components/widgets/public-private-selector/public-private-selector';
@@ -61,11 +61,14 @@ const NewChannelModal = () => {
const intl = useIntl();
const {formatMessage} = intl;
+ const getSidebarCategoryNamesForTeam = useRef(makeGetSidebarCategoryNamesForTeam());
+
const currentTeamId = useSelector(getCurrentTeam)?.id;
const canCreatePublicChannel = useSelector((state: GlobalState) => (currentTeamId ? haveICurrentChannelPermission(state, Permissions.CREATE_PUBLIC_CHANNEL) : false));
const canCreatePrivateChannel = useSelector((state: GlobalState) => (currentTeamId ? haveICurrentChannelPermission(state, Permissions.CREATE_PRIVATE_CHANNEL) : false));
- const enableManagedCategories = useSelector(areManagedCategoriesEnabled);
+ const showDefaultCategorySelector = useSelector(isChannelCategorySortingEnabled);
+ const showManagedCategorySelector = useSelector(areManagedCategoriesEnabled);
const dispatch = useDispatch();
const [type, setType] = useState(getChannelTypeFromPermissions(canCreatePublicChannel, canCreatePrivateChannel));
@@ -76,6 +79,7 @@ const NewChannelModal = () => {
const [purposeError, setPurposeError] = useState('');
const [serverError, setServerError] = useState('');
const [channelInputError, setChannelInputError] = useState(false);
+ const [defaultCategoryName, setDefaultCategoryName] = useState
(undefined);
const [managedCategoryName, setManagedCategoryName] = useState(undefined);
// create a board along with the channel
@@ -111,6 +115,7 @@ const NewChannelModal = () => {
last_root_post_at: 0,
scheme_id: '',
update_at: 0,
+ default_category_name: defaultCategoryName,
managed_category_name: managedCategoryName,
};
@@ -288,11 +293,25 @@ const NewChannelModal = () => {
}}
onChange={handleOnTypeChange}
/>
- {enableManagedCategories && (
+ {showDefaultCategorySelector && (
-
+
+ )}
+ {showManagedCategorySelector && (
+
+
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 6720ce8f873..2cce8c093be 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -1117,8 +1117,6 @@
"admin.experimental.allowCustomThemes.title": "Allow Custom Themes:",
"admin.experimental.allowedEmailDomain.desc": "(Optional) When set, users must have an email ending in this domain to move threads. Multiple domains can be specified by separating them with commas.",
"admin.experimental.allowedEmailDomain.title": "Allowed Email Domain",
- "admin.experimental.channelCategorySorting.desc": "When true, channels will be automatically sorted into categories based on their names using a \"/\" delimiter.",
- "admin.experimental.channelCategorySorting.title": "Channel Category Sorting:",
"admin.experimental.collapsedThreads.always_on": "Always On",
"admin.experimental.collapsedThreads.default_off": "Enabled (Default Off)",
"admin.experimental.collapsedThreads.default_on": "Enabled (Default On)",
@@ -3345,6 +3343,8 @@
"admin.team.deleteAccountTitle": "Delete Account Link:",
"admin.team.emailInvitationsDescription": "When true users can invite others to the system using email.",
"admin.team.emailInvitationsTitle": "Enable Email Invitations: ",
+ "admin.team.enableChannelCategorySortingDescription": "When true, channel admins can choose a default sidebar category when creating or editing a channel. New channel members will automatically have a category created that contains the channel for them when joining the channel.",
+ "admin.team.enableChannelCategorySortingTitle": "Channel category sorting:",
"admin.team.enableJoinLeaveMessageDescription": "Choose the default configuration of system messages displayed when users join or leave channels. Users can override this default by configuring Join/Leave messages in Account Settings > Advanced.",
"admin.team.enableJoinLeaveMessageTitle": "Enable join/leave messages by default:",
"admin.team.invalidateEmailInvitesDescription": "This will invalidate active email invitations that have not been accepted by the user. By default email invitations expire after 48 hours.",
@@ -3353,8 +3353,6 @@
"admin.team.invalidateEmailInvitesTitle": "Invalidate pending email invites",
"admin.team.lastActiveTimeDescription": "When enabled, last active time allows users to see when someone was last online.",
"admin.team.lastActiveTimeTitle": "Enable last active time: ",
- "admin.team.managedChannelCategoriesDescription": "Enables teams to have fixed sidebar categories to organize channels for all members of the team. Channel admins can create categories and organize their channels.",
- "admin.team.managedChannelCategoriesTitle": "Managed channel categories:",
"admin.team.maxChannelsDescription": "Maximum total number of channels per team, including both active and archived channels.",
"admin.team.maxChannelsExample": "E.g.: \"100\"",
"admin.team.maxChannelsTitle": "Max Channels Per Team:",
@@ -4462,6 +4460,11 @@
"deactivate_member_modal.desc.for_users_with_bot_accounts3": "Bot accounts they manage will be disabled along with their integrations. To enable them again, go to Integrations > Bot Accounts. Learn more about bot accounts.",
"deactivate_member_modal.sso_warning": "You must also deactivate this user in the SSO provider or they will be reactivated on next login or sync.",
"deactivate_member_modal.title": "Deactivate {username}",
+ "default_category.create_new_prefix": "Create new category: ",
+ "default_category.help_text": "Sets the default sidebar category for users when they join the channel.",
+ "default_category.label": "Default category (optional)",
+ "default_category.placeholder": "Choose a default category (optional)",
+ "default_category.placeholder_focused": "Select category or type a new one",
"delete_category_modal.delete": "Delete",
"delete_category_modal.deleteCategory": "Delete this category?",
"delete_category_modal.helpText": "Channels in {category_name} will move back to the Channels and Direct messages categories. You're not removed from any channels.",
@@ -5353,10 +5356,8 @@
"login.verified": "Email Verified",
"manage_channel_groups_modal.search_placeholder": "Search groups",
"manage_team_groups_modal.search_placeholder": "Search groups",
- "managed_category.create_new_prefix": "Create new category: ",
"managed_category.label": "Managed category (optional)",
"managed_category.placeholder": "Choose a managed category (optional)",
- "managed_category.placeholder_focused": "Select category or type a new one",
"mark_all_threads_as_read_modal.confirm": "Mark all as read",
"mark_all_threads_as_read_modal.description": "All your threads will be marked as read, with unread and mention badges cleared. Do you want to continue?",
"mark_all_threads_as_read_modal.title": "Mark all your threads as read",
diff --git a/webapp/channels/src/packages/mattermost-redux/src/actions/channel_categories.test.js b/webapp/channels/src/packages/mattermost-redux/src/actions/channel_categories.test.js
index 8f69cc28071..283fac7eb2b 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/actions/channel_categories.test.js
+++ b/webapp/channels/src/packages/mattermost-redux/src/actions/channel_categories.test.js
@@ -525,6 +525,32 @@ describe('addChannelToInitialCategory', () => {
expect(categoriesById.dmCategory2.channel_ids).toEqual(['gmChannel', 'dmChannel1', 'dmChannel2']);
expect(categoriesById.channelsCategory1.channel_ids).toEqual(['publicChannel1', 'gmChannel']);
});
+
+ test('should not add channel to Channels category when default_category_name is set', async () => {
+ const channelsCategory1 = {id: 'channelsCategory1', team_id: 'team1', type: CategoryTypes.CHANNELS, channel_ids: ['publicChannel1', 'privateChannel1']};
+
+ const store = configureStore({
+ entities: {
+ channelCategories: {
+ byId: {
+ channelsCategory1,
+ },
+ orderByTeam: {
+ team1: ['channelsCategory1'],
+ },
+ },
+ },
+ });
+
+ const newChannel = {id: 'newChannel', type: General.OPEN_CHANNEL, team_id: 'team1', default_category_name: 'My Category'};
+
+ const result = await store.dispatch(Actions.addChannelToInitialCategory(newChannel));
+
+ expect(result).toEqual({data: false});
+
+ const categoriesById = getAllCategoriesByIds(store.getState());
+ expect(categoriesById.channelsCategory1.channel_ids).toEqual(['publicChannel1', 'privateChannel1']);
+ });
});
describe('addChannelToCategory', () => {
diff --git a/webapp/channels/src/packages/mattermost-redux/src/actions/channel_categories.ts b/webapp/channels/src/packages/mattermost-redux/src/actions/channel_categories.ts
index 907df285e2f..957bd2c93e0 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/actions/channel_categories.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/actions/channel_categories.ts
@@ -199,6 +199,10 @@ export function addChannelToInitialCategory(channel: Channel, setOnServer = fals
dispatch(fetchChannelManagedCategoryMapping(channel));
}
+ if (channel.default_category_name) {
+ return {data: false};
+ }
+
// 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};
diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.test.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.test.ts
index b9c96c34bd4..6028d3669cf 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.test.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.test.ts
@@ -1453,7 +1453,7 @@ describe('isChannelInManagedCategory', () => {
const state = {
entities: {
general: {
- config: {EnableManagedChannelCategories: 'true'},
+ config: {FeatureFlagManagedChannelCategories: 'true'},
},
channels: {
channels: {
@@ -1491,7 +1491,7 @@ describe('getChannelManagedCategoryName', () => {
const state = {
entities: {
general: {
- config: {EnableManagedChannelCategories: 'true'},
+ config: {FeatureFlagManagedChannelCategories: 'true'},
},
channels: {
channels: {
@@ -1527,7 +1527,7 @@ describe('makeGetManagedCategoriesForTeam', () => {
const state = {
entities: {
general: {
- config: {EnableManagedChannelCategories: 'true'},
+ config: {FeatureFlagManagedChannelCategories: 'true'},
},
channelCategories: {
managedCategoryMappings: {},
@@ -1547,7 +1547,7 @@ describe('makeGetManagedCategoriesForTeam', () => {
const state = {
entities: {
general: {
- config: {EnableManagedChannelCategories: 'true'},
+ config: {FeatureFlagManagedChannelCategories: 'true'},
},
channelCategories: {
managedCategoryMappings: {
@@ -1610,7 +1610,7 @@ describe('makeGetCategoriesForTeam (merged)', () => {
const state = {
entities: {
general: {
- config: {EnableManagedChannelCategories: 'true'},
+ config: {FeatureFlagManagedChannelCategories: 'true'},
},
channelCategories: {
byId: {favorites1: nonManagedCategory1, channels1: nonManagedCategory2},
@@ -1633,7 +1633,7 @@ describe('makeGetCategoriesForTeam (merged)', () => {
const state = {
entities: {
general: {
- config: {EnableManagedChannelCategories: 'true'},
+ config: {FeatureFlagManagedChannelCategories: 'true'},
},
channelCategories: {
byId: {favorites1: nonManagedCategory1, channels1: nonManagedCategory2},
@@ -1672,7 +1672,7 @@ describe('makeGetCategoriesForTeam (merged)', () => {
const state = {
entities: {
general: {
- config: {EnableManagedChannelCategories: 'true'},
+ config: {FeatureFlagManagedChannelCategories: 'true'},
},
channelCategories: {
byId: {favorites1: nonManagedCategory1, channels1: nonManagedCategory2},
@@ -1697,3 +1697,235 @@ describe('makeGetCategoriesForTeam (merged)', () => {
expect(result[2].channel_ids).toEqual(nonManagedCategory2.channel_ids);
});
});
+
+describe('isChannelCategorySortingEnabled', () => {
+ test('should return true when EnableChannelCategorySorting config is "true"', () => {
+ const state = {
+ entities: {
+ general: {
+ config: {EnableChannelCategorySorting: 'true'},
+ },
+ },
+ } as unknown as GlobalState;
+
+ expect(Selectors.isChannelCategorySortingEnabled(state)).toBe(true);
+ });
+
+ test('should return false when EnableChannelCategorySorting config is "false"', () => {
+ const state = {
+ entities: {
+ general: {
+ config: {EnableChannelCategorySorting: 'false'},
+ },
+ },
+ } as unknown as GlobalState;
+
+ expect(Selectors.isChannelCategorySortingEnabled(state)).toBe(false);
+ });
+
+ test('should return false when EnableChannelCategorySorting config is missing', () => {
+ const state = {
+ entities: {
+ general: {
+ config: {},
+ },
+ },
+ } as unknown as GlobalState;
+
+ expect(Selectors.isChannelCategorySortingEnabled(state)).toBe(false);
+ });
+});
+
+describe('makeGetSidebarCategoryNamesForTeam', () => {
+ const customB = {
+ id: 'customB',
+ team_id: 'team1',
+ type: CategoryTypes.CUSTOM,
+ display_name: 'Bravo',
+ channel_ids: ['channel1'],
+ sorting: CategorySorting.Default,
+ user_id: 'user1',
+ muted: false,
+ collapsed: false,
+ };
+ const customA = {
+ id: 'customA',
+ team_id: 'team1',
+ type: CategoryTypes.CUSTOM,
+ display_name: 'Alpha',
+ channel_ids: ['channel2'],
+ sorting: CategorySorting.Default,
+ user_id: 'user1',
+ muted: false,
+ collapsed: false,
+ };
+ const favoritesCategory = {
+ id: 'favorites1',
+ team_id: 'team1',
+ type: CategoryTypes.FAVORITES,
+ display_name: 'Favorites',
+ channel_ids: ['channel3'],
+ sorting: CategorySorting.Default,
+ user_id: 'user1',
+ muted: false,
+ collapsed: false,
+ };
+ const channelsCategory = {
+ id: 'channels1',
+ team_id: 'team1',
+ type: CategoryTypes.CHANNELS,
+ display_name: 'Channels',
+ channel_ids: ['channel4'],
+ sorting: CategorySorting.Default,
+ user_id: 'user1',
+ muted: false,
+ collapsed: false,
+ };
+ const dmCategory = {
+ id: 'dm1',
+ team_id: 'team1',
+ type: CategoryTypes.DIRECT_MESSAGES,
+ display_name: 'Direct Messages',
+ channel_ids: [],
+ sorting: CategorySorting.Default,
+ user_id: 'user1',
+ muted: false,
+ collapsed: false,
+ };
+
+ test('should return only CUSTOM category names sorted alphabetically by locale', () => {
+ const getSidebarCategoryNamesForTeam = Selectors.makeGetSidebarCategoryNamesForTeam();
+
+ const state = {
+ entities: {
+ general: {
+ config: {FeatureFlagManagedChannelCategories: 'true'},
+ },
+ channelCategories: {
+ byId: {
+ favorites1: favoritesCategory,
+ channels1: channelsCategory,
+ dm1: dmCategory,
+ customB,
+ customA,
+ },
+ orderByTeam: {team1: ['favorites1', 'customB', 'channels1', 'customA', 'dm1']},
+ managedCategoryMappings: {},
+ },
+ users: {
+ currentUserId: 'user1',
+ profiles: {},
+ },
+ },
+ } as unknown as GlobalState;
+
+ expect(getSidebarCategoryNamesForTeam(state, 'team1')).toEqual(['Alpha', 'Bravo']);
+ });
+
+ test('should include MANAGED categories and exclude FAVORITES/CHANNELS/DIRECT_MESSAGES', () => {
+ const getSidebarCategoryNamesForTeam = Selectors.makeGetSidebarCategoryNamesForTeam();
+
+ const state = {
+ entities: {
+ general: {
+ config: {FeatureFlagManagedChannelCategories: 'true'},
+ },
+ channels: {
+ channels: {
+ channel4: {id: 'channel4', team_id: 'team1'},
+ },
+ },
+ channelCategories: {
+ byId: {
+ favorites1: favoritesCategory,
+ channels1: channelsCategory,
+ dm1: dmCategory,
+ customA,
+ },
+ orderByTeam: {team1: ['favorites1', 'customA', 'channels1', 'dm1']},
+ managedCategoryMappings: {
+ team1: {
+ channel4: 'Operations',
+ },
+ },
+ },
+ users: {
+ currentUserId: 'user1',
+ profiles: {},
+ },
+ },
+ } as unknown as GlobalState;
+
+ expect(getSidebarCategoryNamesForTeam(state, 'team1')).toEqual(['Alpha', 'Operations']);
+ });
+
+ test('should deduplicate names that appear in both CUSTOM and MANAGED categories', () => {
+ const getSidebarCategoryNamesForTeam = Selectors.makeGetSidebarCategoryNamesForTeam();
+
+ const customAlpha = {
+ ...customA,
+ display_name: 'Operations',
+ };
+
+ const state = {
+ entities: {
+ general: {
+ config: {FeatureFlagManagedChannelCategories: 'true'},
+ },
+ channels: {
+ channels: {
+ channel4: {id: 'channel4', team_id: 'team1'},
+ },
+ },
+ channelCategories: {
+ byId: {
+ favorites1: favoritesCategory,
+ channels1: channelsCategory,
+ dm1: dmCategory,
+ customA: customAlpha,
+ },
+ orderByTeam: {team1: ['favorites1', 'customA', 'channels1', 'dm1']},
+ managedCategoryMappings: {
+ team1: {
+ channel4: 'Operations',
+ },
+ },
+ },
+ users: {
+ currentUserId: 'user1',
+ profiles: {},
+ },
+ },
+ } as unknown as GlobalState;
+
+ expect(getSidebarCategoryNamesForTeam(state, 'team1')).toEqual(['Operations']);
+ });
+
+ test('should sort numerically when locale is set on user', () => {
+ const getSidebarCategoryNamesForTeam = Selectors.makeGetSidebarCategoryNamesForTeam();
+
+ const cat10 = {...customA, id: 'cat10', display_name: 'Item 10'};
+ const cat2 = {...customA, id: 'cat2', display_name: 'Item 2'};
+
+ const state = {
+ entities: {
+ general: {
+ config: {FeatureFlagManagedChannelCategories: 'true'},
+ },
+ channelCategories: {
+ byId: {cat10, cat2},
+ orderByTeam: {team1: ['cat10', 'cat2']},
+ managedCategoryMappings: {},
+ },
+ users: {
+ currentUserId: 'user1',
+ profiles: {
+ user1: {id: 'user1', locale: 'en'},
+ },
+ },
+ },
+ } as unknown as GlobalState;
+
+ expect(getSidebarCategoryNamesForTeam(state, 'team1')).toEqual(['Item 2', 'Item 10']);
+ });
+});
diff --git a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts
index 126ce743ba6..fd56d28ae07 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/selectors/entities/channel_categories.ts
@@ -475,7 +475,11 @@ function isUnreadChannel(
}
export function areManagedCategoriesEnabled(state: GlobalState): boolean {
- return getConfig(state).EnableManagedChannelCategories === 'true';
+ return getConfig(state).FeatureFlagManagedChannelCategories === 'true';
+}
+
+export function isChannelCategorySortingEnabled(state: GlobalState): boolean {
+ return getConfig(state).EnableChannelCategorySorting === 'true';
}
export function getManagedCategoryMappings(state: GlobalState, teamId: string): Record | undefined {
@@ -538,6 +542,24 @@ export function makeGetCategoriesForTeam(): (state: GlobalState, teamId: string)
);
}
+export function makeGetSidebarCategoryNamesForTeam(): (state: GlobalState, teamId: string) => string[] {
+ const getCategoriesForTeam = makeGetCategoriesForTeam();
+
+ return createSelector(
+ 'makeGetSidebarCategoryNamesForTeam',
+ (state: GlobalState, teamId: string) => getCategoriesForTeam(state, teamId),
+ (state: GlobalState) => getCurrentUserLocale(state),
+ (categories, locale) => {
+ const names = categories.
+ filter((c) => c.type === CategoryTypes.CUSTOM || c.type === CategoryTypes.MANAGED).
+ map((c) => c.display_name);
+ const unique = [...new Set(names)];
+ unique.sort((a, b) => a.localeCompare(b, locale, {numeric: true}));
+ return unique;
+ },
+ );
+}
+
export function makeGetManagedCategoriesForTeam(): (state: GlobalState, teamId: string) => ChannelCategory[] {
return createSelector(
'makeGetManagedCategoriesForTeam',
diff --git a/webapp/platform/types/src/config.ts b/webapp/platform/types/src/config.ts
index e2641a66d35..10f35133da0 100644
--- a/webapp/platform/types/src/config.ts
+++ b/webapp/platform/types/src/config.ts
@@ -64,7 +64,7 @@ export type ClientConfig = {
EnableExperimentalLocales: string;
EnableUserStatuses: string;
EnableLastActiveTime: string;
- EnableManagedChannelCategories: string;
+ EnableChannelCategorySorting: string;
EnableTimedDND: string;
EnableCrossTeamSearch: 'true' | 'false';
EnableCustomTermsOfService: string;
@@ -117,7 +117,6 @@ export type ClientConfig = {
EnableUserDeactivation: string;
EnableUserTypingMessages: string;
EnforceMultifactorAuthentication: string;
- ExperimentalChannelCategorySorting: string;
ExperimentalEnableAuthenticationTransfer: string;
ExperimentalEnableAutomaticReplies: string;
ExperimentalEnableDefaultChannelLeaveJoinMessages: string;
@@ -133,6 +132,7 @@ export type ClientConfig = {
FeatureFlagWebSocketEventScope: string;
FeatureFlagInteractiveDialogAppsForm: string;
FeatureFlagContentFlagging: string;
+ FeatureFlagManagedChannelCategories: string;
ForgotPasswordLink: string;
GiphySdkKey: string;
@@ -468,6 +468,7 @@ export type TeamSettings = {
ExperimentalDefaultChannels: string[];
EnableLastActiveTime: boolean;
EnableJoinLeaveMessageByDefault: boolean;
+ EnableChannelCategorySorting: boolean;
};
export type ClientRequirements = {
@@ -870,7 +871,6 @@ export type ExperimentalSettings = {
DisableWakeUpReconnectHandler: boolean;
UsersStatusAndProfileFetchingPollIntervalMilliseconds: number;
YoutubeReferrerPolicy: boolean;
- ExperimentalChannelCategorySorting: boolean;
EnableWatermark: boolean;
};