diff --git a/examples/getstarted/config/features.js b/examples/getstarted/config/features.js index b2bbf1f976..7760be214c 100644 --- a/examples/getstarted/config/features.js +++ b/examples/getstarted/config/features.js @@ -1,3 +1,5 @@ module.exports = ({ env }) => ({ - future: {}, + future: { + unstableGuidedTour: false, + }, }); diff --git a/packages/core/admin/admin/src/components/UnstableGuidedTour/Tours.tsx b/packages/core/admin/admin/src/components/UnstableGuidedTour/Tours.tsx index 3aae852f90..f64091a20b 100644 --- a/packages/core/admin/admin/src/components/UnstableGuidedTour/Tours.tsx +++ b/packages/core/admin/admin/src/components/UnstableGuidedTour/Tours.tsx @@ -97,9 +97,12 @@ const UnstableGuidedTourTooltip = ({ requiredActions?.every((action) => { return guidedTourMeta?.data?.completedActions.includes(action); }) ?? true; - + const hasFutureFlag = window.strapi.future.isEnabled('unstableGuidedTour'); const isEnabled = - guidedTourMeta?.data?.isFirstSuperAdminUser && !state.tours[tourName].isCompleted; + guidedTourMeta?.data?.isFirstSuperAdminUser && + !state.tours[tourName].isCompleted && + hasFutureFlag; + const isPopoverOpen = isEnabled && isCurrentStep && hasCompletedRequiredActions; // Lock the scroll diff --git a/packages/core/types/src/modules/features.ts b/packages/core/types/src/modules/features.ts index c2e1a20b2b..8663bbc07e 100644 --- a/packages/core/types/src/modules/features.ts +++ b/packages/core/types/src/modules/features.ts @@ -1,5 +1,7 @@ export interface FeaturesConfig { - future?: object; + future?: { + unstableGuidedTour?: boolean; + }; } export interface FeaturesService { @@ -9,5 +11,6 @@ export interface FeaturesService { config: FeaturesConfig | undefined; future: { isEnabled: (futureFlagName: string) => boolean; + unstableGuidedTour?: boolean; }; }