IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

MM-61199: Remove channelBookmarks feature flag (#37120)

Browse Source
This commit is contained in:
Caleb Roseland
2026-06-30 18:36:27 -05:00
committed by GitHub
parent 637319b9bd
commit cb136ac81e
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-tests/playwright/lib/src/server/default_config.ts
-1
View File
@@ -801,7 +801,6 @@ const defaultServerConfig: AdminConfig = {
MoveThreadsEnabled: false,
StreamlinedMarketplace: true,
CloudDedicatedExportUI: false,
ChannelBookmarks: true,
WebSocketEventScope: true,
NotificationMonitoring: true,
ExperimentalAuditSettingsSystemConsoleUI: true,
server/channels/api4/channel_bookmark.go
+5 -7
View File
@@ -17,13 +17,11 @@ func rejectExternallyManagedBookmarkWrite(op string) *model.AppError {
}
func (api *API) InitChannelBookmarks() {
if api.srv.Config().FeatureFlags.ChannelBookmarks {
api.BaseRoutes.ChannelBookmarks.Handle("", api.APISessionRequired(createChannelBookmark)).Methods(http.MethodPost)
api.BaseRoutes.ChannelBookmark.Handle("", api.APISessionRequired(updateChannelBookmark)).Methods(http.MethodPatch)
api.BaseRoutes.ChannelBookmark.Handle("/sort_order", api.APISessionRequired(updateChannelBookmarkSortOrder)).Methods(http.MethodPost)
api.BaseRoutes.ChannelBookmark.Handle("", api.APISessionRequired(deleteChannelBookmark)).Methods(http.MethodDelete)
api.BaseRoutes.ChannelBookmarks.Handle("", api.APISessionRequired(listChannelBookmarksForChannel)).Methods(http.MethodGet)
}
api.BaseRoutes.ChannelBookmarks.Handle("", api.APISessionRequired(createChannelBookmark)).Methods(http.MethodPost)
api.BaseRoutes.ChannelBookmark.Handle("", api.APISessionRequired(updateChannelBookmark)).Methods(http.MethodPatch)
api.BaseRoutes.ChannelBookmark.Handle("/sort_order", api.APISessionRequired(updateChannelBookmarkSortOrder)).Methods(http.MethodPost)
api.BaseRoutes.ChannelBookmark.Handle("", api.APISessionRequired(deleteChannelBookmark)).Methods(http.MethodDelete)
api.BaseRoutes.ChannelBookmarks.Handle("", api.APISessionRequired(listChannelBookmarksForChannel)).Methods(http.MethodGet)
}
func createChannelBookmark(c *Context, w http.ResponseWriter, r *http.Request) {
server/public/model/feature_flags.go
-3
View File
@@ -49,8 +49,6 @@ type FeatureFlags struct {
CloudDedicatedExportUI bool
ChannelBookmarks bool
WebSocketEventScope bool
NotificationMonitoring bool
@@ -172,7 +170,6 @@ func (f *FeatureFlags) SetDefaults() {
f.MoveThreadsEnabled = false
f.StreamlinedMarketplace = true
f.CloudDedicatedExportUI = false
f.ChannelBookmarks = true
f.WebSocketEventScope = true
f.NotificationMonitoring = true
f.ExperimentalAuditSettingsSystemConsoleUI = true
webapp/channels/src/components/channel_bookmarks/utils.ts
+1 -7
View File
@@ -11,7 +11,7 @@ import type {GlobalState} from '@mattermost/types/store';
import {Permissions} from 'mattermost-redux/constants';
import {getChannelBookmarks} from 'mattermost-redux/selectors/entities/channel_bookmarks';
import {getChannel, getMyChannelMember} from 'mattermost-redux/selectors/entities/channels';
import {getConfig, getFeatureFlagValue, getLicense} from 'mattermost-redux/selectors/entities/general';
import {getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
import {haveIChannelPermission} from 'mattermost-redux/selectors/entities/roles';
import {insertWithoutDuplicates} from 'mattermost-redux/utils/array_utils';
import {getFileDownloadUrl} from 'mattermost-redux/utils/file_utils';
@@ -118,12 +118,6 @@ export const useCanGetLinkPreviews = () => {
};
export const getIsChannelBookmarksEnabled = (state: GlobalState) => {
const isEnabled = getFeatureFlagValue(state, 'ChannelBookmarks') === 'true';
if (!isEnabled) {
return false;
}
const license = getLicense(state);
return license?.IsLicensed === 'true';