@strapi/admin 5.18.1 → 5.20.0

package/dist/admin/admin/src/components/{UnstableGuidedTour → GuidedTour}/Step.mjs

@@ -4,7 +4,8 @@ import { Flex, Popover, Typography, Box, Button, LinkButton } from '@strapi/desi
 import { FormattedMessage } from 'react-intl';
 import { NavLink } from 'react-router-dom';
 import { styled } from 'styled-components';
-import { unstableUseGuidedTour } from './Context.mjs';
+import { useTracking } from '../../features/Tracking.mjs';
+import { useGuidedTour } from './Context.mjs';
 
 const ActionsContainer = styled(Flex)`
   border-top: ${({ theme })=>`1px solid ${theme.colors.neutral150}`};
@@ -17,7 +18,7 @@ const ActionsContainer = styled(Flex)`
   transform: translateY(-16px) rotate(-90deg);
 `;
 const StepCount = ({ tourName })=>{
-    const state = unstableUseGuidedTour('GuidedTourPopover', (s)=>s.state);
+    const state = useGuidedTour('GuidedTourPopover', (s)=>s.state);
     const currentStep = state.tours[tourName].currentStep + 1;
     // TODO: Currently all tours do not count their last step, but we should find a way to make this more smart
     const displayedLength = state.tours[tourName].length - 1;
@@ -38,6 +39,7 @@ const createStepComponents = (tourName)=>({
         Root: /*#__PURE__*/ React.forwardRef(({ withArrow = true, ...props }, ref)=>{
             return /*#__PURE__*/ jsxs(Popover.Content, {
                 ref: ref,
+                "aria-labelledby": "guided-tour-title",
                 side: "top",
                 align: "center",
                 style: {
@@ -75,11 +77,11 @@ const createStepComponents = (tourName)=>({
                 paddingBottom: 1,
                 width: "100%",
                 children: 'children' in props ? props.children : /*#__PURE__*/ jsx(Typography, {
-                    tag: "div",
+                    tag: "h1",
+                    id: "guided-tour-title",
                     variant: "omega",
                     fontWeight: "bold",
                     children: /*#__PURE__*/ jsx(FormattedMessage, {
-                        tagName: "h1",
                         id: props.id,
                         defaultMessage: props.defaultMessage
                     })
@@ -95,14 +97,37 @@ const createStepComponents = (tourName)=>({
                     tag: "div",
                     variant: "omega",
                     children: /*#__PURE__*/ jsx(FormattedMessage, {
-                        tagName: "p",
                         id: props.id,
                         defaultMessage: props.defaultMessage
                     })
                 })
             }),
         Actions: ({ showStepCount = true, showSkip = false, to, children, ...flexProps })=>{
-            const dispatch = unstableUseGuidedTour('GuidedTourPopover', (s)=>s.dispatch);
+            const { trackUsage } = useTracking();
+            const dispatch = useGuidedTour('GuidedTourPopover', (s)=>s.dispatch);
+            const state = useGuidedTour('GuidedTourPopover', (s)=>s.state);
+            const currentStep = state.tours[tourName].currentStep + 1;
+            const actualTourLength = state.tours[tourName].length;
+            const handleSkipAction = ()=>{
+                trackUsage('didSkipGuidedTour', {
+                    name: tourName
+                });
+                dispatch({
+                    type: 'skip_tour',
+                    payload: tourName
+                });
+            };
+            const handleNextStep = ()=>{
+                if (currentStep === actualTourLength) {
+                    trackUsage('didCompleteGuidedTour', {
+                        name: tourName
+                    });
+                }
+                dispatch({
+                    type: 'next_step',
+                    payload: tourName
+                });
+            };
             return /*#__PURE__*/ jsx(ActionsContainer, {
                 width: "100%",
                 padding: 3,
@@ -119,10 +144,7 @@ const createStepComponents = (tourName)=>({
                             children: [
                                 showSkip && /*#__PURE__*/ jsx(Button, {
                                     variant: "tertiary",
-                                    onClick: ()=>dispatch({
-                                            type: 'skip_tour',
-                                            payload: tourName
-                                        }),
+                                    onClick: handleSkipAction,
                                     children: /*#__PURE__*/ jsx(FormattedMessage, {
                                         id: "tours.skip",
                                         defaultMessage: "Skip"
@@ -131,19 +153,13 @@ const createStepComponents = (tourName)=>({
                                 to ? /*#__PURE__*/ jsx(LinkButton, {
                                     tag: NavLink,
                                     to: to,
-                                    onClick: ()=>dispatch({
-                                            type: 'next_step',
-                                            payload: tourName
-                                        }),
+                                    onClick: handleNextStep,
                                     children: /*#__PURE__*/ jsx(FormattedMessage, {
                                         id: "tours.next",
                                         defaultMessage: "Next"
                                     })
                                 }) : /*#__PURE__*/ jsx(Button, {
-                                    onClick: ()=>dispatch({
-                                            type: 'next_step',
-                                            payload: tourName
-                                        }),
+                                    onClick: handleNextStep,
                                     children: /*#__PURE__*/ jsx(FormattedMessage, {
                                         id: "tours.next",
                                         defaultMessage: "Next"

package/dist/admin/admin/src/components/GuidedTour/Step.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"Step.mjs","sources":["../../../../../../admin/src/components/GuidedTour/Step.tsx"],"sourcesContent":["import * as React from 'react';\n\nimport {\n  Popover,\n  Box,\n  Flex,\n  Button,\n  Typography,\n  LinkButton,\n  FlexProps,\n} from '@strapi/design-system';\nimport { FormattedMessage, type MessageDescriptor } from 'react-intl';\nimport { NavLink } from 'react-router-dom';\nimport { styled } from 'styled-components';\n\nimport { useTracking } from '../../features/Tracking';\n\nimport { useGuidedTour, type ValidTourName } from './Context';\n\n/* -------------------------------------------------------------------------------------------------\n * Step factory\n * -----------------------------------------------------------------------------------------------*/\n\ntype WithChildren = {\n  children: React.ReactNode;\n  id?: never;\n  defaultMessage?: never;\n};\n\ntype WithIntl = {\n  children?: undefined;\n  id: MessageDescriptor['id'];\n  defaultMessage: MessageDescriptor['defaultMessage'];\n  withArrow?: boolean;\n};\n\ntype WithActionsChildren = {\n  children: React.ReactNode;\n  showStepCount?: boolean;\n  showSkip?: boolean;\n};\n\ntype WithActionsProps = {\n  children?: undefined;\n  showStepCount?: boolean;\n  showSkip?: boolean;\n};\n\ntype StepProps = WithChildren | WithIntl;\ntype ActionsProps = WithActionsChildren | WithActionsProps;\n\ntype Step = {\n  Root: React.ForwardRefExoticComponent<\n    React.ComponentProps<typeof Popover.Content> & { withArrow?: boolean }\n  >;\n  Title: (props: StepProps) => React.ReactNode;\n  Content: (props: StepProps) => React.ReactNode;\n  Actions: (props: ActionsProps & { to?: string } & FlexProps) => React.ReactNode;\n};\n\nconst ActionsContainer = styled(Flex)`\n  border-top: ${({ theme }) => `1px solid ${theme.colors.neutral150}`};\n`;\n\n/**\n * TODO:\n * We should probably move all arrow styles + svg to the DS\n */\nconst PopoverArrow = styled(Popover.Arrow)`\n  fill: ${({ theme }) => theme.colors.neutral0};\n  transform: translateY(-16px) rotate(-90deg);\n`;\n\nexport const StepCount = ({ tourName }: { tourName: ValidTourName }) => {\n  const state = useGuidedTour('GuidedTourPopover', (s) => s.state);\n  const currentStep = state.tours[tourName].currentStep + 1;\n  // TODO: Currently all tours do not count their last step, but we should find a way to make this more smart\n  const displayedLength = state.tours[tourName].length - 1;\n\n  return (\n    <Typography variant=\"omega\" fontSize=\"12px\">\n      <FormattedMessage\n        id=\"tours.stepCount\"\n        defaultMessage=\"Step {currentStep} of {tourLength}\"\n        values={{ currentStep, tourLength: displayedLength }}\n      />\n    </Typography>\n  );\n};\n\nconst createStepComponents = (tourName: ValidTourName): Step => ({\n  Root: React.forwardRef(({ withArrow = true, ...props }, ref) => {\n    return (\n      <Popover.Content\n        ref={ref}\n        aria-labelledby=\"guided-tour-title\"\n        side=\"top\"\n        align=\"center\"\n        style={{ border: 'none' }}\n        {...props}\n      >\n        {withArrow && (\n          <PopoverArrow asChild>\n            <svg\n              xmlns=\"http://www.w3.org/2000/svg\"\n              width=\"23\"\n              height=\"25\"\n              viewBox=\"0 0 23 25\"\n              fill=\"none\"\n            >\n              <path d=\"M11 24.5L1.82843 15.3284C0.266332 13.7663 0.26633 11.2337 1.82843 9.67157L11 0.5L23 12.5L11 24.5Z\" />\n            </svg>\n          </PopoverArrow>\n        )}\n        <Flex width=\"360px\" direction=\"column\" alignItems=\"start\">\n          {props.children}\n        </Flex>\n      </Popover.Content>\n    );\n  }),\n\n  Title: (props) => {\n    return (\n      <Box paddingTop={5} paddingLeft={5} paddingRight={5} paddingBottom={1} width=\"100%\">\n        {'children' in props ? (\n          props.children\n        ) : (\n          <Typography tag=\"h1\" id=\"guided-tour-title\" variant=\"omega\" fontWeight=\"bold\">\n            <FormattedMessage id={props.id} defaultMessage={props.defaultMessage} />\n          </Typography>\n        )}\n      </Box>\n    );\n  },\n\n  Content: (props) => (\n    <Box paddingBottom={5} paddingLeft={5} paddingRight={5} width=\"100%\">\n      {'children' in props ? (\n        props.children\n      ) : (\n        <Typography tag=\"div\" variant=\"omega\">\n          <FormattedMessage id={props.id} defaultMessage={props.defaultMessage} />\n        </Typography>\n      )}\n    </Box>\n  ),\n\n  Actions: ({ showStepCount = true, showSkip = false, to, children, ...flexProps }) => {\n    const { trackUsage } = useTracking();\n    const dispatch = useGuidedTour('GuidedTourPopover', (s) => s.dispatch);\n    const state = useGuidedTour('GuidedTourPopover', (s) => s.state);\n    const currentStep = state.tours[tourName].currentStep + 1;\n    const actualTourLength = state.tours[tourName].length;\n\n    const handleSkipAction = () => {\n      trackUsage('didSkipGuidedTour', { name: tourName });\n      dispatch({ type: 'skip_tour', payload: tourName });\n    };\n\n    const handleNextStep = () => {\n      if (currentStep === actualTourLength) {\n        trackUsage('didCompleteGuidedTour', { name: tourName });\n      }\n      dispatch({ type: 'next_step', payload: tourName });\n    };\n\n    return (\n      <ActionsContainer\n        width=\"100%\"\n        padding={3}\n        paddingLeft={5}\n        justifyContent={showStepCount ? 'space-between' : 'flex-end'}\n        {...flexProps}\n      >\n        {children ? (\n          children\n        ) : (\n          <>\n            {showStepCount && <StepCount tourName={tourName} />}\n            <Flex gap={2}>\n              {showSkip && (\n                <Button variant=\"tertiary\" onClick={handleSkipAction}>\n                  <FormattedMessage id=\"tours.skip\" defaultMessage=\"Skip\" />\n                </Button>\n              )}\n              {to ? (\n                <LinkButton tag={NavLink} to={to} onClick={handleNextStep}>\n                  <FormattedMessage id=\"tours.next\" defaultMessage=\"Next\" />\n                </LinkButton>\n              ) : (\n                <Button onClick={handleNextStep}>\n                  <FormattedMessage id=\"tours.next\" defaultMessage=\"Next\" />\n                </Button>\n              )}\n            </Flex>\n          </>\n        )}\n      </ActionsContainer>\n    );\n  },\n});\n\nexport type { Step };\nexport { createStepComponents };\n"],"names":["ActionsContainer","styled","Flex","theme","colors","neutral150","PopoverArrow","Popover","Arrow","neutral0","StepCount","tourName","state","useGuidedTour","s","currentStep","tours","displayedLength","length","_jsx","Typography","variant","fontSize","FormattedMessage","id","defaultMessage","values","tourLength","createStepComponents","Root","React","forwardRef","withArrow","props","ref","_jsxs","Content","aria-labelledby","side","align","style","border","asChild","svg","xmlns","width","height","viewBox","fill","path","d","direction","alignItems","children","Title","Box","paddingTop","paddingLeft","paddingRight","paddingBottom","tag","fontWeight","Actions","showStepCount","showSkip","to","flexProps","trackUsage","useTracking","dispatch","actualTourLength","handleSkipAction","name","type","payload","handleNextStep","padding","justifyContent","_Fragment","gap","Button","onClick","LinkButton","NavLink"],"mappings":"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"}

package/dist/admin/admin/src/components/{UnstableGuidedTour → GuidedTour}/Tours.js

@@ -99,26 +99,30 @@ const tours = {
         },
         {
             name: 'Components',
-            content: (Step, { dispatch })=>/*#__PURE__*/ jsxRuntime.jsxs(Step.Root, {
+            content: (Step$1, { dispatch })=>/*#__PURE__*/ jsxRuntime.jsxs(Step$1.Root, {
                     side: "right",
                     sideOffset: 16,
                     children: [
-                        /*#__PURE__*/ jsxRuntime.jsx(Step.Title, {
+                        /*#__PURE__*/ jsxRuntime.jsx(Step$1.Title, {
                             id: "tours.contentTypeBuilder.Components.title",
                             defaultMessage: "Components"
                         }),
-                        /*#__PURE__*/ jsxRuntime.jsx(Step.Content, {
+                        /*#__PURE__*/ jsxRuntime.jsx(Step$1.Content, {
                             id: "tours.contentTypeBuilder.Components.content",
                             defaultMessage: "A reusable content structure that can be used across multiple content types, such as buttons, sliders or cards."
                         }),
-                        /*#__PURE__*/ jsxRuntime.jsx(Step.Actions, {
-                            justifyContent: "flex-end",
-                            children: /*#__PURE__*/ jsxRuntime.jsx(GotItAction, {
-                                onClick: ()=>dispatch({
-                                        type: 'next_step',
-                                        payload: 'contentTypeBuilder'
-                                    })
-                            })
+                        /*#__PURE__*/ jsxRuntime.jsxs(Step$1.Actions, {
+                            children: [
+                                /*#__PURE__*/ jsxRuntime.jsx(Step.StepCount, {
+                                    tourName: "contentTypeBuilder"
+                                }),
+                                /*#__PURE__*/ jsxRuntime.jsx(GotItAction, {
+                                    onClick: ()=>dispatch({
+                                            type: 'next_step',
+                                            payload: 'contentTypeBuilder'
+                                        })
+                                })
+                            ]
                         })
                     ]
                 })
@@ -130,11 +134,11 @@ const tours = {
                     children: [
                         /*#__PURE__*/ jsxRuntime.jsx(Step.Title, {
                             id: "tours.contentTypeBuilder.Finish.title",
-                            defaultMessage: "It’s time to create content!"
+                            defaultMessage: "It's time to create content!"
                         }),
                         /*#__PURE__*/ jsxRuntime.jsx(Step.Content, {
                             id: "tours.contentTypeBuilder.Finish.content",
-                            defaultMessage: "Now that you created content types, you’ll be able to create content in the content manager."
+                            defaultMessage: "Now that you created content types, you'll be able to create content in the content manager."
                         }),
                         /*#__PURE__*/ jsxRuntime.jsx(Step.Actions, {
                             showStepCount: false,
@@ -148,7 +152,7 @@ const tours = {
     contentManager: createTour('contentManager', [
         {
             name: 'Introduction',
-            when: (completedActions)=>completedActions.includes('didCreateContentTypeSchema') && !completedActions.includes('didCreateContent'),
+            when: (completedActions)=>completedActions.includes('didCreateContentTypeSchema'),
             content: (Step)=>/*#__PURE__*/ jsxRuntime.jsxs(Step.Root, {
                     side: "top",
                     withArrow: false,
@@ -186,26 +190,30 @@ const tours = {
         },
         {
             name: 'Publish',
-            content: (Step, { dispatch })=>/*#__PURE__*/ jsxRuntime.jsxs(Step.Root, {
+            content: (Step$1, { dispatch })=>/*#__PURE__*/ jsxRuntime.jsxs(Step$1.Root, {
                     side: "left",
                     align: "center",
                     children: [
-                        /*#__PURE__*/ jsxRuntime.jsx(Step.Title, {
+                        /*#__PURE__*/ jsxRuntime.jsx(Step$1.Title, {
                             id: "tours.contentManager.Publish.title",
                             defaultMessage: "Publish"
                         }),
-                        /*#__PURE__*/ jsxRuntime.jsx(Step.Content, {
+                        /*#__PURE__*/ jsxRuntime.jsx(Step$1.Content, {
                             id: "tours.contentManager.Publish.content",
                             defaultMessage: "Publish entries to make their content available through the Document Service API."
                         }),
-                        /*#__PURE__*/ jsxRuntime.jsx(Step.Actions, {
-                            justifyContent: "flex-end",
-                            children: /*#__PURE__*/ jsxRuntime.jsx(GotItAction, {
-                                onClick: ()=>dispatch({
-                                        type: 'next_step',
-                                        payload: 'contentManager'
-                                    })
-                            })
+                        /*#__PURE__*/ jsxRuntime.jsxs(Step$1.Actions, {
+                            children: [
+                                /*#__PURE__*/ jsxRuntime.jsx(Step.StepCount, {
+                                    tourName: "contentManager"
+                                }),
+                                /*#__PURE__*/ jsxRuntime.jsx(GotItAction, {
+                                    onClick: ()=>dispatch({
+                                            type: 'next_step',
+                                            payload: 'contentManager'
+                                        })
+                                })
+                            ]
                         })
                     ]
                 })
@@ -217,11 +225,11 @@ const tours = {
                     children: [
                         /*#__PURE__*/ jsxRuntime.jsx(Step.Title, {
                             id: "tours.contentManager.FinalStep.title",
-                            defaultMessage: "It’s time to create API Tokens!"
+                            defaultMessage: "It's time to create API Tokens!"
                         }),
                         /*#__PURE__*/ jsxRuntime.jsx(Step.Content, {
                             id: "tours.contentManager.FinalStep.content",
-                            defaultMessage: "Now that you’ve created and published content, time to create API tokens and set up permissions."
+                            defaultMessage: "Now that you've created and published content, time to create API tokens and set up permissions."
                         }),
                         /*#__PURE__*/ jsxRuntime.jsx(Step.Actions, {
                             showStepCount: false,
@@ -235,7 +243,6 @@ const tours = {
     apiTokens: createTour('apiTokens', [
         {
             name: 'Introduction',
-            when: (completedActions)=>!completedActions.includes('didCreateApiToken'),
             content: (Step)=>/*#__PURE__*/ jsxRuntime.jsxs(Step.Root, {
                     sideOffset: -36,
                     withArrow: false,
@@ -313,7 +320,7 @@ const tours = {
                     children: [
                         /*#__PURE__*/ jsxRuntime.jsx(Step.Title, {
                             id: "tours.apiTokens.FinalStep.title",
-                            defaultMessage: "It’s time to deploy your application!"
+                            defaultMessage: "It's time to deploy your application!"
                         }),
                         /*#__PURE__*/ jsxRuntime.jsx(Step.Content, {
                             id: "tours.apiTokens.FinalStep.content",
@@ -330,19 +337,13 @@ const tours = {
     ]),
     strapiCloud: createTour('strapiCloud', [])
 };
-const UnstableGuidedTourTooltip = ({ children, ...props })=>{
-    const state = Context.unstableUseGuidedTour('TooltipWrapper', (s)=>s.state);
-    const hasFutureFlag = window.strapi.future.isEnabled('unstableGuidedTour');
+const GuidedTourTooltip = ({ children, ...props })=>{
+    const state = Context.useGuidedTour('TooltipWrapper', (s)=>s.state);
     if (!state.enabled) {
         return /*#__PURE__*/ jsxRuntime.jsx(jsxRuntime.Fragment, {
             children: children
         });
     }
-    if (!hasFutureFlag) {
-        return /*#__PURE__*/ jsxRuntime.jsx(jsxRuntime.Fragment, {
-            children: children
-        });
-    }
     return /*#__PURE__*/ jsxRuntime.jsx(GuidedTourTooltipImpl, {
         ...props,
         children: children
@@ -359,8 +360,8 @@ const GuidedTourOverlay = styled.styled(designSystem.Box)`
 `;
 const GuidedTourTooltipImpl = ({ children, content, tourName, step, when })=>{
     const { data: guidedTourMeta } = admin.useGetGuidedTourMetaQuery();
-    const state = Context.unstableUseGuidedTour('UnstableGuidedTourTooltip', (s)=>s.state);
-    const dispatch = Context.unstableUseGuidedTour('UnstableGuidedTourTooltip', (s)=>s.dispatch);
+    const state = Context.useGuidedTour('GuidedTourTooltip', (s)=>s.state);
+    const dispatch = Context.useGuidedTour('GuidedTourTooltip', (s)=>s.dispatch);
     const isCurrentStep = state.tours[tourName].currentStep === step;
     const isStepConditionMet = when ? when(state.completedActions) : true;
     const isPopoverOpen = guidedTourMeta?.data?.isFirstSuperAdminUser && !state.tours[tourName].isCompleted && isCurrentStep && isStepConditionMet;
@@ -414,7 +415,7 @@ function createTour(tourName, steps) {
             throw Error(`The tour: ${tourName} with step: ${step.name} has already been registered`);
         }
         acc[step.name] = ({ children })=>{
-            return /*#__PURE__*/ jsxRuntime.jsx(UnstableGuidedTourTooltip, {
+            return /*#__PURE__*/ jsxRuntime.jsx(GuidedTourTooltip, {
                 tourName: tourName,
                 step: index,
                 content: step.content,

package/dist/admin/admin/src/components/GuidedTour/Tours.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Tours.js","sources":["../../../../../../admin/src/components/GuidedTour/Tours.tsx"],"sourcesContent":["import * as React from 'react';\n\nimport { Box, Popover, Portal, Button } from '@strapi/design-system';\nimport { FormattedMessage } from 'react-intl';\nimport { styled } from 'styled-components';\n\nimport { useGetGuidedTourMetaQuery } from '../../services/admin';\n\nimport {\n  type State,\n  type Action,\n  useGuidedTour,\n  ValidTourName,\n  ExtendedCompletedActions,\n} from './Context';\nimport { Step, StepCount, createStepComponents } from './Step';\n\n/* -------------------------------------------------------------------------------------------------\n * Tours\n * -----------------------------------------------------------------------------------------------*/\n\nconst GotItAction = ({ onClick }: { onClick: () => void }) => {\n  return (\n    <Button onClick={onClick}>\n      <FormattedMessage id=\"tours.gotIt\" defaultMessage=\"Got it\" />\n    </Button>\n  );\n};\n\nconst tours = {\n  contentTypeBuilder: createTour('contentTypeBuilder', [\n    {\n      name: 'Introduction',\n      content: (Step) => (\n        <Step.Root side=\"bottom\" withArrow={false}>\n          <Step.Title\n            id=\"tours.contentTypeBuilder.Introduction.title\"\n            defaultMessage=\"Content-Type Builder\"\n          />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.Introduction.content\"\n            defaultMessage=\"Create and manage your content structure with collection types, single types and components.\"\n          />\n          <Step.Actions showSkip />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'CollectionTypes',\n      content: (Step) => (\n        <Step.Root side=\"right\" sideOffset={16}>\n          <Step.Title\n            id=\"tours.contentTypeBuilder.CollectionTypes.title\"\n            defaultMessage=\"Collection Types\"\n          />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.CollectionTypes.content\"\n            defaultMessage=\"A content structure that can manage multiple entries, such as articles or products.\"\n          />\n          <Step.Actions />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'SingleTypes',\n      content: (Step) => (\n        <Step.Root side=\"right\" sideOffset={16}>\n          <Step.Title\n            id=\"tours.contentTypeBuilder.SingleTypes.title\"\n            defaultMessage=\"Single Types\"\n          />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.SingleTypes.content\"\n            defaultMessage=\"A content structure that can manage a single entry, such as a homepage or a header.\"\n          />\n          <Step.Actions />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Components',\n      content: (Step, { dispatch }) => (\n        <Step.Root side=\"right\" sideOffset={16}>\n          <Step.Title id=\"tours.contentTypeBuilder.Components.title\" defaultMessage=\"Components\" />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.Components.content\"\n            defaultMessage=\"A reusable content structure that can be used across multiple content types, such as buttons, sliders or cards.\"\n          />\n          <Step.Actions>\n            <StepCount tourName=\"contentTypeBuilder\" />\n            <GotItAction\n              onClick={() => dispatch({ type: 'next_step', payload: 'contentTypeBuilder' })}\n            />\n          </Step.Actions>\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Finish',\n      content: (Step) => (\n        <Step.Root side=\"right\">\n          <Step.Title\n            id=\"tours.contentTypeBuilder.Finish.title\"\n            defaultMessage=\"It's time to create content!\"\n          />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.Finish.content\"\n            defaultMessage=\"Now that you created content types, you'll be able to create content in the content manager.\"\n          />\n          <Step.Actions showStepCount={false} to=\"/content-manager\" />\n        </Step.Root>\n      ),\n      when: (completedActions) => completedActions.includes('didCreateContentTypeSchema'),\n    },\n  ]),\n  contentManager: createTour('contentManager', [\n    {\n      name: 'Introduction',\n      when: (completedActions) => completedActions.includes('didCreateContentTypeSchema'),\n      content: (Step) => (\n        <Step.Root side=\"top\" withArrow={false}>\n          <Step.Title\n            id=\"tours.contentManager.Introduction.title\"\n            defaultMessage=\"Content manager\"\n          />\n          <Step.Content\n            id=\"tours.contentManager.Introduction.content\"\n            defaultMessage=\"Create and manage content from your collection types and single types.\"\n          />\n          <Step.Actions showSkip />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Fields',\n      content: (Step) => (\n        <Step.Root sideOffset={-12}>\n          <Step.Title id=\"tours.contentManager.Fields.title\" defaultMessage=\"Fields\" />\n          <Step.Content\n            id=\"tours.contentManager.Fields.content\"\n            defaultMessage=\"Add content to the fields created in the Content-Type Builder.\"\n          />\n          <Step.Actions />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Publish',\n      content: (Step, { dispatch }) => (\n        <Step.Root side=\"left\" align=\"center\">\n          <Step.Title id=\"tours.contentManager.Publish.title\" defaultMessage=\"Publish\" />\n          <Step.Content\n            id=\"tours.contentManager.Publish.content\"\n            defaultMessage=\"Publish entries to make their content available through the Document Service API.\"\n          />\n          <Step.Actions>\n            <StepCount tourName=\"contentManager\" />\n            <GotItAction\n              onClick={() => dispatch({ type: 'next_step', payload: 'contentManager' })}\n            />\n          </Step.Actions>\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Finish',\n      content: (Step) => (\n        <Step.Root side=\"right\">\n          <Step.Title\n            id=\"tours.contentManager.FinalStep.title\"\n            defaultMessage=\"It's time to create API Tokens!\"\n          />\n          <Step.Content\n            id=\"tours.contentManager.FinalStep.content\"\n            defaultMessage=\"Now that you've created and published content, time to create API tokens and set up permissions.\"\n          />\n          <Step.Actions showStepCount={false} to=\"/settings/api-tokens\" />\n        </Step.Root>\n      ),\n      when: (completedActions) => completedActions.includes('didCreateContent'),\n    },\n  ]),\n  apiTokens: createTour('apiTokens', [\n    {\n      name: 'Introduction',\n      content: (Step) => (\n        <Step.Root sideOffset={-36} withArrow={false}>\n          <Step.Title id=\"tours.apiTokens.Introduction.title\" defaultMessage=\"API tokens\" />\n          <Step.Content\n            id=\"tours.apiTokens.Introduction.content\"\n            defaultMessage=\"Create and manage API tokens with highly customizable permissions.\"\n          />\n          <Step.Actions showSkip />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'CreateAnAPIToken',\n      content: (Step) => (\n        <Step.Root side=\"bottom\" align=\"end\" sideOffset={-10}>\n          <Step.Title\n            id=\"tours.apiTokens.CreateAnAPIToken.title\"\n            defaultMessage=\"Create an API token\"\n          />\n          <Step.Content\n            id=\"tours.apiTokens.CreateAnAPIToken.content\"\n            defaultMessage=\"Create a new API token. Choose a name, duration and type.\"\n          />\n          <Step.Actions />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'CopyAPIToken',\n      content: (Step, { dispatch }) => (\n        <Step.Root side=\"bottom\" align=\"start\" sideOffset={-5}>\n          <Step.Title\n            id=\"tours.apiTokens.CopyAPIToken.title\"\n            defaultMessage=\"Copy your new API token\"\n          />\n          <Step.Content\n            id=\"tours.apiTokens.CopyAPIToken.content\"\n            defaultMessage=\"Make sure to do it now, you won’t be able to see it again. You’ll need to generate a new one if you lose it.\"\n          />\n          <Step.Actions>\n            <StepCount tourName=\"apiTokens\" />\n            <GotItAction onClick={() => dispatch({ type: 'next_step', payload: 'apiTokens' })} />\n          </Step.Actions>\n        </Step.Root>\n      ),\n      when: (completedActions) => completedActions.includes('didCreateApiToken'),\n    },\n    {\n      name: 'Finish',\n      content: (Step) => (\n        <Step.Root side=\"right\" align=\"start\">\n          <Step.Title\n            id=\"tours.apiTokens.FinalStep.title\"\n            defaultMessage=\"It's time to deploy your application!\"\n          />\n          <Step.Content\n            id=\"tours.apiTokens.FinalStep.content\"\n            defaultMessage=\"Your application is ready to be deployed and its content to be shared with the world!\"\n          />\n          <Step.Actions showStepCount={false} to=\"/\" />\n        </Step.Root>\n      ),\n      when: (completedActions) => completedActions.includes('didCopyApiToken'),\n    },\n  ]),\n  strapiCloud: createTour('strapiCloud', []),\n} as const;\n\ntype Tours = typeof tours;\n\n/* -------------------------------------------------------------------------------------------------\n * GuidedTourTooltip\n * -----------------------------------------------------------------------------------------------*/\n\ntype Content = (\n  Step: Step,\n  {\n    state,\n    dispatch,\n  }: {\n    state: State;\n    dispatch: React.Dispatch<Action>;\n  }\n) => React.ReactNode;\n\ntype GuidedTourTooltipProps = {\n  children: React.ReactNode;\n  content: Content;\n  tourName: ValidTourName;\n  step: number;\n  when?: (completedActions: ExtendedCompletedActions) => boolean;\n};\n\nconst GuidedTourTooltip = ({ children, ...props }: GuidedTourTooltipProps) => {\n  const state = useGuidedTour('TooltipWrapper', (s) => s.state);\n\n  if (!state.enabled) {\n    return <>{children}</>;\n  }\n\n  return <GuidedTourTooltipImpl {...props}>{children}</GuidedTourTooltipImpl>;\n};\n\nconst GuidedTourOverlay = styled(Box)`\n  position: fixed;\n  top: 0;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  background-color: rgba(50, 50, 77, 0.2);\n  z-index: 10;\n`;\n\nconst GuidedTourTooltipImpl = ({\n  children,\n  content,\n  tourName,\n  step,\n  when,\n}: GuidedTourTooltipProps) => {\n  const { data: guidedTourMeta } = useGetGuidedTourMetaQuery();\n\n  const state = useGuidedTour('GuidedTourTooltip', (s) => s.state);\n  const dispatch = useGuidedTour('GuidedTourTooltip', (s) => s.dispatch);\n\n  const isCurrentStep = state.tours[tourName].currentStep === step;\n  const isStepConditionMet = when ? when(state.completedActions) : true;\n  const isPopoverOpen =\n    guidedTourMeta?.data?.isFirstSuperAdminUser &&\n    !state.tours[tourName].isCompleted &&\n    isCurrentStep &&\n    isStepConditionMet;\n\n  // Lock the scroll\n  React.useEffect(() => {\n    if (!isPopoverOpen) return;\n\n    const originalStyle = window.getComputedStyle(document.body).overflow;\n    document.body.style.overflow = 'hidden';\n\n    return () => {\n      document.body.style.overflow = originalStyle;\n    };\n  }, [isPopoverOpen]);\n\n  // TODO: This isn't great but the only solution for syncing the completed actions\n  React.useEffect(() => {\n    dispatch({\n      type: 'set_completed_actions',\n      payload: guidedTourMeta?.data?.completedActions ?? [],\n    });\n  }, [dispatch, guidedTourMeta?.data?.completedActions]);\n\n  const Step = React.useMemo(() => createStepComponents(tourName), [tourName]);\n\n  return (\n    <>\n      {isPopoverOpen && (\n        <Portal>\n          <GuidedTourOverlay />\n        </Portal>\n      )}\n      <Popover.Root open={isPopoverOpen}>\n        <Popover.Anchor>{children}</Popover.Anchor>\n        {content(Step, { state, dispatch })}\n      </Popover.Root>\n    </>\n  );\n};\n\n/* -------------------------------------------------------------------------------------------------\n * Tour factory\n * -----------------------------------------------------------------------------------------------*/\n\ntype TourStep<P extends string> = {\n  name: P;\n  content: Content;\n  when?: (completedActions: ExtendedCompletedActions) => boolean;\n};\n\nfunction createTour<const T extends ReadonlyArray<TourStep<string>>>(tourName: string, steps: T) {\n  type Components = {\n    [K in T[number]['name']]: React.ComponentType<{ children: React.ReactNode }>;\n  };\n\n  const tour = steps.reduce((acc, step, index) => {\n    if (step.name in acc) {\n      throw Error(`The tour: ${tourName} with step: ${step.name} has already been registered`);\n    }\n\n    acc[step.name as keyof Components] = ({ children }: { children: React.ReactNode }) => {\n      return (\n        <GuidedTourTooltip\n          tourName={tourName as ValidTourName}\n          step={index}\n          content={step.content}\n          when={step.when}\n        >\n          {children}\n        </GuidedTourTooltip>\n      );\n    };\n\n    return acc;\n  }, {} as Components);\n\n  return tour;\n}\n\nexport type { Content, Tours };\nexport { tours };\n"],"names":["GotItAction","onClick","_jsx","Button","FormattedMessage","id","defaultMessage","tours","contentTypeBuilder","createTour","name","content","Step","_jsxs","Root","side","withArrow","Title","Content","Actions","showSkip","sideOffset","dispatch","StepCount","tourName","type","payload","showStepCount","to","when","completedActions","includes","contentManager","align","apiTokens","strapiCloud","GuidedTourTooltip","children","props","state","useGuidedTour","s","enabled","_Fragment","GuidedTourTooltipImpl","GuidedTourOverlay","styled","Box","step","data","guidedTourMeta","useGetGuidedTourMetaQuery","isCurrentStep","currentStep","isStepConditionMet","isPopoverOpen","isFirstSuperAdminUser","isCompleted","React","useEffect","originalStyle","window","getComputedStyle","document","body","overflow","style","useMemo","createStepComponents","Portal","Popover","open","Anchor","steps","tour","reduce","acc","index","Error"],"mappings":"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"}

package/dist/admin/admin/src/components/{UnstableGuidedTour → GuidedTour}/Tours.mjs

@@ -4,7 +4,7 @@ import { Box, Portal, Popover, Button } from '@strapi/design-system';
 import { FormattedMessage } from 'react-intl';
 import { styled } from 'styled-components';
 import { useGetGuidedTourMetaQuery } from '../../services/admin.mjs';
-import { unstableUseGuidedTour } from './Context.mjs';
+import { useGuidedTour } from './Context.mjs';
 import { StepCount, createStepComponents } from './Step.mjs';
 
 /* -------------------------------------------------------------------------------------------------
@@ -90,14 +90,18 @@ const tours = {
                             id: "tours.contentTypeBuilder.Components.content",
                             defaultMessage: "A reusable content structure that can be used across multiple content types, such as buttons, sliders or cards."
                         }),
-                        /*#__PURE__*/ jsx(Step.Actions, {
-                            justifyContent: "flex-end",
-                            children: /*#__PURE__*/ jsx(GotItAction, {
-                                onClick: ()=>dispatch({
-                                        type: 'next_step',
-                                        payload: 'contentTypeBuilder'
-                                    })
-                            })
+                        /*#__PURE__*/ jsxs(Step.Actions, {
+                            children: [
+                                /*#__PURE__*/ jsx(StepCount, {
+                                    tourName: "contentTypeBuilder"
+                                }),
+                                /*#__PURE__*/ jsx(GotItAction, {
+                                    onClick: ()=>dispatch({
+                                            type: 'next_step',
+                                            payload: 'contentTypeBuilder'
+                                        })
+                                })
+                            ]
                         })
                     ]
                 })
@@ -109,11 +113,11 @@ const tours = {
                     children: [
                         /*#__PURE__*/ jsx(Step.Title, {
                             id: "tours.contentTypeBuilder.Finish.title",
-                            defaultMessage: "It’s time to create content!"
+                            defaultMessage: "It's time to create content!"
                         }),
                         /*#__PURE__*/ jsx(Step.Content, {
                             id: "tours.contentTypeBuilder.Finish.content",
-                            defaultMessage: "Now that you created content types, you’ll be able to create content in the content manager."
+                            defaultMessage: "Now that you created content types, you'll be able to create content in the content manager."
                         }),
                         /*#__PURE__*/ jsx(Step.Actions, {
                             showStepCount: false,
@@ -127,7 +131,7 @@ const tours = {
     contentManager: createTour('contentManager', [
         {
             name: 'Introduction',
-            when: (completedActions)=>completedActions.includes('didCreateContentTypeSchema') && !completedActions.includes('didCreateContent'),
+            when: (completedActions)=>completedActions.includes('didCreateContentTypeSchema'),
             content: (Step)=>/*#__PURE__*/ jsxs(Step.Root, {
                     side: "top",
                     withArrow: false,
@@ -177,14 +181,18 @@ const tours = {
                             id: "tours.contentManager.Publish.content",
                             defaultMessage: "Publish entries to make their content available through the Document Service API."
                         }),
-                        /*#__PURE__*/ jsx(Step.Actions, {
-                            justifyContent: "flex-end",
-                            children: /*#__PURE__*/ jsx(GotItAction, {
-                                onClick: ()=>dispatch({
-                                        type: 'next_step',
-                                        payload: 'contentManager'
-                                    })
-                            })
+                        /*#__PURE__*/ jsxs(Step.Actions, {
+                            children: [
+                                /*#__PURE__*/ jsx(StepCount, {
+                                    tourName: "contentManager"
+                                }),
+                                /*#__PURE__*/ jsx(GotItAction, {
+                                    onClick: ()=>dispatch({
+                                            type: 'next_step',
+                                            payload: 'contentManager'
+                                        })
+                                })
+                            ]
                         })
                     ]
                 })
@@ -196,11 +204,11 @@ const tours = {
                     children: [
                         /*#__PURE__*/ jsx(Step.Title, {
                             id: "tours.contentManager.FinalStep.title",
-                            defaultMessage: "It’s time to create API Tokens!"
+                            defaultMessage: "It's time to create API Tokens!"
                         }),
                         /*#__PURE__*/ jsx(Step.Content, {
                             id: "tours.contentManager.FinalStep.content",
-                            defaultMessage: "Now that you’ve created and published content, time to create API tokens and set up permissions."
+                            defaultMessage: "Now that you've created and published content, time to create API tokens and set up permissions."
                         }),
                         /*#__PURE__*/ jsx(Step.Actions, {
                             showStepCount: false,
@@ -214,7 +222,6 @@ const tours = {
     apiTokens: createTour('apiTokens', [
         {
             name: 'Introduction',
-            when: (completedActions)=>!completedActions.includes('didCreateApiToken'),
             content: (Step)=>/*#__PURE__*/ jsxs(Step.Root, {
                     sideOffset: -36,
                     withArrow: false,
@@ -292,7 +299,7 @@ const tours = {
                     children: [
                         /*#__PURE__*/ jsx(Step.Title, {
                             id: "tours.apiTokens.FinalStep.title",
-                            defaultMessage: "It’s time to deploy your application!"
+                            defaultMessage: "It's time to deploy your application!"
                         }),
                         /*#__PURE__*/ jsx(Step.Content, {
                             id: "tours.apiTokens.FinalStep.content",
@@ -309,19 +316,13 @@ const tours = {
     ]),
     strapiCloud: createTour('strapiCloud', [])
 };
-const UnstableGuidedTourTooltip = ({ children, ...props })=>{
-    const state = unstableUseGuidedTour('TooltipWrapper', (s)=>s.state);
-    const hasFutureFlag = window.strapi.future.isEnabled('unstableGuidedTour');
+const GuidedTourTooltip = ({ children, ...props })=>{
+    const state = useGuidedTour('TooltipWrapper', (s)=>s.state);
     if (!state.enabled) {
         return /*#__PURE__*/ jsx(Fragment, {
             children: children
         });
     }
-    if (!hasFutureFlag) {
-        return /*#__PURE__*/ jsx(Fragment, {
-            children: children
-        });
-    }
     return /*#__PURE__*/ jsx(GuidedTourTooltipImpl, {
         ...props,
         children: children
@@ -338,8 +339,8 @@ const GuidedTourOverlay = styled(Box)`
 `;
 const GuidedTourTooltipImpl = ({ children, content, tourName, step, when })=>{
     const { data: guidedTourMeta } = useGetGuidedTourMetaQuery();
-    const state = unstableUseGuidedTour('UnstableGuidedTourTooltip', (s)=>s.state);
-    const dispatch = unstableUseGuidedTour('UnstableGuidedTourTooltip', (s)=>s.dispatch);
+    const state = useGuidedTour('GuidedTourTooltip', (s)=>s.state);
+    const dispatch = useGuidedTour('GuidedTourTooltip', (s)=>s.dispatch);
     const isCurrentStep = state.tours[tourName].currentStep === step;
     const isStepConditionMet = when ? when(state.completedActions) : true;
     const isPopoverOpen = guidedTourMeta?.data?.isFirstSuperAdminUser && !state.tours[tourName].isCompleted && isCurrentStep && isStepConditionMet;
@@ -393,7 +394,7 @@ function createTour(tourName, steps) {
             throw Error(`The tour: ${tourName} with step: ${step.name} has already been registered`);
         }
         acc[step.name] = ({ children })=>{
-            return /*#__PURE__*/ jsx(UnstableGuidedTourTooltip, {
+            return /*#__PURE__*/ jsx(GuidedTourTooltip, {
                 tourName: tourName,
                 step: index,
                 content: step.content,

package/dist/admin/admin/src/components/GuidedTour/Tours.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"Tours.mjs","sources":["../../../../../../admin/src/components/GuidedTour/Tours.tsx"],"sourcesContent":["import * as React from 'react';\n\nimport { Box, Popover, Portal, Button } from '@strapi/design-system';\nimport { FormattedMessage } from 'react-intl';\nimport { styled } from 'styled-components';\n\nimport { useGetGuidedTourMetaQuery } from '../../services/admin';\n\nimport {\n  type State,\n  type Action,\n  useGuidedTour,\n  ValidTourName,\n  ExtendedCompletedActions,\n} from './Context';\nimport { Step, StepCount, createStepComponents } from './Step';\n\n/* -------------------------------------------------------------------------------------------------\n * Tours\n * -----------------------------------------------------------------------------------------------*/\n\nconst GotItAction = ({ onClick }: { onClick: () => void }) => {\n  return (\n    <Button onClick={onClick}>\n      <FormattedMessage id=\"tours.gotIt\" defaultMessage=\"Got it\" />\n    </Button>\n  );\n};\n\nconst tours = {\n  contentTypeBuilder: createTour('contentTypeBuilder', [\n    {\n      name: 'Introduction',\n      content: (Step) => (\n        <Step.Root side=\"bottom\" withArrow={false}>\n          <Step.Title\n            id=\"tours.contentTypeBuilder.Introduction.title\"\n            defaultMessage=\"Content-Type Builder\"\n          />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.Introduction.content\"\n            defaultMessage=\"Create and manage your content structure with collection types, single types and components.\"\n          />\n          <Step.Actions showSkip />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'CollectionTypes',\n      content: (Step) => (\n        <Step.Root side=\"right\" sideOffset={16}>\n          <Step.Title\n            id=\"tours.contentTypeBuilder.CollectionTypes.title\"\n            defaultMessage=\"Collection Types\"\n          />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.CollectionTypes.content\"\n            defaultMessage=\"A content structure that can manage multiple entries, such as articles or products.\"\n          />\n          <Step.Actions />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'SingleTypes',\n      content: (Step) => (\n        <Step.Root side=\"right\" sideOffset={16}>\n          <Step.Title\n            id=\"tours.contentTypeBuilder.SingleTypes.title\"\n            defaultMessage=\"Single Types\"\n          />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.SingleTypes.content\"\n            defaultMessage=\"A content structure that can manage a single entry, such as a homepage or a header.\"\n          />\n          <Step.Actions />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Components',\n      content: (Step, { dispatch }) => (\n        <Step.Root side=\"right\" sideOffset={16}>\n          <Step.Title id=\"tours.contentTypeBuilder.Components.title\" defaultMessage=\"Components\" />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.Components.content\"\n            defaultMessage=\"A reusable content structure that can be used across multiple content types, such as buttons, sliders or cards.\"\n          />\n          <Step.Actions>\n            <StepCount tourName=\"contentTypeBuilder\" />\n            <GotItAction\n              onClick={() => dispatch({ type: 'next_step', payload: 'contentTypeBuilder' })}\n            />\n          </Step.Actions>\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Finish',\n      content: (Step) => (\n        <Step.Root side=\"right\">\n          <Step.Title\n            id=\"tours.contentTypeBuilder.Finish.title\"\n            defaultMessage=\"It's time to create content!\"\n          />\n          <Step.Content\n            id=\"tours.contentTypeBuilder.Finish.content\"\n            defaultMessage=\"Now that you created content types, you'll be able to create content in the content manager.\"\n          />\n          <Step.Actions showStepCount={false} to=\"/content-manager\" />\n        </Step.Root>\n      ),\n      when: (completedActions) => completedActions.includes('didCreateContentTypeSchema'),\n    },\n  ]),\n  contentManager: createTour('contentManager', [\n    {\n      name: 'Introduction',\n      when: (completedActions) => completedActions.includes('didCreateContentTypeSchema'),\n      content: (Step) => (\n        <Step.Root side=\"top\" withArrow={false}>\n          <Step.Title\n            id=\"tours.contentManager.Introduction.title\"\n            defaultMessage=\"Content manager\"\n          />\n          <Step.Content\n            id=\"tours.contentManager.Introduction.content\"\n            defaultMessage=\"Create and manage content from your collection types and single types.\"\n          />\n          <Step.Actions showSkip />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Fields',\n      content: (Step) => (\n        <Step.Root sideOffset={-12}>\n          <Step.Title id=\"tours.contentManager.Fields.title\" defaultMessage=\"Fields\" />\n          <Step.Content\n            id=\"tours.contentManager.Fields.content\"\n            defaultMessage=\"Add content to the fields created in the Content-Type Builder.\"\n          />\n          <Step.Actions />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Publish',\n      content: (Step, { dispatch }) => (\n        <Step.Root side=\"left\" align=\"center\">\n          <Step.Title id=\"tours.contentManager.Publish.title\" defaultMessage=\"Publish\" />\n          <Step.Content\n            id=\"tours.contentManager.Publish.content\"\n            defaultMessage=\"Publish entries to make their content available through the Document Service API.\"\n          />\n          <Step.Actions>\n            <StepCount tourName=\"contentManager\" />\n            <GotItAction\n              onClick={() => dispatch({ type: 'next_step', payload: 'contentManager' })}\n            />\n          </Step.Actions>\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'Finish',\n      content: (Step) => (\n        <Step.Root side=\"right\">\n          <Step.Title\n            id=\"tours.contentManager.FinalStep.title\"\n            defaultMessage=\"It's time to create API Tokens!\"\n          />\n          <Step.Content\n            id=\"tours.contentManager.FinalStep.content\"\n            defaultMessage=\"Now that you've created and published content, time to create API tokens and set up permissions.\"\n          />\n          <Step.Actions showStepCount={false} to=\"/settings/api-tokens\" />\n        </Step.Root>\n      ),\n      when: (completedActions) => completedActions.includes('didCreateContent'),\n    },\n  ]),\n  apiTokens: createTour('apiTokens', [\n    {\n      name: 'Introduction',\n      content: (Step) => (\n        <Step.Root sideOffset={-36} withArrow={false}>\n          <Step.Title id=\"tours.apiTokens.Introduction.title\" defaultMessage=\"API tokens\" />\n          <Step.Content\n            id=\"tours.apiTokens.Introduction.content\"\n            defaultMessage=\"Create and manage API tokens with highly customizable permissions.\"\n          />\n          <Step.Actions showSkip />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'CreateAnAPIToken',\n      content: (Step) => (\n        <Step.Root side=\"bottom\" align=\"end\" sideOffset={-10}>\n          <Step.Title\n            id=\"tours.apiTokens.CreateAnAPIToken.title\"\n            defaultMessage=\"Create an API token\"\n          />\n          <Step.Content\n            id=\"tours.apiTokens.CreateAnAPIToken.content\"\n            defaultMessage=\"Create a new API token. Choose a name, duration and type.\"\n          />\n          <Step.Actions />\n        </Step.Root>\n      ),\n    },\n    {\n      name: 'CopyAPIToken',\n      content: (Step, { dispatch }) => (\n        <Step.Root side=\"bottom\" align=\"start\" sideOffset={-5}>\n          <Step.Title\n            id=\"tours.apiTokens.CopyAPIToken.title\"\n            defaultMessage=\"Copy your new API token\"\n          />\n          <Step.Content\n            id=\"tours.apiTokens.CopyAPIToken.content\"\n            defaultMessage=\"Make sure to do it now, you won’t be able to see it again. You’ll need to generate a new one if you lose it.\"\n          />\n          <Step.Actions>\n            <StepCount tourName=\"apiTokens\" />\n            <GotItAction onClick={() => dispatch({ type: 'next_step', payload: 'apiTokens' })} />\n          </Step.Actions>\n        </Step.Root>\n      ),\n      when: (completedActions) => completedActions.includes('didCreateApiToken'),\n    },\n    {\n      name: 'Finish',\n      content: (Step) => (\n        <Step.Root side=\"right\" align=\"start\">\n          <Step.Title\n            id=\"tours.apiTokens.FinalStep.title\"\n            defaultMessage=\"It's time to deploy your application!\"\n          />\n          <Step.Content\n            id=\"tours.apiTokens.FinalStep.content\"\n            defaultMessage=\"Your application is ready to be deployed and its content to be shared with the world!\"\n          />\n          <Step.Actions showStepCount={false} to=\"/\" />\n        </Step.Root>\n      ),\n      when: (completedActions) => completedActions.includes('didCopyApiToken'),\n    },\n  ]),\n  strapiCloud: createTour('strapiCloud', []),\n} as const;\n\ntype Tours = typeof tours;\n\n/* -------------------------------------------------------------------------------------------------\n * GuidedTourTooltip\n * -----------------------------------------------------------------------------------------------*/\n\ntype Content = (\n  Step: Step,\n  {\n    state,\n    dispatch,\n  }: {\n    state: State;\n    dispatch: React.Dispatch<Action>;\n  }\n) => React.ReactNode;\n\ntype GuidedTourTooltipProps = {\n  children: React.ReactNode;\n  content: Content;\n  tourName: ValidTourName;\n  step: number;\n  when?: (completedActions: ExtendedCompletedActions) => boolean;\n};\n\nconst GuidedTourTooltip = ({ children, ...props }: GuidedTourTooltipProps) => {\n  const state = useGuidedTour('TooltipWrapper', (s) => s.state);\n\n  if (!state.enabled) {\n    return <>{children}</>;\n  }\n\n  return <GuidedTourTooltipImpl {...props}>{children}</GuidedTourTooltipImpl>;\n};\n\nconst GuidedTourOverlay = styled(Box)`\n  position: fixed;\n  top: 0;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  background-color: rgba(50, 50, 77, 0.2);\n  z-index: 10;\n`;\n\nconst GuidedTourTooltipImpl = ({\n  children,\n  content,\n  tourName,\n  step,\n  when,\n}: GuidedTourTooltipProps) => {\n  const { data: guidedTourMeta } = useGetGuidedTourMetaQuery();\n\n  const state = useGuidedTour('GuidedTourTooltip', (s) => s.state);\n  const dispatch = useGuidedTour('GuidedTourTooltip', (s) => s.dispatch);\n\n  const isCurrentStep = state.tours[tourName].currentStep === step;\n  const isStepConditionMet = when ? when(state.completedActions) : true;\n  const isPopoverOpen =\n    guidedTourMeta?.data?.isFirstSuperAdminUser &&\n    !state.tours[tourName].isCompleted &&\n    isCurrentStep &&\n    isStepConditionMet;\n\n  // Lock the scroll\n  React.useEffect(() => {\n    if (!isPopoverOpen) return;\n\n    const originalStyle = window.getComputedStyle(document.body).overflow;\n    document.body.style.overflow = 'hidden';\n\n    return () => {\n      document.body.style.overflow = originalStyle;\n    };\n  }, [isPopoverOpen]);\n\n  // TODO: This isn't great but the only solution for syncing the completed actions\n  React.useEffect(() => {\n    dispatch({\n      type: 'set_completed_actions',\n      payload: guidedTourMeta?.data?.completedActions ?? [],\n    });\n  }, [dispatch, guidedTourMeta?.data?.completedActions]);\n\n  const Step = React.useMemo(() => createStepComponents(tourName), [tourName]);\n\n  return (\n    <>\n      {isPopoverOpen && (\n        <Portal>\n          <GuidedTourOverlay />\n        </Portal>\n      )}\n      <Popover.Root open={isPopoverOpen}>\n        <Popover.Anchor>{children}</Popover.Anchor>\n        {content(Step, { state, dispatch })}\n      </Popover.Root>\n    </>\n  );\n};\n\n/* -------------------------------------------------------------------------------------------------\n * Tour factory\n * -----------------------------------------------------------------------------------------------*/\n\ntype TourStep<P extends string> = {\n  name: P;\n  content: Content;\n  when?: (completedActions: ExtendedCompletedActions) => boolean;\n};\n\nfunction createTour<const T extends ReadonlyArray<TourStep<string>>>(tourName: string, steps: T) {\n  type Components = {\n    [K in T[number]['name']]: React.ComponentType<{ children: React.ReactNode }>;\n  };\n\n  const tour = steps.reduce((acc, step, index) => {\n    if (step.name in acc) {\n      throw Error(`The tour: ${tourName} with step: ${step.name} has already been registered`);\n    }\n\n    acc[step.name as keyof Components] = ({ children }: { children: React.ReactNode }) => {\n      return (\n        <GuidedTourTooltip\n          tourName={tourName as ValidTourName}\n          step={index}\n          content={step.content}\n          when={step.when}\n        >\n          {children}\n        </GuidedTourTooltip>\n      );\n    };\n\n    return acc;\n  }, {} as Components);\n\n  return tour;\n}\n\nexport type { Content, Tours };\nexport { tours };\n"],"names":["GotItAction","onClick","_jsx","Button","FormattedMessage","id","defaultMessage","tours","contentTypeBuilder","createTour","name","content","Step","_jsxs","Root","side","withArrow","Title","Content","Actions","showSkip","sideOffset","dispatch","StepCount","tourName","type","payload","showStepCount","to","when","completedActions","includes","contentManager","align","apiTokens","strapiCloud","GuidedTourTooltip","children","props","state","useGuidedTour","s","enabled","_Fragment","GuidedTourTooltipImpl","GuidedTourOverlay","styled","Box","step","data","guidedTourMeta","useGetGuidedTourMetaQuery","isCurrentStep","currentStep","isStepConditionMet","isPopoverOpen","isFirstSuperAdminUser","isCompleted","React","useEffect","originalStyle","window","getComputedStyle","document","body","overflow","style","useMemo","createStepComponents","Portal","Popover","open","Anchor","steps","tour","reduce","acc","index","Error"],"mappings":"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"}