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
@@ -0,0 +1,82 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
// ***************************************************************
|
||||
// - [#] indicates a test step (e.g. # Go to a page)
|
||||
// - [*] indicates an assertion (e.g. * Check the title)
|
||||
// - Use element ID when selecting an element. Create one if none.
|
||||
// ***************************************************************
|
||||
|
||||
// Stage: @prod
|
||||
// Group: @channels @enterprise @permissions
|
||||
|
||||
import * as TIMEOUTS from '../../../../fixtures/timeouts';
|
||||
|
||||
const deleteExistingTeamOverrideSchemes = () => {
|
||||
cy.apiGetSchemes('team').then(({schemes}) => {
|
||||
schemes.forEach((scheme) => {
|
||||
cy.apiDeleteScheme(scheme.id);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
const checkChannelBookmarksPermissionsAreVisibleAndSet = () => {
|
||||
const permissionRowIds = ['all_users-public_channel-manage_public_channel_bookmarks-checkbox',
|
||||
'all_users-private_channel-manage_private_channel_bookmarks-checkbox'];
|
||||
|
||||
permissionRowIds.forEach((id) => {
|
||||
cy.findByTestId(id).then((el) => {
|
||||
expect(el.hasClass('checked')).to.be.true;
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
describe('Revoke Bookmarks Permissions', () => {
|
||||
before(() => {
|
||||
cy.apiRequireLicense();
|
||||
cy.apiInitSetup();
|
||||
deleteExistingTeamOverrideSchemes();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
cy.apiLogout();
|
||||
cy.apiAdminLogin();
|
||||
cy.apiResetRoles();
|
||||
});
|
||||
|
||||
it('Channel Bookmarks permissions should be visible and set in the system scheme', () => {
|
||||
cy.apiAdminLogin();
|
||||
|
||||
// # Go to `User Management / Permissions` section
|
||||
cy.visit('/admin_console/user_management/permissions');
|
||||
|
||||
// # Click `Edit Scheme` on System Scheme
|
||||
cy.findByTestId('systemScheme-link').should('be.visible').click().wait(TIMEOUTS.HALF_SEC);
|
||||
|
||||
// # Find and ensure that manage bookmarks permissions are visible and set
|
||||
checkChannelBookmarksPermissionsAreVisibleAndSet();
|
||||
});
|
||||
|
||||
it('Channel Bookmarks permissions should be visible and set in a custom scheme', () => {
|
||||
cy.apiAdminLogin();
|
||||
|
||||
// # Go to `User Management / Permissions` section
|
||||
cy.visit('/admin_console/user_management/permissions');
|
||||
|
||||
// # Click `New Team Override Scheme`
|
||||
cy.findByTestId('team-override-schemes-link').should('be.visible').click().wait(TIMEOUTS.HALF_SEC);
|
||||
|
||||
// # Type Name and Description
|
||||
cy.get('#scheme-name').should('be.visible').type('custom test schema');
|
||||
cy.get('#scheme-description').type('description');
|
||||
|
||||
// # Save scheme
|
||||
cy.get('#saveSetting').click().wait(TIMEOUTS.TWO_SEC);
|
||||
|
||||
// # Edit the schema
|
||||
cy.findByTestId('custom test schema-edit').should('be.visible').click().wait(TIMEOUTS.HALF_SEC);
|
||||
|
||||
// # Find and ensure that manage bookmarks permissions are visible and set
|
||||
checkChannelBookmarksPermissionsAreVisibleAndSet();
|
||||
});
|
||||
});
|
||||
@@ -243,6 +243,12 @@ export const enableDisableAllChannelModeratedPermissionsViaAPI = (channel, enabl
|
||||
guests: enable,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'manage_bookmarks',
|
||||
roles: {
|
||||
members: enable,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
);
|
||||
|
||||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
Ссылка в новой задаче
Block a user