upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Promote GIF picker, custom groups and message priority out of Beta (#27758)

Browse source 
* Remove Beta label for GIF picker, custom groups and message priority

* Remove Give Feedback from post priority

* Removed unused text

* [MM-56904] Reduce the number of api requests made to fetch user information for GMs on page load (#27149)

* use new endpoint to fetch group members

* [MM-58440] Migrate tooltips of 'components/post_view/post_flag_icon' to WithTooltip (#27689)

* Fixed bug around channel file sidebar (#27705)

* Fixed the issue for DB layer, ES to go

* Handled channel bookmarks

* Handled Bleve

* Lint fix

* Added channel bookmark test

* Skip bleve test

* Used common function

* SKipping ES as indexing logic in unavailable in test

* [MM-58378] Prevent prepackaged playbook v2 from upgrading on servers without enterprise license (#27335)

* add check for playbooks v2

* add new license helper

---------

Co-authored-by: Mattermost Build <build@mattermost.com>

* MM-59826: Add more invalidation event types (#27719)


This came up as part of the Redis work. I noticed that a lot of new
invalidation events were missing. This is important to understand
where invalidations are coming from.

https://mattermost.atlassian.net/browse/MM-59826

```release-note
NONE
```

Co-authored-by: Mattermost Build <build@mattermost.com>

* Minor css changes for post priority menu

---------

Co-authored-by: Ben Cooke <benkcooke@gmail.com>
Co-authored-by: Zubair Imtiaz <106450046+ZubairImtiaz3@users.noreply.github.com>
Co-authored-by: Harshil Sharma <18575143+harshilsharma63@users.noreply.github.com>
Co-authored-by: Julien Tant <785518+JulienTant@users.noreply.github.com>
Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in>
This commit is contained in:
Maria A Nunez 2024-07-30 12:12:15 -04:00 committed by GitHub
parent 1a55da8ac3
commit d26a76a890
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 20 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
e2e-tests/cypress/tests/utils/admin_console.js
View file

@ -307,8 +307,8 @@ export const adminConsoleNavigation = [
},
{
type: ['team', 'e20', 'cloud_enterprise'],
header: 'GIF (Beta)',
sidebar: 'GIF (Beta)',
header: 'GIF',
sidebar: 'GIF',
url: 'admin_console/integrations/gif',
},
{

6
webapp/channels/src/components/admin_console/admin_definition.tsx
View file

@ -2192,7 +2192,7 @@ const AdminDefinition: AdminDefinitionType = {
{
type: 'bool',
key: 'ServiceSettings.EnableCustomGroups',
label: defineMessage({id: 'admin.team.customUserGroupsTitle', defaultMessage: 'Enable Custom User Groups (Beta): '}),
label: defineMessage({id: 'admin.team.customUserGroupsTitle', defaultMessage: 'Enable Custom User Groups: '}),
help_text: defineMessage({id: 'admin.team.customUserGroupsDescription', defaultMessage: 'When true, users with appropriate permissions can create custom user groups and enables at-mentions for those groups.'}),
isDisabled: it.not(it.userHasWritePermissionOnResource(RESOURCE_KEYS.SITE.USERS_AND_TEAMS)),
isHidden: it.not(it.any(
@ -5554,13 +5554,13 @@ const AdminDefinition: AdminDefinitionType = {
},
gif: {
url: 'integrations/gif',
title: defineMessage({id: 'admin.sidebar.gif', defaultMessage: 'GIF (Beta)'}),
title: defineMessage({id: 'admin.sidebar.gif', defaultMessage: 'GIF'}),
isHidden: it.all(
it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.INTEGRATIONS.GIF)),
),
schema: {
id: 'GifSettings',
name: defineMessage({id: 'admin.integrations.gif', defaultMessage: 'GIF (Beta)'}),
name: defineMessage({id: 'admin.integrations.gif', defaultMessage: 'GIF'}),
settings: [
{
type: 'bool',

12
webapp/channels/src/components/admin_console/admin_sidebar/__snapshots__/admin_sidebar.test.tsx.snap
View file

@ -1105,7 +1105,7 @@ exports[`components/AdminSidebar should match snapshot 1`] = `
name="integrations/gif"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="GIF (Beta)"
defaultMessage="GIF"
id="admin.sidebar.gif"
/>
}
@ -1799,7 +1799,7 @@ exports[`components/AdminSidebar should match snapshot with workspace optimizati
name="integrations/gif"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="GIF (Beta)"
defaultMessage="GIF"
id="admin.sidebar.gif"
/>
}
@ -2548,7 +2548,7 @@ exports[`components/AdminSidebar should match snapshot, not prevent the console
name="integrations/gif"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="GIF (Beta)"
defaultMessage="GIF"
id="admin.sidebar.gif"
/>
}
@ -3242,7 +3242,7 @@ exports[`components/AdminSidebar should match snapshot, render plugins without a
name="integrations/gif"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="GIF (Beta)"
defaultMessage="GIF"
id="admin.sidebar.gif"
/>
}
@ -4035,7 +4035,7 @@ exports[`components/AdminSidebar should match snapshot, with license (with all f
name="integrations/gif"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="GIF (Beta)"
defaultMessage="GIF"
id="admin.sidebar.gif"
/>
}
@ -4960,7 +4960,7 @@ exports[`components/AdminSidebar should match snapshot, with license (without an
name="integrations/gif"
title={
<Memo(MemoizedFormattedMessage)
defaultMessage="GIF (Beta)"
defaultMessage="GIF"
id="admin.sidebar.gif"
/>
}

2
webapp/channels/src/components/admin_console/group_settings/group_details/group_profile_and_settings.tsx
View file

@ -37,7 +37,7 @@ const GroupSettingsToggle = ({
title={
<FormattedMessage
id='admin.team_settings.team_details.groupDetailsToggle'
defaultMessage='Enable Group Mention (Beta)'
defaultMessage='Enable Group Mention'
/>
}
subTitle={

2
webapp/channels/src/components/admin_console/system_roles/system_role/strings.tsx
View file

@ -359,7 +359,7 @@ export const sectionStrings: Record<string, Record<string, MessageDescriptor>> =
integrations_gif: defineMessages({
name: {
id: 'admin.permissions.sysconsole_section_integrations_gif.name',
defaultMessage: 'GIF (Beta)',
defaultMessage: 'GIF',
},
}),
integrations_cors: defineMessages({

20
webapp/channels/src/components/post_priority/post_priority_picker.tsx
View file

@ -12,8 +12,6 @@ import {PostPriority} from '@mattermost/types/posts';
import {getPersistentNotificationIntervalMinutes, isPersistentNotificationsEnabled, isPostAcknowledgementsEnabled} from 'mattermost-redux/selectors/entities/posts';
import BetaTag from 'components/widgets/tag/beta_tag';
import Menu, {MenuGroup, MenuItem, ToggleItem} from './post_priority_picker_item';
import './post_priority_picker.scss';
@ -57,11 +55,6 @@ const Header = styled.h4`
text-align: left;
`;
const Feedback = styled.a`
margin-left: auto;
font-size: 11px;
`;
const Footer = styled.div`
align-items: center;
border-top: 1px solid rgba(var(--center-channel-color-rgb), 0.08);
@ -137,8 +130,6 @@ function PostPriorityPicker({
onClose();
};
const feedbackLink = postAcknowledgementsEnabled ? 'https://forms.gle/noA8Azg7RdaBZtMB6' : 'https://forms.gle/mMcRFQzyKAo9Sv49A';
return (
<Picker className='PostPriorityPicker'>
<Header className='modal-title'>
@ -146,17 +137,6 @@ function PostPriorityPicker({
id: 'post_priority.picker.header',
defaultMessage: 'Message priority',
})}
<BetaTag/>
<Feedback
href={feedbackLink}
target='_blank'
rel='noopener noreferrer'
>
<FormattedMessage
id={'post_priority.picker.feedback'}
defaultMessage={'Give feedback'}
/>
</Feedback>
</Header>
<div role='application'>
<Menu className='Menu'>

3
webapp/channels/src/components/post_priority/post_priority_picker_item.tsx
View file

@ -64,7 +64,7 @@ const ToggleWrapper = styled.div`
const StyledCheckIcon = styled(CheckIcon)`
display: flex;
margin-left: auto;
margin-left: 24px;
fill: var(--button-bg);
`;
@ -79,6 +79,7 @@ const Menu = styled.ul`
margin: 0;
color: var(--center-channel-color-rgb);
list-style: none;
max-width:320px;
}
`;

11
webapp/channels/src/i18n/en.json
View file

@ -1187,7 +1187,7 @@
"admin.integrations.botAccounts": "Bot Accounts",
"admin.integrations.botAccounts.title": "Bot Accounts",
"admin.integrations.cors": "CORS",
"admin.integrations.gif": "GIF (Beta)",
"admin.integrations.gif": "GIF",
"admin.integrations.integrationManagement": "Integration Management",
"admin.integrations.integrationManagement.title": "Integration Management",
"admin.ip_filtering.add_filter": "Add a filter",
@ -1824,7 +1824,7 @@
"admin.permissions.sysconsole_section_experimental.name": "Experimental",
"admin.permissions.sysconsole_section_integrations_bot_accounts.name": "Bot Accounts",
"admin.permissions.sysconsole_section_integrations_cors.name": "CORS",
"admin.permissions.sysconsole_section_integrations_gif.name": "GIF (Beta)",
"admin.permissions.sysconsole_section_integrations_gif.name": "GIF",
"admin.permissions.sysconsole_section_integrations_integration_management.name": "Integration Management",
"admin.permissions.sysconsole_section_integrations.description": "Review integration configurations such as webhooks, bots and cross-origin requests.",
"admin.permissions.sysconsole_section_integrations.name": "Integrations",
@ -2340,7 +2340,7 @@
"admin.sidebar.fileSharingDownloads": "File Sharing and Downloads",
"admin.sidebar.fileStorage": "File Storage",
"admin.sidebar.filter": "Find settings",
"admin.sidebar.gif": "GIF (Beta)",
"admin.sidebar.gif": "GIF",
"admin.sidebar.gitlab": "GitLab",
"admin.sidebar.groups": "Groups",
"admin.sidebar.guest_access": "Guest Access",
@ -2606,7 +2606,7 @@
"admin.team_settings.team_details.anyoneCanJoinDescr": "This team can be discovered allowing anyone with an account to join this team.",
"admin.team_settings.team_details.archiveTeam": "Archive Team",
"admin.team_settings.team_details.csvDomains": "Comma Separated Email Domain List",
"admin.team_settings.team_details.groupDetailsToggle": "Enable Group Mentions (Beta)",
"admin.team_settings.team_details.groupDetailsToggle": "Enable Group Mentions",
"admin.team_settings.team_details.groupDetailsToggleDescr": "When enabled, this group can be mentioned in other channels and teams. This may result in the group member list being visible to all users.",
"admin.team_settings.team_details.specificDomains": "Only specific email domains can join this team",
"admin.team_settings.team_details.specificDomainsDescr": "Users can only join the team if their email matches one of the specified domains",
@ -2632,7 +2632,7 @@
"admin.team.brandTitle": "Enable Custom Branding: ",
"admin.team.chooseImage": "Select Image",
"admin.team.customUserGroupsDescription": "When true, users with appropriate permissions can create custom user groups and enables at-mentions for those groups.",
"admin.team.customUserGroupsTitle": "Enable Custom User Groups (Beta): ",
"admin.team.customUserGroupsTitle": "Enable Custom User Groups: ",
"admin.team.customUserStatusesDescription": "When true, users can set a descriptive status message and status emoji visible to all users.",
"admin.team.customUserStatusesTitle": "Enable Custom Statuses: ",
"admin.team.emailInvitationsDescription": "When true users can invite others to the system using email.",
@ -4526,7 +4526,6 @@
"post_priority.persistent_notifications.tooltip": "Persistent notifications will be sent",
"post_priority.picker.apply": "Apply",
"post_priority.picker.cancel": "Cancel",
"post_priority.picker.feedback": "Give feedback",
"post_priority.picker.header": "Message priority",
"post_priority.priority.important": "Important",
"post_priority.priority.standard": "Standard",