mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

MM-27007 Remove automatic sidebar migration (#15087)

Просмотр исходного кода 
* MM-27007 Add migration of favorited channels to CreateInitialSidebarCategories

* MM-27007 Rewrite migrateFavortitesToSidebarT to use ROW_NUMBER() when available

* MM-27007 Remove automatic sidebar migration

* Remove old i18n strings

* Fix typo

* Address feedback

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Harrison Healey
2020-07-23 19:54:29 -04:00
коммит произвёл GitHub
родитель ed34468996
Коммит 504f45b6ec
12 изменённых файлов: 279 добавлений и 449 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

46
store/storetest/mocks/ChannelStore.go
Просмотреть файл

@@ -1424,29 +1424,6 @@ func (_m *ChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId s
return r0, r1
}
// MigrateFavoritesToSidebarChannels provides a mock function with given fields: lastUserId, runningOrder
func (_m *ChannelStore) MigrateFavoritesToSidebarChannels(lastUserId string, runningOrder int64) (map[string]interface{}, error) {
ret := _m.Called(lastUserId, runningOrder)
var r0 map[string]interface{}
if rf, ok := ret.Get(0).(func(string, int64) map[string]interface{}); ok {
r0 = rf(lastUserId, runningOrder)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(map[string]interface{})
}
}
var r1 error
if rf, ok := ret.Get(1).(func(string, int64) error); ok {
r1 = rf(lastUserId, runningOrder)
} else {
r1 = ret.Error(1)
}
return r0, r1
}
// MigratePublicChannels provides a mock function with given fields:
func (_m *ChannelStore) MigratePublicChannels() error {
ret := _m.Called()
@@ -1461,29 +1438,6 @@ func (_m *ChannelStore) MigratePublicChannels() error {
return r0
}
// MigrateSidebarCategories provides a mock function with given fields: fromTeamId, fromUserId
func (_m *ChannelStore) MigrateSidebarCategories(fromTeamId string, fromUserId string) (map[string]interface{}, error) {
ret := _m.Called(fromTeamId, fromUserId)
var r0 map[string]interface{}
if rf, ok := ret.Get(0).(func(string, string) map[string]interface{}); ok {
r0 = rf(fromTeamId, fromUserId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(map[string]interface{})
}
}
var r1 error
if rf, ok := ret.Get(1).(func(string, string) error); ok {
r1 = rf(fromTeamId, fromUserId)
} else {
r1 = ret.Error(1)
}
return r0, r1
}
// PermanentDelete provides a mock function with given fields: channelId
func (_m *ChannelStore) PermanentDelete(channelId string) error {
ret := _m.Called(channelId)

12
store/storetest/mocks/CommandWebhookStore.go
Просмотреть файл

@@ -36,9 +36,7 @@ func (_m *CommandWebhookStore) Get(id string) (*model.CommandWebhook, error) {
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(id)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(error)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -61,9 +59,7 @@ func (_m *CommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.Comma
if rf, ok := ret.Get(1).(func(*model.CommandWebhook) error); ok {
r1 = rf(webhook)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(error)
}
r1 = ret.Error(1)
}
return r0, r1
@@ -77,9 +73,7 @@ func (_m *CommandWebhookStore) TryUse(id string, limit int) error {
if rf, ok := ret.Get(0).(func(string, int) error); ok {
r0 = rf(id, limit)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(error)
}
r0 = ret.Error(0)
}
return r0