Merge pull request #4331 from tranchitella/3.7.x

3.7.x
mendersoftware · Feb 21, 2024 · ce95433 · ce95433
2 parents da9c218 + b2932ac
commit ce95433
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/js/actions/onboardingActions.js b/src/js/actions/onboardingActions.js
@@ -160,7 +160,7 @@ export const advanceOnboarding = stepId => (dispatch, getState) => {
   const madeProgress = steps[stepIndex + 1];
   const state = { ...getCurrentOnboardingState(getState()), progress: madeProgress };
   state.complete =
-    stepIndex + 1 >= Object.keys(onboardingSteps).findIndex(step => step === onboardingStepNames.DEPLOYMENTS_PAST_COMPLETED) ? true : state.complete;
+    stepIndex + 1 >= Object.keys(onboardingSteps).findIndex(step => step === onboardingStepNames.DEPLOYMENTS_PAST_COMPLETED_FAILURE) ? true : state.complete;
   Tracking.event({ category: 'onboarding', action: stepId });
   return Promise.all([dispatch(setOnboardingProgress(madeProgress)), dispatch(saveUserSettings({ onboarding: state }))]);
 };

diff --git a/src/js/components/helptips/onboardingcompletetip.js b/src/js/components/helptips/onboardingcompletetip.js
@@ -49,7 +49,6 @@ export const OnboardingCompleteTip = ({ anchor, targetUrl }) => {
         timer.current = setTimeout(() => dispatch(setOnboardingComplete(true)), 120000);
       });
     return () => {
-      dispatch(setOnboardingComplete(true));
       clearTimeout(timer.current);
     };
   }, [dispatch]);

diff --git a/src/js/components/settings/settings.js b/src/js/components/settings/settings.js
@@ -34,7 +34,7 @@ import Upgrade from './upgrade';
 let stripePromise = null;
 
 const sectionMap = {
-  'global-settings': { component: Global, text: () => 'Global settings', canAccess },
+  'global-settings': { component: Global, text: () => 'Global settings', canAccess: ({ userCapabilities: { canManageUsers } }) => canManageUsers },
   'my-profile': { component: SelfUserManagement, text: () => 'My profile', canAccess },
   'organization-and-billing': {
     component: Organization,