* parent 48256721c4 (#14358)
author Eli Yukelzon <reflog@gmail.com> 1585814774 +0300
committer Eli Yukelzon <reflog@gmail.com> 1589111022 +0300
Sidebar caregories implemented
Apply suggestions from code review
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Update store/sqlstore/channel_store.go
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Update store/sqlstore/channel_store.go
Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
code review suggestions
status messages
edge case
bugs...
timeout reverse
* MM-25126 Add a separate default sorting method for categories (#14575)
* MM-25158 Add user to initial sidebar categories when joining team (#14570)
* MM-25281 Place new categories in the correct position (#14609)
* MM-25277 Return channels that aren't in a category as part of the Channels/Direct Messages categories (#14601)
* MM-25276 Remove categories when leaving a team (#14600)
* Remove categories when leaving a team
* layers
* corrected cleanup function
* lint
* .
* corrected errors in postgres
* .
* MM-25280 Ensure that the "update category order" API call only contains real category IDs and isn't missing any IDs (#14626)
* Ensure that the "update category order" API call only contains real category IDs and isn't missing any IDs
* tests
* correct status code
* MM-25278 Change "update category" API to return 400 when changing unsupported fields (#14599)
* MM-25279 Change category migration to only populate channels in Favorites (#14627)
* MM-25157 Add API to delete custom categories (#14574)
* MM-25157 Add API to delete custom categories
* get categories fix
* maxorder fix
* Use correct websocket event when deleting category
* Fix tests and remove debug code
* Actually use the right websocket event this time
* test cleanup
* Update test for new category order
Co-authored-by: Eli Yukelzon <reflog@gmail.com>
* MM-24914 Various fixes for sidebar channel handling (#14756)
* Fix checking for channel membership when reordering channels
* Remove unique constraint on SidebarCategories
* Set column sizes for SidebarCategories and SidebarChannels tables
* Allow changing the sorting method for non-DM categories
* Fix nil pointers in error handling
* Fix orphaned channels from other team being returned in Channels category
* Fix non-orphaned channels being duplicated in the Channels category
* Remove unique constraint on SidebarChannels
* Fix category/name of favorites preferences
* Fix testSidebarChannelsMigration
* Rename err to nErr and appErr to err
* Fix channel order returned by GetSidebarCategories on MySQL
* Fix adding/removing favorites preferences
* Remove leftover TODO
* Change SidebarCategoryType enums to use full names (#14786)
* Change SidebarCategoryType enums to use full names
* Fix Channels constant
* Remove leftover debug code
* MM-24914 Fix updateCategory endpoint returning the wrong type (#14795)
* MM-24914 Make some changes to UpdateSidebarCategories (#14806)
* Fix orphaned DMs not always being returned
* MM-24914 Make some changes to UpdateSidebarCategories
* Run updateSidebarCategoryOrderT in a transaction
* Fix deleting SidebarChannels based on order of arguments to UpdateSidebarCategories
* bump for api testing
* bump for api testing
* Change CreateInitialSidebarCategories to return a plain error
* Change MigrateSidebarCategories to return a plain error
* Remove usage of UpdateColumns when updating sidebar categories (#14843)
* Remove usage of UpdateColumns when changing category order
* Add a random test case
* Remove usage of UpdateColumns when updating sidebar categories (#14843)
* Remove usage of UpdateColumns when changing category order
* Add a random test case
* Remove usage of UpdateColumns when updating sidebar categories (#14843)
* Remove usage of UpdateColumns when changing category order
* Add a random test case
* MM-26343 Make CreateInitialSidebarCategories idempotent (#14870)
* Fix bad merge
* Fix another bad merge
* Fix unintentionally removed i18n string
Co-authored-by: Eli Yukelzon <reflog@gmail.com>
112 строки
3.6 KiB
Go
112 строки
3.6 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
)
|
|
|
|
type SidebarCategoryType string
|
|
type SidebarCategorySorting string
|
|
|
|
const (
|
|
// 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"
|
|
SidebarCategoryCustom SidebarCategoryType = "custom"
|
|
// Increment to use when adding/reordering things in the sidebar
|
|
MinimalSidebarSortDistance = 10
|
|
// Default Sort Orders for categories
|
|
DefaultSidebarSortOrderFavorites = 0
|
|
DefaultSidebarSortOrderChannels = DefaultSidebarSortOrderFavorites + MinimalSidebarSortDistance
|
|
DefaultSidebarSortOrderDMs = DefaultSidebarSortOrderChannels + MinimalSidebarSortDistance
|
|
// Sorting modes
|
|
// default for all categories except DMs (behaves like manual)
|
|
SidebarCategorySortDefault SidebarCategorySorting = ""
|
|
// sort manually
|
|
SidebarCategorySortManual SidebarCategorySorting = "manual"
|
|
// sort by recency (default for DMs)
|
|
SidebarCategorySortRecent SidebarCategorySorting = "recent"
|
|
// sort by display name alphabetically
|
|
SidebarCategorySortAlphabetical SidebarCategorySorting = "alpha"
|
|
)
|
|
|
|
// SidebarCategory represents the corresponding DB table
|
|
// SortOrder is never returned to the user and only used for queries
|
|
type SidebarCategory struct {
|
|
Id string `json:"id"`
|
|
UserId string `json:"user_id"`
|
|
TeamId string `json:"team_id"`
|
|
SortOrder int64 `json:"-"`
|
|
Sorting SidebarCategorySorting `json:"sorting"`
|
|
Type SidebarCategoryType `json:"type"`
|
|
DisplayName string `json:"display_name"`
|
|
}
|
|
|
|
// SidebarCategoryWithChannels combines data from SidebarCategory table with the Channel IDs that belong to that category
|
|
type SidebarCategoryWithChannels struct {
|
|
SidebarCategory
|
|
Channels []string `json:"channel_ids"`
|
|
}
|
|
|
|
type SidebarCategoryOrder []string
|
|
|
|
// OrderedSidebarCategories combines categories, their channel IDs and an array of Category IDs, sorted
|
|
type OrderedSidebarCategories struct {
|
|
Categories SidebarCategoriesWithChannels `json:"categories"`
|
|
Order SidebarCategoryOrder `json:"order"`
|
|
}
|
|
|
|
type SidebarChannel struct {
|
|
ChannelId string `json:"channel_id"`
|
|
UserId string `json:"user_id"`
|
|
CategoryId string `json:"category_id"`
|
|
SortOrder int64 `json:"-"`
|
|
}
|
|
|
|
type SidebarChannels []*SidebarChannel
|
|
type SidebarCategoriesWithChannels []*SidebarCategoryWithChannels
|
|
|
|
func SidebarCategoryFromJson(data io.Reader) (*SidebarCategoryWithChannels, error) {
|
|
var o *SidebarCategoryWithChannels
|
|
err := json.NewDecoder(data).Decode(&o)
|
|
return o, err
|
|
}
|
|
|
|
func SidebarCategoriesFromJson(data io.Reader) ([]*SidebarCategoryWithChannels, error) {
|
|
var o []*SidebarCategoryWithChannels
|
|
err := json.NewDecoder(data).Decode(&o)
|
|
return o, err
|
|
}
|
|
|
|
func OrderedSidebarCategoriesFromJson(data io.Reader) (*OrderedSidebarCategories, error) {
|
|
var o *OrderedSidebarCategories
|
|
err := json.NewDecoder(data).Decode(&o)
|
|
return o, err
|
|
}
|
|
|
|
func (o SidebarCategoryWithChannels) ToJson() []byte {
|
|
b, _ := json.Marshal(o)
|
|
return b
|
|
}
|
|
|
|
func SidebarCategoriesWithChannelsToJson(o []*SidebarCategoryWithChannels) []byte {
|
|
if b, err := json.Marshal(o); err != nil {
|
|
return []byte("[]")
|
|
} else {
|
|
return b
|
|
}
|
|
}
|
|
|
|
func (o OrderedSidebarCategories) ToJson() []byte {
|
|
if b, err := json.Marshal(o); err != nil {
|
|
return []byte("[]")
|
|
} else {
|
|
return b
|
|
}
|
|
}
|