* 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
2024-03-12 22:36:05 +08:00
коммит произвёл GitHub
родитель 2480a6c646
Коммит 7e9cd04a8b
66 изменённых файлов: 6578 добавлений и 57 удалений

Просмотреть файл

@@ -231,6 +231,58 @@
"id": "api.channel.add_user_to_channel.type.app_error",
"translation": "Can not add user to this channel type."
},
{
"id": "api.channel.bookmark.channel_bookmark.license.error",
"translation": "Your license does not support channel bookmarks."
},
{
"id": "api.channel.bookmark.create_channel_bookmark.direct_or_group_channels.forbidden.app_error",
"translation": "User is not allowed to create a channel bookmark."
},
{
"id": "api.channel.bookmark.create_channel_bookmark.direct_or_group_channels_by_guests.forbidden.app_error",
"translation": "Failed to create the channel bookmark."
},
{
"id": "api.channel.bookmark.create_channel_bookmark.forbidden.app_error",
"translation": "Failed to create the channel bookmark."
},
{
"id": "api.channel.bookmark.delete_channel_bookmark.direct_or_group_channels.forbidden.app_error",
"translation": "Failed to delete the channel bookmark."
},
{
"id": "api.channel.bookmark.delete_channel_bookmark.direct_or_group_channels_by_guests.forbidden.app_error",
"translation": "Failed to delete the channel bookmark."
},
{
"id": "api.channel.bookmark.delete_channel_bookmark.forbidden.app_error",
"translation": "Failed to delete the channel bookmark."
},
{
"id": "api.channel.bookmark.update_channel_bookmark.direct_or_group_channels.forbidden.app_error",
"translation": "Failed to update the channel bookmark."
},
{
"id": "api.channel.bookmark.update_channel_bookmark.direct_or_group_channels_by_guests.forbidden.app_error",
"translation": "Failed to update the channel bookmark."
},
{
"id": "api.channel.bookmark.update_channel_bookmark.forbidden.app_error",
"translation": "Failed to update the channel bookmark."
},
{
"id": "api.channel.bookmark.update_channel_bookmark_sort_order.direct_or_group_channels.forbidden.app_error",
"translation": "Failed to update the channel bookmark's sort order."
},
{
"id": "api.channel.bookmark.update_channel_bookmark_sort_order.direct_or_group_channels_by_guests.forbidden.app_error",
"translation": "Failed to update the channel bookmark's sort order."
},
{
"id": "api.channel.bookmark.update_channel_bookmark_sort_order.forbidden.app_error",
"translation": "Failed to update the channel bookmark's sort order."
},
{
"id": "api.channel.change_channel_privacy.private_to_public",
"translation": "This channel has been converted to a Public Channel and can be joined by any team member."
@@ -4638,6 +4690,38 @@
"id": "app.channel.autofollow.app_error",
"translation": "Failed to update thread membership for mentioned user"
},
{
"id": "app.channel.bookmark.delete.app_error",
"translation": "Could not delete bookmark."
},
{
"id": "app.channel.bookmark.get.app_error",
"translation": "Could not get bookmark."
},
{
"id": "app.channel.bookmark.get_existing.app_err",
"translation": "Could not get existing bookmark to update."
},
{
"id": "app.channel.bookmark.save.app_error",
"translation": "Could not save bookmark."
},
{
"id": "app.channel.bookmark.update.app_error",
"translation": "Could not update bookmark."
},
{
"id": "app.channel.bookmark.update_sort.app_error",
"translation": "Could not sort the bookmark."
},
{
"id": "app.channel.bookmark.update_sort.invalid_input.app_error",
"translation": "Could not sort the bookmark. Invalid input."
},
{
"id": "app.channel.bookmark.update_sort.missing_bookmark.app_error",
"translation": "Could not sort the bookmark. Not found."
},
{
"id": "app.channel.clear_all_custom_role_assignments.select.app_error",
"translation": "Failed to retrieve the channel members."
@@ -8438,6 +8522,58 @@
"id": "model.channel.is_valid.update_at.app_error",
"translation": "Update at must be a valid time."
},
{
"id": "model.channel_bookmark.is_valid.channel_id.app_error",
"translation": "Invalid channel id."
},
{
"id": "model.channel_bookmark.is_valid.create_at.app_error",
"translation": "Create at must be a valid time."
},
{
"id": "model.channel_bookmark.is_valid.display_name.app_error",
"translation": "Display name missing."
},
{
"id": "model.channel_bookmark.is_valid.file_id.missing_or_invalid.app_error",
"translation": "File id is missing or invalid."
},
{
"id": "model.channel_bookmark.is_valid.id.app_error",
"translation": "Invalid Id."
},
{
"id": "model.channel_bookmark.is_valid.image_url.app_error",
"translation": "Invalid image url."
},
{
"id": "model.channel_bookmark.is_valid.link_file.app_error",
"translation": "Cannot set a link and a file in the same bookmark."
},
{
"id": "model.channel_bookmark.is_valid.link_url.missing_or_invalid.app_error",
"translation": "Link url is missing or invalid."
},
{
"id": "model.channel_bookmark.is_valid.original_id.app_error",
"translation": "Invalid original id."
},
{
"id": "model.channel_bookmark.is_valid.owner_id.app_error",
"translation": "Invalid owner id."
},
{
"id": "model.channel_bookmark.is_valid.parent_id.app_error",
"translation": "Invalid parent id."
},
{
"id": "model.channel_bookmark.is_valid.type.app_error",
"translation": "Invalid type."
},
{
"id": "model.channel_bookmark.is_valid.update_at.app_error",
"translation": "Update at must be a valid time."
},
{
"id": "model.channel_member.is_valid.channel_auto_follow_threads_value.app_error",
"translation": "Invalid channel-auto-follow-threads value."