mirror of
https://github.com/RocketChat/Rocket.Chat.git
synced 2025-12-28 06:47:25 +00:00
feat: Move quick reactions out of feature preview (#36966)
Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com>
This commit is contained in:
parent
0c02586046
commit
611e4cdfa0
7
.changeset/purple-mayflies-approve.md
Normal file
7
.changeset/purple-mayflies-approve.md
Normal file
@ -0,0 +1,7 @@
|
||||
---
|
||||
'@rocket.chat/ui-client': major
|
||||
'@rocket.chat/i18n': major
|
||||
'@rocket.chat/meteor': major
|
||||
---
|
||||
|
||||
Promotes quick reactions from preview state to stable
|
||||
@ -6,7 +6,6 @@ import {
|
||||
type IRoom,
|
||||
type ISubscription,
|
||||
} from '@rocket.chat/core-typings';
|
||||
import { useFeaturePreview } from '@rocket.chat/ui-client';
|
||||
import { useUser, useEndpoint } from '@rocket.chat/ui-contexts';
|
||||
import { useCallback } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
@ -28,7 +27,6 @@ const ReactionMessageAction = ({ message, room, subscription }: ReactionMessageA
|
||||
const chat = useChat();
|
||||
const user = useUser();
|
||||
const setReaction = useEndpoint('POST', '/v1/chat.react');
|
||||
const quickReactionsEnabled = useFeaturePreview('quickReactions');
|
||||
const { quickReactions, addRecentEmoji } = useEmojiPickerData();
|
||||
const { t } = useTranslation();
|
||||
|
||||
@ -67,10 +65,9 @@ const ReactionMessageAction = ({ message, room, subscription }: ReactionMessageA
|
||||
|
||||
return (
|
||||
<>
|
||||
{quickReactionsEnabled &&
|
||||
quickReactions.slice(0, 3).map(({ emoji, image }) => {
|
||||
return <EmojiElement key={emoji} small title={emoji} emoji={emoji} image={image} onClick={() => toggleReaction(emoji)} />;
|
||||
})}
|
||||
{quickReactions.slice(0, 3).map(({ emoji, image }) => {
|
||||
return <EmojiElement key={emoji} small title={emoji} emoji={emoji} image={image} onClick={() => toggleReaction(emoji)} />;
|
||||
})}
|
||||
<MessageToolbarItem
|
||||
id='reaction-message'
|
||||
icon='add-reaction'
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
@ -60,11 +60,10 @@ test.describe.serial('feature preview', () => {
|
||||
poAccountProfile = new AccountProfile(page);
|
||||
});
|
||||
|
||||
test('should show "Message" and "Navigation" feature sections', async ({ page }) => {
|
||||
test('should show "Navigation" feature section', async ({ page }) => {
|
||||
await page.goto('/account/feature-preview');
|
||||
await page.waitForSelector('#main-content');
|
||||
|
||||
await expect(page.getByRole('main').getByRole('button', { name: 'Message' })).toBeVisible();
|
||||
await expect(page.getByRole('main').getByRole('button', { name: 'Navigation' })).toBeVisible();
|
||||
});
|
||||
|
||||
|
||||
@ -4291,8 +4291,6 @@
|
||||
"Queue_management": "Queue Management",
|
||||
"Queued": "Queued",
|
||||
"Queues": "Queues",
|
||||
"Quick_reactions": "Quick reactions",
|
||||
"Quick_reactions_description": "Easily access your most used and most recent emoji message reactions by hovering on a message.",
|
||||
"Quote": "Quote",
|
||||
"Random": "Random",
|
||||
"Rate Limiter": "Rate Limiter",
|
||||
|
||||
@ -3614,8 +3614,6 @@
|
||||
"Queue_management": "कतार प्रबंधन",
|
||||
"Queued": "कतारबद्ध",
|
||||
"Queues": "पूंछ",
|
||||
"Quick_reactions": "त्वरित प्रतिक्रियाएँ",
|
||||
"Quick_reactions_description": "जब आपका माउस संदेश पर होता है तो सबसे अधिक उपयोग की जाने वाली तीन प्रतिक्रियाओं तक आसान पहुंच मिलती है",
|
||||
"Quote": "उद्धरण",
|
||||
"Random": "Random",
|
||||
"Rate Limiter": "दर सीमक",
|
||||
|
||||
@ -4166,8 +4166,6 @@
|
||||
"Queue_management": "Køstyring",
|
||||
"Queued": "Satt i kø",
|
||||
"Queues": "Køer",
|
||||
"Quick_reactions": "Hurtigreaksjoner",
|
||||
"Quick_reactions_description": "Få enkelt tilgang til de mest brukte og siste emoji-reaksjonene dine ved å holde musepekeren over en melding.",
|
||||
"Quote": "Sitat",
|
||||
"Random": "Tilfeldig",
|
||||
"Rate Limiter": "Frekvensbegrensning ",
|
||||
|
||||
@ -3960,8 +3960,6 @@
|
||||
"Queue_management": "Køstyring",
|
||||
"Queued": "Satt i kø",
|
||||
"Queues": "Køer",
|
||||
"Quick_reactions": "Hurtigreaksjoner",
|
||||
"Quick_reactions_description": "Få enkelt tilgang til de mest brukte og siste emoji-reaksjonene dine ved å holde musepekeren over en melding.",
|
||||
"Quote": "Sitat",
|
||||
"Random": "Tilfeldig",
|
||||
"Rate Limiter": "Frekvensbegrensning ",
|
||||
|
||||
@ -4064,8 +4064,6 @@
|
||||
"Queue_management": "Gerenciamento de fila",
|
||||
"Queued": "Em fila",
|
||||
"Queues": "Filas",
|
||||
"Quick_reactions": "Reações rápidas",
|
||||
"Quick_reactions_description": "Acesse facilmente suas reações de mensagens de emoji mais usadas e mais recentes passando o mouse sobre uma mensagem.",
|
||||
"Quote": "Citar",
|
||||
"Random": "Aleatória",
|
||||
"Rate Limiter": "Limitador de taxa",
|
||||
|
||||
@ -4097,8 +4097,6 @@
|
||||
"Queue_management": "Köhantering",
|
||||
"Queued": "I kö",
|
||||
"Queues": "Köer",
|
||||
"Quick_reactions": "Snabb reaktioner",
|
||||
"Quick_reactions_description": "Få enkel åtkomst till dina mest använda och senaste emoji-reaktioner genom att hålla muspekaren över ett meddelande.",
|
||||
"Quote": "Citera inlägg",
|
||||
"Random": "Slumpmässig",
|
||||
"Rate Limiter": "Begränsning",
|
||||
|
||||
@ -7,7 +7,7 @@ import FeaturePreviewOn from './FeaturePreviewOn';
|
||||
|
||||
test('should renders off if the feature is disabled', async () => {
|
||||
render(
|
||||
<FeaturePreview feature='quickReactions'>
|
||||
<FeaturePreview feature='secondarySidebar'>
|
||||
<FeaturePreviewOn>on</FeaturePreviewOn>
|
||||
<FeaturePreviewOff>off</FeaturePreviewOff>
|
||||
</FeaturePreview>,
|
||||
@ -21,14 +21,14 @@ test('should renders off if the feature is disabled', async () => {
|
||||
|
||||
test('should renders on if the feature is enabled', async () => {
|
||||
render(
|
||||
<FeaturePreview feature='quickReactions'>
|
||||
<FeaturePreview feature='secondarySidebar'>
|
||||
<FeaturePreviewOn>on</FeaturePreviewOn>
|
||||
<FeaturePreviewOff>off</FeaturePreviewOff>
|
||||
</FeaturePreview>,
|
||||
{
|
||||
wrapper: mockAppRoot()
|
||||
.withSetting('Accounts_AllowFeaturePreview', true)
|
||||
.withUserPreference('featuresPreview', [{ name: 'quickReactions', value: true }])
|
||||
.withUserPreference('featuresPreview', [{ name: 'secondarySidebar', value: true }])
|
||||
.build(),
|
||||
},
|
||||
);
|
||||
|
||||
@ -4,7 +4,7 @@ import { renderHook } from '@testing-library/react';
|
||||
import { useFeaturePreview } from './useFeaturePreview';
|
||||
|
||||
it('should return false if featurePreviewEnabled is false', () => {
|
||||
const { result } = renderHook(() => useFeaturePreview('quickReactions'), {
|
||||
const { result } = renderHook(() => useFeaturePreview('secondarySidebar'), {
|
||||
wrapper: mockAppRoot().withSetting('Accounts_AllowFeaturePreview', false).build(),
|
||||
});
|
||||
|
||||
@ -13,10 +13,10 @@ it('should return false if featurePreviewEnabled is false', () => {
|
||||
|
||||
// TODO: fix this test
|
||||
it('should return false if featurePreviewEnabled is true but feature is not in userPreferences', () => {
|
||||
const { result } = renderHook(() => useFeaturePreview('quickReactions'), {
|
||||
const { result } = renderHook(() => useFeaturePreview('secondarySidebar'), {
|
||||
wrapper: mockAppRoot()
|
||||
.withSetting('Accounts_AllowFeaturePreview', false)
|
||||
.withUserPreference('featuresPreview', [{ name: 'quickReactions', value: true }])
|
||||
.withUserPreference('featuresPreview', [{ name: 'secondarySidebar', value: true }])
|
||||
.build(),
|
||||
});
|
||||
|
||||
@ -24,10 +24,10 @@ it('should return false if featurePreviewEnabled is true but feature is not in u
|
||||
});
|
||||
|
||||
it('should return true if featurePreviewEnabled is true and feature is in userPreferences', () => {
|
||||
const { result } = renderHook(() => useFeaturePreview('quickReactions'), {
|
||||
const { result } = renderHook(() => useFeaturePreview('secondarySidebar'), {
|
||||
wrapper: mockAppRoot()
|
||||
.withSetting('Accounts_AllowFeaturePreview', true)
|
||||
.withUserPreference('featuresPreview', [{ name: 'quickReactions', value: true }])
|
||||
.withUserPreference('featuresPreview', [{ name: 'secondarySidebar', value: true }])
|
||||
.build(),
|
||||
});
|
||||
|
||||
|
||||
@ -1,10 +1,6 @@
|
||||
import type { TranslationKey } from '@rocket.chat/ui-contexts';
|
||||
|
||||
export type FeaturesAvailable =
|
||||
| 'quickReactions'
|
||||
| 'contextualbarResizable'
|
||||
| 'newNavigation'
|
||||
| 'secondarySidebar';
|
||||
export type FeaturesAvailable = 'contextualbarResizable' | 'newNavigation' | 'secondarySidebar' | 'expandableMessageComposer';
|
||||
|
||||
export type FeaturePreviewProps = {
|
||||
name: FeaturesAvailable;
|
||||
@ -23,15 +19,6 @@ export type FeaturePreviewProps = {
|
||||
|
||||
// TODO: Move the features preview array to another directory to be accessed from both BE and FE.
|
||||
export const defaultFeaturesPreview: FeaturePreviewProps[] = [
|
||||
{
|
||||
name: 'quickReactions',
|
||||
i18n: 'Quick_reactions',
|
||||
description: 'Quick_reactions_description',
|
||||
group: 'Message',
|
||||
imageUrl: 'images/featurePreview/quick-reactions.png',
|
||||
value: false,
|
||||
enabled: true,
|
||||
},
|
||||
{
|
||||
name: 'contextualbarResizable',
|
||||
i18n: 'Contextualbar_resizable',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user