From 956c8369212aeaf17593fa808ae13fc8e46366cc Mon Sep 17 00:00:00 2001
From: Julien Tant <785518+JulienTant@users.noreply.github.com>
Date: Sun, 14 May 2023 14:35:56 -0700
Subject: [PATCH] Disable onboarding role screen when work template is off
 (#23369)

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../components/preparing_workspace/preparing_workspace.tsx  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx b/webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx
index 57d87d3def5..c2f99556532 100644
--- a/webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx
+++ b/webapp/channels/src/components/preparing_workspace/preparing_workspace.tsx
@@ -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,