upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Disable onboarding role screen when work template is off (#23369)

Browse source 
Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Julien Tant 2023-05-14 14:35:56 -07:00 committed by GitHub
parent 831d51569e
commit 956c836921
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx
View file

@ -15,7 +15,7 @@ import {Team} from '@mattermost/types/teams';
import {getIsOnboardingFlowEnabled} from 'mattermost-redux/selectors/entities/preferences';
import {isFirstAdmin} from 'mattermost-redux/selectors/entities/users';
import {getCurrentTeam, getMyTeams} from 'mattermost-redux/selectors/entities/teams';
import {getFirstAdminSetupComplete, getConfig, getLicense} from 'mattermost-redux/selectors/entities/general';
import {getFirstAdminSetupComplete, getConfig, getLicense, getFeatureFlagValue} from 'mattermost-redux/selectors/entities/general';
import {Client4} from 'mattermost-redux/client';
import {CategoryOther} from '@mattermost/types/work_templates';
@ -23,6 +23,7 @@ import {CategoryOther} from '@mattermost/types/work_templates';
import Constants from 'utils/constants';
import {getSiteURL, teamNameToUrl} from 'utils/url';
import {makeNewTeam} from 'utils/team_utils';
import {GlobalState} from 'types/store';
import {pageVisited, trackEvent} from 'actions/telemetry_actions';
@ -117,6 +118,7 @@ const PreparingWorkspace = (props: Props) => {
});
const isUserFirstAdmin = useSelector(isFirstAdmin);
const onboardingFlowEnabled = useSelector(getIsOnboardingFlowEnabled);
const isWorkTemplateEnabled = useSelector((state: GlobalState) => getFeatureFlagValue(state, 'WorkTemplate') === 'true');
const currentTeam = useSelector(getCurrentTeam);
const myTeams = useSelector(getMyTeams);
@ -134,7 +136,7 @@ const PreparingWorkspace = (props: Props) => {
const stepOrder = [
isSelfHosted && WizardSteps.Organization,
WizardSteps.Roles,
isWorkTemplateEnabled && WizardSteps.Roles,
pluginsEnabled && WizardSteps.Plugins,
WizardSteps.InviteMembers,
WizardSteps.LaunchingWorkspace,