MM-53125 Add feature to convert group message to private channel (#24421)
* Added convert to channel menu item * WIP * refactored channel name input field and created conversion modal * style * style * WIP * wip * Created API to fetch common teams of GM members * Added UI for all members deactivated * Fetched common teams in client * WIP * Added a required attribute to DropdownInput component * Fixed a case with dropdown input required flag * WIP * API first draft * Genetayed layers and mocks * Fixed create channel bug * WIP * Added cache invalidation * Calling API from client * Updated API to accept name and display name as well * WIP * Moved converted GM to correct category * Style fixes * Added logic to move user to new team/channel after GM conversion * Prevented guest user from performing action * Added loading indicator * Added smoother height transistion when loading finishes * UI imporvements * WIP * Formatted GM conversion message on client side * lint fix * Moved convert option from sidebar menu to channel header menu * Some cleanup * Updated server layers * Fixed i18n * Fixed types * Fix server i18n * Fixed channel creation bug * Added store test for GetCommonTeamIDsForMultipleUsers * Server tests done * Updated snapshots * Updated layers * lint fix * Update tests * For CI * lint * restored debug code * Used user ID instead of username in channel conversion post * WIP * Review fixes * LInt fixes * Test fix * WIP * WIP * WIP * wip * Review fixes, lots of them * Review fix * Disabled WIP test * test * Cleanup * Test fix * removed testing line * Fixed incorrect default message * Review fixes * Fixes * lint and i18n fix * Setting category on server side * updated i18n * Updated tests * Added tests * Refs cleanup * added test --------- Co-authored-by: Harshil Sharma <harshilsharma@Harshils-MacBook-Pro.local>
Этот коммит содержится в:
Harshil Sharma
коммит произвёл
GitHub
GitHub
родитель
11cdd2b66b
Коммит
39d6cb8008
@@ -336,6 +336,20 @@ func (_m *ChannelStore) Delete(channelID string, timestamp int64) error {
|
||||
return r0
|
||||
}
|
||||
|
||||
// DeleteAllSidebarChannelForChannel provides a mock function with given fields: channelID
|
||||
func (_m *ChannelStore) DeleteAllSidebarChannelForChannel(channelID string) error {
|
||||
ret := _m.Called(channelID)
|
||||
|
||||
var r0 error
|
||||
if rf, ok := ret.Get(0).(func(string) error); ok {
|
||||
r0 = rf(channelID)
|
||||
} else {
|
||||
r0 = ret.Error(0)
|
||||
}
|
||||
|
||||
return r0
|
||||
}
|
||||
|
||||
// DeleteSidebarCategory provides a mock function with given fields: categoryID
|
||||
func (_m *ChannelStore) DeleteSidebarCategory(categoryID string) error {
|
||||
ret := _m.Called(categoryID)
|
||||
|
||||
@@ -419,6 +419,32 @@ func (_m *TeamStore) GetChannelUnreadsForTeam(teamID string, userID string) ([]*
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetCommonTeamIDsForMultipleUsers provides a mock function with given fields: userIDs
|
||||
func (_m *TeamStore) GetCommonTeamIDsForMultipleUsers(userIDs []string) ([]string, error) {
|
||||
ret := _m.Called(userIDs)
|
||||
|
||||
var r0 []string
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(0).(func([]string) ([]string, error)); ok {
|
||||
return rf(userIDs)
|
||||
}
|
||||
if rf, ok := ret.Get(0).(func([]string) []string); ok {
|
||||
r0 = rf(userIDs)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]string)
|
||||
}
|
||||
}
|
||||
|
||||
if rf, ok := ret.Get(1).(func([]string) error); ok {
|
||||
r1 = rf(userIDs)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetCommonTeamIDsForTwoUsers provides a mock function with given fields: userID, otherUserID
|
||||
func (_m *TeamStore) GetCommonTeamIDsForTwoUsers(userID string, otherUserID string) ([]string, error) {
|
||||
ret := _m.Called(userID, otherUserID)
|
||||
|
||||
@@ -73,6 +73,7 @@ func TestTeamStore(t *testing.T, ss store.Store) {
|
||||
t.Run("GetTeamMembersForExport", func(t *testing.T) { testTeamStoreGetTeamMembersForExport(t, ss) })
|
||||
t.Run("GetTeamsForUserWithPagination", func(t *testing.T) { testTeamMembersWithPagination(t, ss) })
|
||||
t.Run("GroupSyncedTeamCount", func(t *testing.T) { testGroupSyncedTeamCount(t, ss) })
|
||||
t.Run("GetCommonTeamIDsForMultipleUsers", func(t *testing.T) { testGetCommonTeamIDsForMultipleUsers(t, ss) })
|
||||
}
|
||||
|
||||
func testTeamStoreSave(t *testing.T, ss store.Store) {
|
||||
@@ -3618,3 +3619,203 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) {
|
||||
require.NoError(t, err)
|
||||
require.GreaterOrEqual(t, countAfter, count+1)
|
||||
}
|
||||
|
||||
func testGetCommonTeamIDsForMultipleUsers(t *testing.T, ss store.Store) {
|
||||
// Creating teams
|
||||
|
||||
// Team 1
|
||||
t1 := model.Team{}
|
||||
t1.DisplayName = "Team 1"
|
||||
t1.Name = NewTestId()
|
||||
t1.Email = MakeEmail()
|
||||
t1.Type = model.TeamOpen
|
||||
_, err := ss.Team().Save(&t1)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Team 2
|
||||
t2 := model.Team{}
|
||||
t2.DisplayName = "Team 2"
|
||||
t2.Name = NewTestId()
|
||||
t2.Email = MakeEmail()
|
||||
t2.Type = model.TeamOpen
|
||||
_, err = ss.Team().Save(&t2)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Team 3
|
||||
t3 := model.Team{}
|
||||
t3.DisplayName = "Team 3"
|
||||
t3.Name = NewTestId()
|
||||
t3.Email = MakeEmail()
|
||||
t3.Type = model.TeamOpen
|
||||
_, err = ss.Team().Save(&t3)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Creating users
|
||||
|
||||
// User 1
|
||||
u1 := model.User{}
|
||||
u1.Email = MakeEmail()
|
||||
u1.Nickname = NewTestId()
|
||||
_, err = ss.User().Save(&u1)
|
||||
require.NoError(t, err)
|
||||
|
||||
// User 2
|
||||
u2 := model.User{}
|
||||
u2.Email = MakeEmail()
|
||||
u2.Nickname = NewTestId()
|
||||
_, err = ss.User().Save(&u2)
|
||||
require.NoError(t, err)
|
||||
|
||||
t.Run("multiple common teams exist", func(t *testing.T) {
|
||||
// Add user 1 in team 1 and 2
|
||||
m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}
|
||||
m2 := &model.TeamMember{TeamId: t2.Id, UserId: u1.Id}
|
||||
|
||||
// Add user 2 in team1, 2 and 3
|
||||
m3 := &model.TeamMember{TeamId: t1.Id, UserId: u2.Id}
|
||||
m4 := &model.TeamMember{TeamId: t2.Id, UserId: u2.Id}
|
||||
m5 := &model.TeamMember{TeamId: t3.Id, UserId: u2.Id}
|
||||
|
||||
// Save team memberships
|
||||
_, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5}, -1)
|
||||
require.NoError(t, nErr)
|
||||
|
||||
// Find common teams between user 1 and user 2
|
||||
commonTeamIDs, err2 := ss.Team().GetCommonTeamIDsForMultipleUsers([]string{u1.Id, u2.Id})
|
||||
require.NoError(t, err2)
|
||||
require.Equal(t, 2, len(commonTeamIDs))
|
||||
require.Contains(t, commonTeamIDs, t1.Id)
|
||||
require.Contains(t, commonTeamIDs, t2.Id)
|
||||
|
||||
// cleanup
|
||||
err2 = ss.Team().RemoveAllMembersByUser(u1.Id)
|
||||
require.NoError(t, err2)
|
||||
|
||||
err2 = ss.Team().RemoveAllMembersByUser(u2.Id)
|
||||
require.NoError(t, err2)
|
||||
})
|
||||
|
||||
t.Run("single common teams exist", func(t *testing.T) {
|
||||
// Add user 1 in team 1 and 2
|
||||
m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}
|
||||
m2 := &model.TeamMember{TeamId: t2.Id, UserId: u1.Id}
|
||||
|
||||
// Add user 2 in team1, 2 and 3
|
||||
m3 := &model.TeamMember{TeamId: t1.Id, UserId: u2.Id}
|
||||
m5 := &model.TeamMember{TeamId: t3.Id, UserId: u2.Id}
|
||||
|
||||
// Save team memberships
|
||||
_, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m5}, -1)
|
||||
require.NoError(t, nErr)
|
||||
|
||||
// Find common teams between user 1 and user 2
|
||||
commonTeamIDs, err2 := ss.Team().GetCommonTeamIDsForMultipleUsers([]string{u1.Id, u2.Id})
|
||||
require.NoError(t, err2)
|
||||
require.Equal(t, 1, len(commonTeamIDs))
|
||||
require.Contains(t, commonTeamIDs, t1.Id)
|
||||
|
||||
// cleanup
|
||||
err2 = ss.Team().RemoveAllMembersByUser(u1.Id)
|
||||
require.NoError(t, err2)
|
||||
|
||||
err2 = ss.Team().RemoveAllMembersByUser(u2.Id)
|
||||
require.NoError(t, err2)
|
||||
})
|
||||
|
||||
t.Run("no common teams exist", func(t *testing.T) {
|
||||
// Add user 1 in team 1 and 2
|
||||
m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}
|
||||
|
||||
// Add user 2 in team1, 2 and 3
|
||||
m4 := &model.TeamMember{TeamId: t2.Id, UserId: u2.Id}
|
||||
m5 := &model.TeamMember{TeamId: t3.Id, UserId: u2.Id}
|
||||
|
||||
// Save team memberships
|
||||
_, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m4, m5}, -1)
|
||||
require.NoError(t, nErr)
|
||||
|
||||
// Find common teams between user 1 and user 2
|
||||
commonTeamIDs, err2 := ss.Team().GetCommonTeamIDsForMultipleUsers([]string{u1.Id, u2.Id})
|
||||
require.NoError(t, err2)
|
||||
require.Equal(t, 0, len(commonTeamIDs))
|
||||
|
||||
// cleanup
|
||||
err2 = ss.Team().RemoveAllMembersByUser(u1.Id)
|
||||
require.NoError(t, err2)
|
||||
|
||||
err2 = ss.Team().RemoveAllMembersByUser(u2.Id)
|
||||
require.NoError(t, err2)
|
||||
})
|
||||
|
||||
t.Run("some user have no team members", func(t *testing.T) {
|
||||
// Add user 1 in team 1 and 2
|
||||
m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}
|
||||
m2 := &model.TeamMember{TeamId: t2.Id, UserId: u1.Id}
|
||||
|
||||
// We'll leave user 2 without any team
|
||||
|
||||
// Save team memberships
|
||||
_, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1)
|
||||
require.NoError(t, nErr)
|
||||
|
||||
// Find common teams between user 1 and user 2
|
||||
commonTeamIDs, err2 := ss.Team().GetCommonTeamIDsForMultipleUsers([]string{u1.Id, u2.Id})
|
||||
require.NoError(t, err2)
|
||||
require.Equal(t, 0, len(commonTeamIDs))
|
||||
|
||||
// cleanup
|
||||
err2 = ss.Team().RemoveAllMembersByUser(u1.Id)
|
||||
require.NoError(t, err2)
|
||||
})
|
||||
|
||||
t.Run("more than two users, common teams exist", func(t *testing.T) {
|
||||
// User 3
|
||||
u3 := model.User{}
|
||||
u3.Email = MakeEmail()
|
||||
u3.Nickname = NewTestId()
|
||||
_, err = ss.User().Save(&u3)
|
||||
require.NoError(t, err)
|
||||
|
||||
// User 4
|
||||
u4 := model.User{}
|
||||
u4.Email = MakeEmail()
|
||||
u4.Nickname = NewTestId()
|
||||
_, err = ss.User().Save(&u4)
|
||||
require.NoError(t, err)
|
||||
|
||||
// Add user 1 in team 1 and 2
|
||||
m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}
|
||||
m2 := &model.TeamMember{TeamId: t2.Id, UserId: u1.Id}
|
||||
|
||||
// Add user 2 in team1, 2 and 3
|
||||
m3 := &model.TeamMember{TeamId: t1.Id, UserId: u2.Id}
|
||||
m4 := &model.TeamMember{TeamId: t2.Id, UserId: u2.Id}
|
||||
m5 := &model.TeamMember{TeamId: t3.Id, UserId: u2.Id}
|
||||
|
||||
// Add user 3 in team 1 and 2
|
||||
m6 := &model.TeamMember{TeamId: t1.Id, UserId: u3.Id}
|
||||
m7 := &model.TeamMember{TeamId: t2.Id, UserId: u3.Id}
|
||||
|
||||
// Add user 4 in team 1 and 2
|
||||
m8 := &model.TeamMember{TeamId: t1.Id, UserId: u4.Id}
|
||||
m9 := &model.TeamMember{TeamId: t2.Id, UserId: u4.Id}
|
||||
|
||||
// Save team memberships
|
||||
_, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5, m6, m7, m8, m9}, -1)
|
||||
require.NoError(t, nErr)
|
||||
|
||||
// Find common teams between user 1 and user 2
|
||||
commonTeamIDs, err := ss.Team().GetCommonTeamIDsForMultipleUsers([]string{u1.Id, u2.Id, u3.Id, u4.Id})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, 2, len(commonTeamIDs))
|
||||
require.Contains(t, commonTeamIDs, t1.Id)
|
||||
require.Contains(t, commonTeamIDs, t2.Id)
|
||||
|
||||
// cleanup
|
||||
err = ss.Team().RemoveAllMembersByUser(u1.Id)
|
||||
require.NoError(t, err)
|
||||
|
||||
err = ss.Team().RemoveAllMembersByUser(u2.Id)
|
||||
require.NoError(t, err)
|
||||
})
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user