Channel Bookmarks (#25449)
* create ChannelBookmarks table * ChannelBookmark model * channel bookamrks Store layer * add GetBookmarksForAllChannelByIdSince * add channel bookmarks to test store * Add channel bookmarks to app layer * remove index for createAt in channel bookmarks migrations * remove createAt from select channel bookmark query and enable store delete bookmark test * update reponse of UpdateBookmark * rename db migration files * channel bookmarks store update sort order * channel bookmarks app layer update sort order * fix lint & tests * Fix lint and introduce util functions to insert / remove from slice * remove model etag * i18n * defer remove file info after test run * Fix tests passing the request context * fix migrations * fix TestRetry * Add bookmark permissions (#25560) * Adds channel bookmarks permissions * Fix linter * Remove unnecessary empty lines * Remove scss change as it's not necessary anymore * Fix mock store * Fix mock store and add role entry * Fix test * Adds cypress test and update permissions migration to update admin roles * Adds channel bookmarks roles to default admin roles * Adds bookmark permissions to default role permissions constant in webapp * Update mmctl test * Update permission test after normalising the roles * fix store tests * fix app layer tests * Add new bookmark endpoint (#25624) * Adds channel bookmarks api scaffold and create endpoint * Applies review comments to the API docs * Adds websocket test to create channel bookmark --------- Co-authored-by: Mattermost Build <build@mattermost.com> * MM-54426 exclude Channel Bookmarks files from data retention (#25656) * Augment channel APIs to include bookmarks (#25567) * update files docs for server 9.4 * Adds update channel bookmark endpoint (#25653) * Adds update channel bookmark sort order endpoint (#25686) * Adds update channel bookmark endpoint * Updates edit app method to return the right deleted bookmark and adds tests * Adds the update channel bookmark sort order endpoint * Fix repeated test after merge * Assign right permissions to each test * Update store and app layer to return specific errors and add tests * Adds delete channel bookmark endpoint (#25693) * Updates edit app method to return the right deleted bookmark and adds tests * Fix repeated test after merge * Updates edit app method to return the right deleted bookmark and adds tests * Adds delete channel bookmark endpoint * Adds list channel bookmarks endpoint (#25700) * Add channel moderation to bookmarks (#25716) * fix migrations index * fix getChannelsForTeamForUser * fix getChannelsForTeamForUser * fix bad merge client4 * fix file api with bookmark permission * add ChannelBookmarks feature flag * add missing translations * Set DB column for type as enum * use custom type for bookmark query using sqlx * use transaction when saving bookmark * return NewErrNotFound instead of Sql.ErrNoRows * use squirrel for IN query * add a limit of 1K for records in GetBookmarksForAllChannelByIdSince * UpdateSortOrder with one single query instead of multiple updates * fix shadow declaration * fix channel bookmarks permission string definition in admin console * fix another shadow declaration * Fix model conversion * add SplitSliceInChunks * remove include bookmarks in channels api * Cap amount of bookmarks per channel * add etag back to get channels * feedback review * update file info when replacing a bookmark file * return 501 not implemented when the license is not available * add detail message when getting channel member on bookmark api * start audit before permission check on create bookmark api * use require.Eventuallyf for testing WS events * remove unnecessary log in app layer * use require instead of assert to avoid panics * enforce limit when querying bookmarks since * prevent to create/update bookmark if file is already attached * fix lint * delete file when a bookmark is deleted * Dot allow to set a fileId and a url at the same time to a bookmark * fix query to delete a file that belongs to a bookmark * do not patch the bookmark type * Server side FeatureFlag check (#26145) * use ff in server, set ff to false * turn on FF for unit tests * defer unset FF for unit tests * turn ff on for testing * only allow attaching files that were uploaded for bookmark * Set feature flag off as default * fix lint * update email templates as PR failed * revert templates * force the assignment of ID when creating a bookmark * Fix unit tests --------- Co-authored-by: Miguel de la Cruz <miguel@mcrx.me> Co-authored-by: Mattermost Build <build@mattermost.com> Co-authored-by: Caleb Roseland <caleb@calebroseland.com> Co-authored-by: Scott Bishel <scott.bishel@mattermost.com>
Этот коммит содержится в:
Elias Nahum
@@ -4230,9 +4230,9 @@ func TestGetChannelModerations(t *testing.T) {
|
||||
t.Run("Returns default moderations with default roles", func(t *testing.T) {
|
||||
moderations, _, err := th.SystemAdminClient.GetChannelModerations(context.Background(), channel.Id, "")
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, len(moderations), 4)
|
||||
require.Equal(t, len(moderations), 5)
|
||||
for _, moderation := range moderations {
|
||||
if moderation.Name == "manage_members" {
|
||||
if moderation.Name == "manage_members" || moderation.Name == "manage_bookmarks" {
|
||||
require.Empty(t, moderation.Roles.Guests)
|
||||
} else {
|
||||
require.Equal(t, moderation.Roles.Guests.Value, true)
|
||||
@@ -4320,7 +4320,7 @@ func TestGetChannelModerations(t *testing.T) {
|
||||
require.Nil(t, appErr)
|
||||
|
||||
th.RemovePermissionFromRole(model.PermissionManagePublicChannelMembers.Id, scheme.DefaultChannelUserRole)
|
||||
defer th.AddPermissionToRole(model.PermissionCreatePost.Id, scheme.DefaultChannelUserRole)
|
||||
defer th.AddPermissionToRole(model.PermissionManagePublicChannelMembers.Id, scheme.DefaultChannelUserRole)
|
||||
|
||||
// public channel does not have the permission
|
||||
moderations, _, err := th.SystemAdminClient.GetChannelModerations(context.Background(), channel.Id, "")
|
||||
@@ -4341,6 +4341,48 @@ func TestGetChannelModerations(t *testing.T) {
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("Returns the correct value for manage_bookmarks depending on whether the channel is public or private", func(t *testing.T) {
|
||||
scheme := th.SetupTeamScheme()
|
||||
team.SchemeId = &scheme.Id
|
||||
_, appErr := th.App.UpdateTeamScheme(team)
|
||||
require.Nil(t, appErr)
|
||||
|
||||
bookmarkPublicPermissions := []string{
|
||||
model.PermissionAddBookmarkPublicChannel.Id,
|
||||
model.PermissionEditBookmarkPublicChannel.Id,
|
||||
model.PermissionDeleteBookmarkPublicChannel.Id,
|
||||
model.PermissionOrderBookmarkPublicChannel.Id,
|
||||
}
|
||||
|
||||
for _, p := range bookmarkPublicPermissions {
|
||||
th.RemovePermissionFromRole(p, scheme.DefaultChannelUserRole)
|
||||
}
|
||||
|
||||
defer func() {
|
||||
for _, p := range bookmarkPublicPermissions {
|
||||
th.AddPermissionToRole(p, scheme.DefaultChannelUserRole)
|
||||
}
|
||||
}()
|
||||
|
||||
// public channel does not have the permissions
|
||||
moderations, _, err := th.SystemAdminClient.GetChannelModerations(context.Background(), channel.Id, "")
|
||||
require.NoError(t, err)
|
||||
for _, moderation := range moderations {
|
||||
if moderation.Name == "manage_bookmarks" {
|
||||
require.Equal(t, moderation.Roles.Members.Value, false)
|
||||
}
|
||||
}
|
||||
|
||||
// private channel does have the permissions
|
||||
moderations, _, err = th.SystemAdminClient.GetChannelModerations(context.Background(), th.BasicPrivateChannel.Id, "")
|
||||
require.NoError(t, err)
|
||||
for _, moderation := range moderations {
|
||||
if moderation.Name == "manage_bookmarks" {
|
||||
require.Equal(t, moderation.Roles.Members.Value, true)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("Does not return an error if the team scheme has a blank DefaultChannelGuestRole field", func(t *testing.T) {
|
||||
scheme := th.SetupTeamScheme()
|
||||
scheme.DefaultChannelGuestRole = ""
|
||||
@@ -4405,9 +4447,9 @@ func TestPatchChannelModerations(t *testing.T) {
|
||||
t.Run("Returns default moderations with empty patch", func(t *testing.T) {
|
||||
moderations, _, err := th.SystemAdminClient.PatchChannelModerations(context.Background(), channel.Id, emptyPatch)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, len(moderations), 4)
|
||||
require.Equal(t, len(moderations), 5)
|
||||
for _, moderation := range moderations {
|
||||
if moderation.Name == "manage_members" {
|
||||
if moderation.Name == "manage_members" || moderation.Name == "manage_bookmarks" {
|
||||
require.Empty(t, moderation.Roles.Guests)
|
||||
} else {
|
||||
require.Equal(t, moderation.Roles.Guests.Value, true)
|
||||
@@ -4431,9 +4473,9 @@ func TestPatchChannelModerations(t *testing.T) {
|
||||
|
||||
moderations, _, err := th.SystemAdminClient.PatchChannelModerations(context.Background(), channel.Id, patch)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, len(moderations), 4)
|
||||
require.Equal(t, len(moderations), 5)
|
||||
for _, moderation := range moderations {
|
||||
if moderation.Name == "manage_members" {
|
||||
if moderation.Name == "manage_members" || moderation.Name == "manage_bookmarks" {
|
||||
require.Empty(t, moderation.Roles.Guests)
|
||||
} else {
|
||||
require.Equal(t, moderation.Roles.Guests.Value, true)
|
||||
@@ -4468,9 +4510,9 @@ func TestPatchChannelModerations(t *testing.T) {
|
||||
|
||||
moderations, _, err := th.SystemAdminClient.PatchChannelModerations(context.Background(), channel.Id, patch)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, len(moderations), 4)
|
||||
require.Equal(t, len(moderations), 5)
|
||||
for _, moderation := range moderations {
|
||||
if moderation.Name == "manage_members" {
|
||||
if moderation.Name == "manage_members" || moderation.Name == "manage_bookmarks" {
|
||||
require.Empty(t, moderation.Roles.Guests)
|
||||
} else {
|
||||
require.Equal(t, moderation.Roles.Guests.Value, true)
|
||||
@@ -4523,9 +4565,9 @@ func TestPatchChannelModerations(t *testing.T) {
|
||||
|
||||
moderations, _, err := th.SystemAdminClient.PatchChannelModerations(context.Background(), channel.Id, emptyPatch)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, len(moderations), 4)
|
||||
require.Equal(t, len(moderations), 5)
|
||||
for _, moderation := range moderations {
|
||||
if moderation.Name == "manage_members" {
|
||||
if moderation.Name == "manage_members" || moderation.Name == "manage_bookmarks" {
|
||||
require.Empty(t, moderation.Roles.Guests)
|
||||
} else {
|
||||
require.Equal(t, moderation.Roles.Guests.Value, false)
|
||||
@@ -4545,9 +4587,9 @@ func TestPatchChannelModerations(t *testing.T) {
|
||||
|
||||
moderations, _, err = th.SystemAdminClient.PatchChannelModerations(context.Background(), channel.Id, patch)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, len(moderations), 4)
|
||||
require.Equal(t, len(moderations), 5)
|
||||
for _, moderation := range moderations {
|
||||
if moderation.Name == "manage_members" {
|
||||
if moderation.Name == "manage_members" || moderation.Name == "manage_bookmarks" {
|
||||
require.Empty(t, moderation.Roles.Guests)
|
||||
} else {
|
||||
require.Equal(t, moderation.Roles.Guests.Value, false)
|
||||
|
||||
Ссылка в новой задаче
Block a user