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>
Этот коммит содержится в:
@@ -96,6 +96,7 @@ func testUploadFilesPost(
|
||||
blobs [][]byte,
|
||||
clientIds []string,
|
||||
useChunked bool,
|
||||
isBookmark bool,
|
||||
) (*model.FileUploadResponse, *model.Response, error) {
|
||||
// Do not check len(clientIds), leave it entirely to the user to
|
||||
// provide. The server will error out if it does not match the number
|
||||
@@ -120,6 +121,10 @@ func testUploadFilesPost(
|
||||
postURL += fmt.Sprintf("&client_id=%v", url.QueryEscape(clientIds[i]))
|
||||
}
|
||||
|
||||
if isBookmark {
|
||||
postURL += "&bookmark=true"
|
||||
}
|
||||
|
||||
fur, resp, err := testDoUploadFileRequest(t, c, postURL, blob, ct, cl)
|
||||
if err != nil {
|
||||
return nil, resp, err
|
||||
@@ -145,6 +150,7 @@ func testUploadFilesMultipart(
|
||||
names []string,
|
||||
blobs [][]byte,
|
||||
clientIds []string,
|
||||
isBookmark bool,
|
||||
) (
|
||||
*model.FileUploadResponse,
|
||||
*model.Response,
|
||||
@@ -185,7 +191,11 @@ func testUploadFilesMultipart(
|
||||
}
|
||||
|
||||
require.NoError(t, mw.Close())
|
||||
fur, resp, err := testDoUploadFileRequest(t, c, "", mwBody.Bytes(), mw.FormDataContentType(), -1)
|
||||
url := ""
|
||||
if isBookmark {
|
||||
url += "?bookmark=true"
|
||||
}
|
||||
fur, resp, err := testDoUploadFileRequest(t, c, url, mwBody.Bytes(), mw.FormDataContentType(), -1)
|
||||
if err != nil {
|
||||
return nil, resp, err
|
||||
}
|
||||
@@ -230,6 +240,7 @@ func TestUploadFiles(t *testing.T) {
|
||||
expectedImageMiniPreview []bool
|
||||
setupConfig func(a *app.App) func(a *app.App)
|
||||
checkResponse func(t testing.TB, resp *model.Response)
|
||||
uploadAsBookmark bool
|
||||
}{
|
||||
// Upload a bunch of files, mixed images and non-images
|
||||
{
|
||||
@@ -578,6 +589,20 @@ func TestUploadFiles(t *testing.T) {
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
title: "Bookmark images",
|
||||
names: []string{"orientation_test_5.jpeg"},
|
||||
expectedImageThumbnailNames: []string{"orientation_test_5_expected_thumb.jpeg"},
|
||||
expectedImagePreviewNames: []string{"orientation_test_5_expected_preview.jpeg"},
|
||||
channelId: channel.Id,
|
||||
expectImage: true,
|
||||
expectedCreatorId: model.BookmarkFileOwner,
|
||||
expectedImageWidths: []int{2860},
|
||||
expectedImageHeights: []int{1578},
|
||||
expectedImageHasPreview: []bool{true},
|
||||
expectedImageMiniPreview: []bool{true},
|
||||
uploadAsBookmark: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, useMultipart := range []bool{true, false} {
|
||||
@@ -627,9 +652,9 @@ func TestUploadFiles(t *testing.T) {
|
||||
var resp *model.Response
|
||||
var err error
|
||||
if useMultipart {
|
||||
fileResp, resp, err = testUploadFilesMultipart(t, client, channelId, tc.names, blobs, tc.clientIds)
|
||||
fileResp, resp, err = testUploadFilesMultipart(t, client, channelId, tc.names, blobs, tc.clientIds, tc.uploadAsBookmark)
|
||||
} else {
|
||||
fileResp, resp, err = testUploadFilesPost(t, client, channelId, tc.names, blobs, tc.clientIds, tc.useChunkedInSimplePost)
|
||||
fileResp, resp, err = testUploadFilesPost(t, client, channelId, tc.names, blobs, tc.clientIds, tc.useChunkedInSimplePost, tc.uploadAsBookmark)
|
||||
}
|
||||
|
||||
if tc.checkResponse != nil {
|
||||
@@ -672,6 +697,9 @@ func TestUploadFiles(t *testing.T) {
|
||||
ext := filepath.Ext(fname)
|
||||
name := fname[:len(fname)-len(ext)]
|
||||
expectedDir := fmt.Sprintf("%v/teams/%v/channels/%v/users/%s/%s", date, FileTeamId, channel.Id, ri.CreatorId, ri.Id)
|
||||
if tc.uploadAsBookmark {
|
||||
expectedDir = fmt.Sprintf("%v/teams/%v/channels/%v/%s", model.BookmarkFileOwner, FileTeamId, channel.Id, ri.Id)
|
||||
}
|
||||
expectedPath := fmt.Sprintf("%s/%s", expectedDir, fname)
|
||||
assert.Equal(t, dbInfo.Path, expectedPath,
|
||||
fmt.Sprintf("File %v saved to:%q, expected:%q", dbInfo.Name, dbInfo.Path, expectedPath))
|
||||
@@ -774,7 +802,7 @@ func TestGetFile(t *testing.T) {
|
||||
CheckUnauthorizedStatus(t, resp)
|
||||
|
||||
_, _, err = th.SystemAdminClient.GetFile(context.Background(), fileId)
|
||||
require.Error(t, err)
|
||||
require.NoError(t, err)
|
||||
CheckUnauthorizedStatus(t, resp)
|
||||
}
|
||||
|
||||
@@ -889,7 +917,7 @@ func TestGetFileThumbnail(t *testing.T) {
|
||||
|
||||
client.Logout(context.Background())
|
||||
_, _, err = th.SystemAdminClient.GetFileThumbnail(context.Background(), fileId)
|
||||
require.Error(t, err)
|
||||
require.NoError(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
}
|
||||
|
||||
@@ -1002,7 +1030,7 @@ func TestGetFilePreview(t *testing.T) {
|
||||
|
||||
client.Logout(context.Background())
|
||||
_, _, err = th.SystemAdminClient.GetFilePreview(context.Background(), fileId)
|
||||
require.Error(t, err)
|
||||
require.NoError(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
}
|
||||
|
||||
@@ -1027,7 +1055,6 @@ func TestGetFileInfo(t *testing.T) {
|
||||
info, _, err := client.GetFileInfo(context.Background(), fileId)
|
||||
require.NoError(t, err)
|
||||
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, fileId, info.Id, "got incorrect file")
|
||||
require.Equal(t, user.Id, info.CreatorId, "file should be assigned to user")
|
||||
require.Equal(t, "", info.PostId, "file shouldn't have a post")
|
||||
@@ -1057,7 +1084,7 @@ func TestGetFileInfo(t *testing.T) {
|
||||
|
||||
client.Logout(context.Background())
|
||||
_, _, err = th.SystemAdminClient.GetFileInfo(context.Background(), fileId)
|
||||
require.Error(t, err)
|
||||
require.NoError(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user