Merge pull request #32346 from RocketChat/release-6.7.2

Release 6.7.2
RocketChat · Apr 30, 2024 · 9580976 · 9580976
2 parents f882362 + ff2201a
commit 9580976
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 12 deletions.
diff --git a/.changeset/bump-patch-1714490920088.md b/.changeset/bump-patch-1714490920088.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/yellow-lies-judge.md b/.changeset/yellow-lies-judge.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+fixed Engagement Dashboard and Device Management admin pages loading indefinitely
diff --git a/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx b/apps/meteor/ee/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
@@ -14,7 +14,7 @@ const DeviceManagementAdminRoute = (): ReactElement => {
 	const t = useTranslation();
 	const router = useRouter();
 	const setModal = useSetModal();
-	const isModalOpen = useCurrentModal() !== null;
+	const isModalOpen = !!useCurrentModal();
 
 	const hasDeviceManagement = useHasLicenseModule('device-management') as boolean;
 	const canViewDeviceManagement = usePermission('view-device-management');
@@ -25,6 +25,7 @@ const DeviceManagementAdminRoute = (): ReactElement => {
 		if (shouldShowUpsell) {
 			setModal(
 				<GenericUpsellModal
+					aria-label={t('Device_Management')}
 					title={t('Device_Management')}
 					img={getURL('images/device-management.png')}
 					subtitle={t('Ensure_secure_workspace_access')}

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
@@ -25,7 +25,7 @@ const EngagementDashboardRoute = (): ReactElement | null => {
 	const t = useTranslation();
 	const canViewEngagementDashboard = usePermission('view-engagement-dashboard');
 	const setModal = useSetModal();
-	const isModalOpen = useCurrentModal() !== null;
+	const isModalOpen = !!useCurrentModal();
 
 	const router = useRouter();
 	const tab = useRouteParameter('tab');
@@ -39,6 +39,7 @@ const EngagementDashboardRoute = (): ReactElement | null => {
 		if (shouldShowUpsell) {
 			setModal(
 				<GenericUpsellModal
+					aria-label={t('Engagement_Dashboard')}
 					title={t('Engagement_Dashboard')}
 					img={getURL('images/engagement.png')}
 					subtitle={t('Analyze_practical_usage')}

diff --git a/apps/meteor/tests/e2e/administration.spec.ts b/apps/meteor/tests/e2e/administration.spec.ts
@@ -28,6 +28,38 @@ test.describe.parallel('administration', () => {
 		});
 	});
 
+	test.describe('Engagement dashboard', () => {
+		test('Should show upsell modal', async ({ page }) => {
+			test.skip(IS_EE);
+			await page.goto('/admin/engagement/users');
+
+			await expect(page.locator('role=dialog[name="Engagement dashboard"]')).toBeVisible();
+		});
+
+		test('Should show engagement dashboard', async ({ page }) => {
+			test.skip(!IS_EE);
+			await page.goto('/admin/engagement/users');
+
+			await expect(page.locator('h1 >> text="Engagement"')).toBeVisible();
+		});
+	});
+
+	test.describe('Device management', () => {
+		test('Should show upsell modal', async ({ page }) => {
+			test.skip(IS_EE);
+			await page.goto('/admin/device-management');
+
+			await expect(page.locator('role=dialog[name="Device management"]')).toBeVisible();
+		});
+
+		test('Should show device management page', async ({ page }) => {
+			test.skip(!IS_EE);
+			await page.goto('/admin/device-management');
+
+			await expect(page.locator('h1 >> text="Device management"')).toBeVisible();
+		});
+	});
+
 	test.describe('Users', () => {
 		test.beforeEach(async ({ page }) => {
 			await page.goto('/admin/users');

diff --git a/yarn.lock b/yarn.lock
@@ -8791,10 +8791,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 1.0.0
-    "@rocket.chat/ui-contexts": 5.0.0
+    "@rocket.chat/ui-avatar": 1.0.1
+    "@rocket.chat/ui-contexts": 5.0.1
     "@rocket.chat/ui-kit": 0.33.0
-    "@rocket.chat/ui-video-conf": 5.0.0
+    "@rocket.chat/ui-video-conf": 5.0.1
     "@tanstack/react-query": "*"
     react: "*"
     react-dom: "*"
@@ -8883,8 +8883,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.29
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 5.0.0
-    "@rocket.chat/ui-contexts": 5.0.0
+    "@rocket.chat/ui-client": 5.0.1
+    "@rocket.chat/ui-contexts": 5.0.1
     katex: "*"
     react: "*"
   languageName: unknown
@@ -10088,7 +10088,7 @@ __metadata:
     typescript: ~5.3.3
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 5.0.0
+    "@rocket.chat/ui-contexts": 5.0.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10141,7 +10141,7 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-contexts": 5.0.0
+    "@rocket.chat/ui-contexts": 5.0.1
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -10317,8 +10317,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 1.0.0
-    "@rocket.chat/ui-contexts": 5.0.0
+    "@rocket.chat/ui-avatar": 1.0.1
+    "@rocket.chat/ui-contexts": 5.0.1
     react: ^17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10408,7 +10408,7 @@ __metadata:
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.1
-    "@rocket.chat/ui-contexts": 5.0.0
+    "@rocket.chat/ui-contexts": 5.0.1
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"