diff --git a/.changeset/happy-carpets-draw.md b/.changeset/happy-carpets-draw.md
new file mode 100644
index 0000000000000..f59a1a06c7bbf
--- /dev/null
+++ b/.changeset/happy-carpets-draw.md
@@ -0,0 +1,7 @@
+---
+'@rocket.chat/ui-client': major
+'@rocket.chat/i18n': major
+'@rocket.chat/meteor': major
+---
+
+Promotes Resizable Contextualbars from preview state to stable.
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
index 26afa86a22acd..f194bde566cbb 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
@@ -1,4 +1,3 @@
-import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
import { useLayoutSizes, useLayoutContextualBarPosition } from '@rocket.chat/ui-contexts';
import type { ComponentProps } from 'react';
import { useCallback, useRef } from 'react';
@@ -40,16 +39,9 @@ const ContextualbarDialog = ({ onClose, ...props }: ContextualbarDialogProps) =>
return (
-
-
-
-
-
-
-
-
-
-
+
+
+
);
};
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
index 50357a72968b2..438815a49d6b8 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
@@ -3,7 +3,6 @@ import { action } from '@storybook/addon-actions';
import type { Meta, StoryFn } from '@storybook/react';
import CannedResponseList from './CannedResponseList';
-import { Contextualbar } from '../../../../components/Contextualbar';
export default {
title: 'Omnichannel/CannedResponseList',
@@ -76,10 +75,4 @@ Default.args = {
itemCount: 3,
loadMoreItems: action('loadMoreItems'),
};
-Default.decorators = [
- (fn) => (
-
- {fn()}
-
- ),
-];
+Default.decorators = [(fn) => {fn()}];
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
index 83307198a3981..70a75529f711f 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/__snapshots__/CannedResponseList.spec.tsx.snap
@@ -4,18 +4,18 @@ exports[`CannedResponseList Storybook Stories renders Default without crashing 1
+
-
@@ -157,11 +157,49 @@ exports[`CannedResponseList Storybook Stories renders Default without crashing 1
-
+
+
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx
index 53cf59beb73a4..20a0cfb3c9eb8 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx
@@ -1,10 +1,10 @@
+import { Box } from '@rocket.chat/fuselage';
import { mockAppRoot } from '@rocket.chat/mock-providers';
import { action } from '@storybook/addon-actions';
import type { Meta } from '@storybook/react';
import { FormProvider, useForm } from 'react-hook-form';
import { AppLogsFilterContextualBar } from './AppLogsFilterContextualBar';
-import { Contextualbar } from '../../../../../../components/Contextualbar';
export default {
title: 'Marketplace/AppDetailsPage/AppLogs/Filters/AppLogsFilterContextualBar',
@@ -34,7 +34,7 @@ export default {
return (
- {fn()}
+ {fn()}
);
},
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
index c6a657745db7b..eafd596015fb2 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterContextualBar.spec.tsx.snap
@@ -4,402 +4,445 @@ exports[`renders AppLogsItem without crashing 1`] = `
+
-
-
-
- Filters
-
-
+
+ Filters
+
+
+
-
-
-
+
+
+
-
+
+
+
-
+
-
-
-
{fn()},
+ (fn) => {fn()},
mockAppRoot()
.withTranslations('en', 'core', {
'Edit_Invite': 'Edit invite',
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
index 69cb236d2934e..e93f4bd28e8fd 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/__snapshots__/InviteUsers.spec.tsx.snap
@@ -4,148 +4,190 @@ exports[`renders Default without crashing 1`] = `
-
- Invite users
-
-
+
-
-
-
+ Invite users
+
+
+
-
-
-
+ class="os-size-observer"
+ >
+
+
-
-
-
-
-
-
+
-
- Invite users
-
-
+
-
-
-
+ Invite users
+
+
+
-
-
-
+ class="os-size-observer"
+ >
+
+
-
- Expiration (Days)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
- Max number of uses
-
-
+ Max number of uses
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
-
-
-
-
-
- 5
+ Generate_New_Link
-
-
-
-
-
-
-
-
- Generate_New_Link
-
-
+
-
-
-
-
+
-
-
- ⦉
-
-
- Invite users
-
-
-
+
+ ⦉
+
+
+
-
-
-
+ Invite users
+
+
+
+
+
+
+
-
-
-
+ class="os-size-observer"
+ >
+
+
-
-
-
-
-
+
+
+
- Error: Error message
+
+ Error: Error message
+
-
-
+
+
-
-
-
-
+
-
-
- ⦉
-
-
- Invite users
-
-
-
+
+ ⦉
+
+
+
-
-
-
+ Invite users
+
+
+
+
+
+
+
-
-
+
{
test('should be able to toggle "Enhanced navigation" feature', async ({ page }) => {
await page.goto('/account/feature-preview');
- await poAccountProfile.getAccordionItemByName('Navigation').click();
const newNavigationCheckbox = poAccountProfile.getCheckboxByLabelText('Enhanced navigation');
await expect(newNavigationCheckbox).toBeChecked();
await newNavigationCheckbox.click();
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
index ecba4a34e468d..ba0a2b863d61d 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-units.ts
@@ -51,13 +51,13 @@ export class OmnichannelUnits extends OmnichannelAdministration {
await this.inputDepartments.click();
await this.inputDepartments.fill(name);
await this.findOption(name).click();
- await this.contextualBar.click({ position: { x: 0, y: 0 } });
+ await this.inputDepartments.click();
}
async selectMonitor(option: string) {
await this.inputMonitors.click();
await this.findOption(option).click();
- await this.contextualBar.click({ position: { x: 0, y: 0 } });
+ await this.inputMonitors.click();
}
async selectVisibility(option: string) {
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 1dab85fadae8b..32225c959478d 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1166,8 +1166,6 @@
"Contacts": "Contacts",
"Contains_Security_Fixes": "Contains Security Fixes",
"Content": "Content",
- "Contextualbar_resizable": "Resizable contextual bar",
- "Contextualbar_resizable_description": "Adjust the size of the contextual bar by clicking and dragging the edge, giving you instant customization and flexibility.",
"Continue": "Continue",
"Continue_Adding": "Continue Adding?",
"Continuous_sound_notifications_for_new_livechat_room": "Continuous sound notifications for new omnichannel room",
diff --git a/packages/i18n/src/locales/nb.i18n.json b/packages/i18n/src/locales/nb.i18n.json
index 57aee1574045d..ff9dd616428e6 100644
--- a/packages/i18n/src/locales/nb.i18n.json
+++ b/packages/i18n/src/locales/nb.i18n.json
@@ -1155,8 +1155,6 @@
"Contacts": "Kontakter",
"Contains_Security_Fixes": "Inneholder sikkerhetsoppdateringer",
"Content": "Innhold",
- "Contextualbar_resizable": "Kontekstlinje som kan endre størrelse",
- "Contextualbar_resizable_description": "Juster størrelsen på kontekstlinjen ved å klikke og dra kanten, noe som gir deg umiddelbar tilpasning og fleksibilitet.",
"Continue": "Fortsette",
"Continue_Adding": "Fortsette å legge til?",
"Continuous_sound_notifications_for_new_livechat_room": "Kontinuerlige lydvarsler for nytt omnikanalrom",
diff --git a/packages/i18n/src/locales/nn.i18n.json b/packages/i18n/src/locales/nn.i18n.json
index 751b8ec7d936a..e7a844080c650 100644
--- a/packages/i18n/src/locales/nn.i18n.json
+++ b/packages/i18n/src/locales/nn.i18n.json
@@ -1137,8 +1137,6 @@
"Contacts": "Kontakter",
"Contains_Security_Fixes": "Inneholder sikkerhetsoppdateringer",
"Content": "Innhold",
- "Contextualbar_resizable": "Kontekstlinje som kan endre størrelse",
- "Contextualbar_resizable_description": "Juster størrelsen på kontekstlinjen ved å klikke og dra kanten, noe som gir deg umiddelbar tilpasning og fleksibilitet.",
"Continue": "Fortsette",
"Continue_Adding": "Fortsette å legge til?",
"Continuous_sound_notifications_for_new_livechat_room": "Kontinuerlige lydvarsler for nytt livechat-rom",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index bb9cae8ec27bd..ab3d82ca84896 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -1160,8 +1160,6 @@
"Contacts": "Contatos",
"Contains_Security_Fixes": "Contém correções de segurança",
"Content": "Conteúdo",
- "Contextualbar_resizable": "Barra de contexto redimensionável",
- "Contextualbar_resizable_description": "Ajuste o tamanho da barra de contexto clicando e arrastando a borda, proporcionando personalização e flexibilidade instantâneas.",
"Continue": "Continuar",
"Continue_Adding": "Continuar adicionando?",
"Continuous_sound_notifications_for_new_livechat_room": "Notificações sonoras contínuas para nova sala de omnichannel",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 777a5f20071d7..86d4ba5c4a87d 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -1160,8 +1160,6 @@
"Contacts": "Kontakter",
"Contains_Security_Fixes": "Innehåller säkerhetsfixar",
"Content": "Innehåll",
- "Contextualbar_resizable": "Justerbar storlek kontextuell menyfält/panel",
- "Contextualbar_resizable_description": "Justera storleken på det kontextuella fältet genom att klicka och dra i kanten, vilket ger dig omedelbar anpassning och flexibilitet.",
"Continue": "Fortsätt",
"Continue_Adding": "Fortsätta lägga till?",
"Continuous_sound_notifications_for_new_livechat_room": "Kontinuerliga ljudmeddelanden för nytt Omnichannel-rum",
diff --git a/packages/ui-client/src/hooks/useFeaturePreviewList.ts b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
index 0f4bac9868f2d..f4f5f03d4535d 100644
--- a/packages/ui-client/src/hooks/useFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useFeaturePreviewList.ts
@@ -1,6 +1,6 @@
import type { TranslationKey } from '@rocket.chat/ui-contexts';
-export type FeaturesAvailable = 'contextualbarResizable' | 'newNavigation' | 'secondarySidebar';
+export type FeaturesAvailable = 'newNavigation' | 'secondarySidebar';
export type FeaturePreviewProps = {
name: FeaturesAvailable;
@@ -19,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: 'contextualbarResizable',
- i18n: 'Contextualbar_resizable',
- description: 'Contextualbar_resizable_description',
- group: 'Navigation',
- imageUrl: 'images/featurePreview/resizable-contextual-bar.png',
- value: false,
- enabled: true,
- },
{
name: 'newNavigation',
i18n: 'New_navigation',