Skip to content

[pull] master from mattermost:master #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Mar 11, 2026
Merged

[pull] master from mattermost:master #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bedb50f
Clear channel selection when opening Recaps (#35552)
nickmisasi Mar 11, 2026
1538478
Expose popoutRhsPlugin via WebappUtils.popouts for plugin access (#35…
sbishel Mar 11, 2026
67bf040
MM-67795 fix Recaps sidebar icon alignment (#35546)
nickmisasi Mar 11, 2026
162ed1b
MM-67684 Separate shared channel permissions from secure connection p…
wiggin77 Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/v4/source/remoteclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Get a list of remote clusters.

##### Permissions
`manage_secure_connections`
`manage_secure_connections` or `manage_shared_channels`
operationId: GetRemoteClusters
parameters:
- name: page
Expand Down Expand Up @@ -134,7 +134,7 @@
Get the Remote Cluster details from the provided id string.

##### Permissions
`manage_secure_connections`
`manage_secure_connections` or `manage_shared_channels`
operationId: GetRemoteCluster
parameters:
- name: remote_id
Expand Down
2 changes: 1 addition & 1 deletion api/v4/source/sharedchannels.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
and their status.

##### Permissions
`manage_secure_connections`
`manage_secure_connections` or `manage_shared_channels`
operationId: GetSharedChannelRemotesByRemoteCluster
parameters:
- name: remote_id
Expand Down
177 changes: 89 additions & 88 deletions e2e-tests/playwright/specs/functional/channels/autotranslation/autotranslation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,94 +834,95 @@ test(
},
);

test(
'message actions include Show translation',
{
tag: ['@autotranslation'],
},
async ({pw}) => {
const {adminClient, user, userClient, team} = await pw.initSetup();

const license = await adminClient.getClientLicenseOld();
test.skip(
!hasAutotranslationLicense(license.SkuShortName),
'Skipping test - server does not have Entry or Advanced license',
);
const translationUrl = process.env.TRANSLATION_SERVICE_URL || 'http://localhost:3010';
await enableAutotranslationConfig(adminClient, {
mockBaseUrl: translationUrl,
targetLanguages: ['en', 'es'],
});

const channelName = `autotranslation-dotmenu-${await getRandomId()}`;
const created = await adminClient.createChannel({
team_id: team.id,
name: channelName,
display_name: 'Dot Menu Show Translation Test',
type: 'O',
});
await enableChannelAutotranslation(adminClient, created.id);
await adminClient.addToChannel(user.id, created.id);
await setUserChannelAutotranslation(userClient, created.id, true);

const poster = await pw.random.user('poster');
const createdPoster = await adminClient.createUser(poster, '', '');
await adminClient.addToTeam(team.id, createdPoster.id);
await adminClient.addToChannel(createdPoster.id, created.id);
const {client: posterClient} = await pw.makeClient({
username: poster.username,
password: poster.password,
});
if (!posterClient) throw new Error('Failed to create poster client');

// Create a second poster to show translation indicator (only visible with multiple users)
const poster2 = await pw.random.user('poster2');
const createdPoster2 = await adminClient.createUser(poster2, '', '');
await adminClient.addToTeam(team.id, createdPoster2.id);
await adminClient.addToChannel(createdPoster2.id, created.id);
const {client: posterClient2} = await pw.makeClient({
username: poster2.username,
password: poster2.password,
});
if (!posterClient2) throw new Error('Failed to create second poster client');

// Set Spanish source to ensure translation happens
await setMockSourceLanguage(translationUrl, 'es');
// Post Spanish message that's long enough for reliable detection
await posterClient.createPost({
channel_id: created.id,
message: 'Este mensaje es para probar el menú de acciones con la opción de mostrar traducción automática',
user_id: createdPoster.id,
});
// Second user posts a message so the first user's translation indicator appears
await posterClient2.createPost({
channel_id: created.id,
message: 'Segundo usuario con mensaje más largo para mejor detección de idioma',
user_id: createdPoster2.id,
});

const {channelsPage, page} = await pw.testBrowser.login(user);
await channelsPage.goto(team.name, channelName);
await channelsPage.toBeVisible();

// * Find post with message text and wait for translation before opening dot menu
const messagePost = channelsPage.centerView.container
.locator('[id^="post_"]')
.filter({hasText: 'Este mensaje es para probar el menú de acciones'});
await messagePost.waitFor({state: 'visible', timeout: 15000});

// Wait for mock translation to be applied before opening the menu
// (mock appends "[translated to en]"; Show translation only appears after translation)
await expect(messagePost.getByText(/\[translated to en\]/i)).toBeVisible({timeout: 15000});

await messagePost.hover();
// Click the "more" (three dots) button to open the action menu
await messagePost.locator('.post-menu').getByRole('button', {name: 'more'}).click();

const showTranslationItem = page.getByRole('menuitem', {name: 'Show translation'});
await expect(showTranslationItem).toBeVisible({timeout: 10000});
},
);
// Skipped due to flaky race condition - see https://github.com/mattermost/mattermost/pull/35443
// test(
// 'message actions include Show translation',
// {
// tag: ['@autotranslation'],
// },
// async ({pw}) => {
// const {adminClient, user, userClient, team} = await pw.initSetup();
//
// const license = await adminClient.getClientLicenseOld();
// test.skip(
// !hasAutotranslationLicense(license.SkuShortName),
// 'Skipping test - server does not have Entry or Advanced license',
// );
// const translationUrl = process.env.TRANSLATION_SERVICE_URL || 'http://localhost:3010';
// await enableAutotranslationConfig(adminClient, {
// mockBaseUrl: translationUrl,
// targetLanguages: ['en', 'es'],
// });
//
// const channelName = `autotranslation-dotmenu-${await getRandomId()}`;
// const created = await adminClient.createChannel({
// team_id: team.id,
// name: channelName,
// display_name: 'Dot Menu Show Translation Test',
// type: 'O',
// });
// await enableChannelAutotranslation(adminClient, created.id);
// await adminClient.addToChannel(user.id, created.id);
// await setUserChannelAutotranslation(userClient, created.id, true);
//
// const poster = await pw.random.user('poster');
// const createdPoster = await adminClient.createUser(poster, '', '');
// await adminClient.addToTeam(team.id, createdPoster.id);
// await adminClient.addToChannel(createdPoster.id, created.id);
// const {client: posterClient} = await pw.makeClient({
// username: poster.username,
// password: poster.password,
// });
// if (!posterClient) throw new Error('Failed to create poster client');
//
// // Create a second poster to show translation indicator (only visible with multiple users)
// const poster2 = await pw.random.user('poster2');
// const createdPoster2 = await adminClient.createUser(poster2, '', '');
// await adminClient.addToTeam(team.id, createdPoster2.id);
// await adminClient.addToChannel(createdPoster2.id, created.id);
// const {client: posterClient2} = await pw.makeClient({
// username: poster2.username,
// password: poster2.password,
// });
// if (!posterClient2) throw new Error('Failed to create second poster client');
//
// // Set Spanish source to ensure translation happens
// await setMockSourceLanguage(translationUrl, 'es');
// // Post Spanish message that's long enough for reliable detection
// await posterClient.createPost({
// channel_id: created.id,
// message: 'Este mensaje es para probar el menú de acciones con la opción de mostrar traducción automática',
// user_id: createdPoster.id,
// });
// // Second user posts a message so the first user's translation indicator appears
// await posterClient2.createPost({
// channel_id: created.id,
// message: 'Segundo usuario con mensaje más largo para mejor detección de idioma',
// user_id: createdPoster2.id,
// });
//
// const {channelsPage, page} = await pw.testBrowser.login(user);
// await channelsPage.goto(team.name, channelName);
// await channelsPage.toBeVisible();
//
// // * Find post with message text and wait for translation before opening dot menu
// const messagePost = channelsPage.centerView.container
// .locator('[id^="post_"]')
// .filter({hasText: 'Este mensaje es para probar el menú de acciones'});
// await messagePost.waitFor({state: 'visible', timeout: 15000});
//
// // Wait for mock translation to be applied before opening the menu
// // (mock appends "[translated to en]"; Show translation only appears after translation)
// await expect(messagePost.getByText(/\[translated to en\]/i)).toBeVisible({timeout: 15000});
//
// await messagePost.hover();
// // Click the "more" (three dots) button to open the action menu
// await messagePost.locator('.post-menu').getByRole('button', {name: 'more'}).click();
//
// const showTranslationItem = page.getByRole('menuitem', {name: 'Show translation'});
// await expect(showTranslationItem).toBeVisible({timeout: 10000});
// },
// );

test(
'any user can disable and enable again autotranslation for themselves in a channel',
Expand Down
32 changes: 16 additions & 16 deletions server/channels/api4/remote_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ func remoteSetProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
}

func getRemoteClusters(c *Context, w http.ResponseWriter, r *http.Request) {
if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSecureConnections) {
c.SetPermissionError(model.PermissionManageSecureConnections)
c.RequirePermissionToManageSecureConnectionsOrSharedChannels()
if c.Err != nil {
return
}

Expand Down Expand Up @@ -364,8 +364,8 @@ func getRemoteClusters(c *Context, w http.ResponseWriter, r *http.Request) {
}

func createRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSecureConnections) {
c.SetPermissionError(model.PermissionManageSecureConnections)
c.RequirePermissionToManageSecureConnections()
if c.Err != nil {
return
}

Expand Down Expand Up @@ -451,8 +451,8 @@ func createRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
}

func remoteClusterAcceptInvite(c *Context, w http.ResponseWriter, r *http.Request) {
if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSecureConnections) {
c.SetPermissionError(model.PermissionManageSecureConnections)
c.RequirePermissionToManageSecureConnections()
if c.Err != nil {
return
}

Expand Down Expand Up @@ -530,13 +530,13 @@ func remoteClusterAcceptInvite(c *Context, w http.ResponseWriter, r *http.Reques
}

func generateRemoteClusterInvite(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequireRemoteId()
c.RequirePermissionToManageSecureConnections()
if c.Err != nil {
return
}

if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSecureConnections) {
c.SetPermissionError(model.PermissionManageSecureConnections)
c.RequireRemoteId()
if c.Err != nil {
return
}

Expand Down Expand Up @@ -589,8 +589,8 @@ func generateRemoteClusterInvite(c *Context, w http.ResponseWriter, r *http.Requ
}

func getRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSecureConnections) {
c.SetPermissionError(model.PermissionManageSecureConnections)
c.RequirePermissionToManageSecureConnectionsOrSharedChannels()
if c.Err != nil {
return
}

Expand Down Expand Up @@ -618,8 +618,8 @@ func getRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
}

func patchRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSecureConnections) {
c.SetPermissionError(model.PermissionManageSecureConnections)
c.RequirePermissionToManageSecureConnections()
if c.Err != nil {
return
}

Expand Down Expand Up @@ -669,13 +669,13 @@ func patchRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
}

func deleteRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
c.RequireRemoteId()
c.RequirePermissionToManageSecureConnections()
if c.Err != nil {
return
}

if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionManageSecureConnections) {
c.SetPermissionError(model.PermissionManageSecureConnections)
c.RequireRemoteId()
if c.Err != nil {
return
}

Expand Down
Loading
Loading