Skip to content
Snippets Groups Projects
Unverified Commit 764d83a5 authored by Martin Schoeler's avatar Martin Schoeler Committed by GitHub
Browse files

refactor: remove meteor from setupWizard (#35021)

parent fd06413d
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,6 @@ import './reloadRoomAfterLogin';
import './roles';
import './rootUrlChange';
import './routes';
import './setupWizard';
import './slashCommands';
import './startup';
import './streamMessage';
......
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';
import { hasRole } from '../../app/authorization/client';
import { settings } from '../../app/settings/client';
import { router } from '../providers/RouterProvider';
Meteor.startup(() => {
Tracker.autorun(() => {
const userId = Meteor.userId();
const setupWizardState = settings.get('Show_Setup_Wizard');
const isWizardInProgress = userId && hasRole(userId, 'admin') && setupWizardState === 'in_progress';
const mustRedirect = (!userId && setupWizardState === 'pending') || isWizardInProgress;
if (mustRedirect) {
router.navigate('/setup-wizard');
}
});
});
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]);
};
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment