[MM-52969] Revert "MM-51482_Create Apps Category and link to bots DM (#22918)" (#23647)

* Revert "MM-51482_Create Apps Category and link to bots DM (#22918)"

This reverts commit 1051925eec.

* Revert "MM-51711_Feature flag: APPS sidebar category (#22766)"

This reverts commit 9156205178.

server/public/model/channel_sidebar.go

@@ -13,12 +13,11 @@ type SidebarCategoryType string
 type SidebarCategorySorting string
 
 const (
-	// Each sidebar category has a 'type'. System categories are Channels, Favorites, DMs and Apps
+	// Each sidebar category has a 'type'. System categories are Channels, Favorites and DMs
 	// All user-created categories will have type Custom
 	SidebarCategoryChannels       SidebarCategoryType = "channels"
 	SidebarCategoryDirectMessages SidebarCategoryType = "direct_messages"
 	SidebarCategoryFavorites      SidebarCategoryType = "favorites"
-	SidebarCategoryApps           SidebarCategoryType = "apps"
 	SidebarCategoryCustom         SidebarCategoryType = "custom"
 	// Increment to use when adding/reordering things in the sidebar
 	MinimalSidebarSortDistance = 10
@@ -26,7 +25,6 @@ const (
 	DefaultSidebarSortOrderFavorites = 0
 	DefaultSidebarSortOrderChannels  = DefaultSidebarSortOrderFavorites + MinimalSidebarSortDistance
 	DefaultSidebarSortOrderDMs       = DefaultSidebarSortOrderChannels + MinimalSidebarSortDistance
-	DefaultSidebarSortOrderApps      = DefaultSidebarSortOrderDMs + MinimalSidebarSortDistance
 	// Sorting modes
 	// default for all categories except DMs (behaves like manual)
 	SidebarCategorySortDefault SidebarCategorySorting = ""
@@ -38,13 +36,6 @@ const (
 	SidebarCategorySortAlphabetical SidebarCategorySorting = "alpha"
 )
 
-var SystemSidebarCategories = []SidebarCategoryType{
-	SidebarCategoryChannels,
-	SidebarCategoryDirectMessages,
-	SidebarCategoryFavorites,
-	SidebarCategoryApps,
-}
-
 // SidebarCategory represents the corresponding DB table
 type SidebarCategory struct {
 	Id          string                 `json:"id"`
@@ -86,7 +77,7 @@ type SidebarChannel struct {
 type SidebarChannels []*SidebarChannel
 type SidebarCategoriesWithChannels []*SidebarCategoryWithChannels
 
-var categoryIdPattern = regexp.MustCompile("(favorites|channels|direct_messages|apps)_[a-z0-9]{26}_[a-z0-9]{26}")
+var categoryIdPattern = regexp.MustCompile("(favorites|channels|direct_messages)_[a-z0-9]{26}_[a-z0-9]{26}")
 
 func IsValidCategoryId(s string) bool {
 	// Category IDs can either be regular IDs

server/public/model/feature_flags.go

@@ -75,8 +75,6 @@ type FeatureFlags struct {
 
 	DeprecateCloudFree bool
 
-	AppsSidebarCategory bool
-
 	CloudReverseTrial bool
 }
 
@@ -106,7 +104,6 @@ func (f *FeatureFlags) SetDefaults() {
 	f.WysiwygEditor = false
 	f.OnboardingAutoShowLinkedBoard = false
 	f.OnboardingTourTips = true
-	f.AppsSidebarCategory = false
 	f.CloudReverseTrial = false
 }