Merge branch 'develop' into fix/videoconf-display-avatars

Author: kodiakhq[bot]

apps/meteor/client/startup/index.ts

@@ -20,7 +20,6 @@ import './reloadRoomAfterLogin';
 import './roles';
 import './rootUrlChange';
 import './routes';
-import './setupWizard';
 import './slashCommands';
 import './startup';
 import './streamMessage';

apps/meteor/client/startup/setupWizard.ts

@@ -0,0 +1,17 @@
+import { useRole, useRouter, useSetting, useUserId } from '@rocket.chat/ui-contexts';
+import { useEffect } from 'react';
+
+export const useRedirectToSetupWizard = (): void => {
+	const userId = useUserId();
+	const setupWizardState = useSetting('Show_Setup_Wizard');
+	const router = useRouter();
+	const isAdmin = useRole('admin');
+
+	const isWizardInProgress = userId && isAdmin && setupWizardState === 'in_progress';
+	const mustRedirect = (!userId && setupWizardState === 'pending') || isWizardInProgress;
+	useEffect(() => {
+		if (mustRedirect) {
+			router.navigate('/setup-wizard');
+		}
+	}, [mustRedirect, router]);
+};

apps/meteor/client/startup/useRedirectToSetupWizard.ts

@@ -13,6 +13,7 @@ import { useAnalyticsEventTracking } from '../../hooks/useAnalyticsEventTracking
 import { useLoadRoomForAllowedAnonymousRead } from '../../hooks/useLoadRoomForAllowedAnonymousRead';
 import { useNotifyUser } from '../../hooks/useNotifyUser';
 import { appLayout } from '../../lib/appLayout';
+import { useRedirectToSetupWizard } from '../../startup/useRedirectToSetupWizard';
 
 const AppLayout = () => {
 	useEffect(() => {
@@ -30,6 +31,7 @@ const AppLayout = () => {
 	useAnalyticsEventTracking();
 	useLoadRoomForAllowedAnonymousRead();
 	useNotifyUser();
+	useRedirectToSetupWizard();
 	useSettingsOnLoadSiteUrl();
 	useLivechatEnterprise();
 	useNextcloud();

apps/meteor/client/views/root/AppLayout.tsx

@@ -53,7 +53,7 @@
     "eslint-plugin-react-hooks": "^5.0.0",
     "eslint-plugin-react-refresh": "^0.4.14",
     "typescript": "~5.7.2",
-    "vite": "^5.4.14"
+    "vite": "^6.1.0"
   },
   "volta": {
     "extends": "../../package.json"