Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with onboarding in AI branch #428

Merged
merged 3 commits into from
Feb 1, 2024
Merged

Fix issue with onboarding in AI branch #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7ada26
fix issue with onboarding in AI branch
mr-vara Jan 25, 2024
9245739
Fix issue with step complete
mr-vara Jan 25, 2024
81acdfc
Merge branch 'enhance/ai-onboarding' into fix-press2-1589-onboarding-…
mr-vara Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/OnboardingSPA/components/Button/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* @return Button
*/

const Button = ( { children, onClick, disabled, className } ) => {
const Button = ( { text, handleClick, disabled, className } ) => {
const handleBtnClick = () => {
if ( onClick ) {
onClick();
if ( handleClick ) {
handleClick();
}
Comment on lines +10 to 12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if ( handleClick ) {
handleClick();
}
if ( typeof handleClick === 'function' ) {
handleClick();
}

};

Expand All @@ -19,7 +19,7 @@ const Button = ( { children, onClick, disabled, className } ) => {
onClick={ handleBtnClick }
disabled={ disabled }
>
{ children }
{ text }
</button>
);
};
Expand Down
3 changes: 2 additions & 1 deletion src/OnboardingSPA/components/HeadingWithSubHeading/SiteGen/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import { ThemeContext } from '../../ThemeContextProvider';
*/

const HeadingWithSubHeading = ( { title, subtitle } ) => {
const { theme } = useContext( ThemeContext );
const themeContext = useContext( ThemeContext );
const theme = themeContext?.theme || false;

return (
<div className="nfd-onboarding-step__heading">
Expand Down
61 changes: 37 additions & 24 deletions src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteBuild/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
select( nfdOnboardingStore ).getPluginInstallHash(),
};
},
[ location.pathname ]

Check warning on line 104 in src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteBuild/index.js

View workflow job for this annotation

GitHub Actions / Run Lint Checks 

React Hook useSelect has an unnecessary dependency: 'location.pathname'. Either exclude it or remove the dependency array
);

const [ isRequestPlaced, setIsRequestPlaced ] = useState( false );
Expand Down Expand Up @@ -334,7 +334,9 @@

if ( lastChapter !== currentChapter ) {
if ( lastChapter ) {
currentData.data.chapters[ lastChapter ].completed = true;
if ( currentData.data.chapters[ lastChapter ] ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why currentData.data.chapters[ lastChapter ] does not exist in the first place?

currentData.data.chapters[ lastChapter ].completed = true;
}
trackOnboardingEvent(
new OnboardingEvent(
ACTION_ONBOARDING_CHAPTER_COMPLETE,
Expand All @@ -344,7 +346,11 @@
}

if ( currentChapter ) {
currentData.data.chapters[ currentChapter ].completed = false;
if ( currentData.data.chapters[ currentChapter ] ) {
currentData.data.chapters[
currentChapter
].completed = false;
}
trackOnboardingEvent(
new OnboardingEvent(
ACTION_ONBOARDING_CHAPTER_STARTED,
Expand All @@ -364,7 +370,7 @@

useEffect( () => {
trackChapters();
}, [ currentStep ] );

Check warning on line 373 in src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteBuild/index.js

View workflow job for this annotation

GitHub Actions / Run Lint Checks 

React Hook useEffect has a missing dependency: 'trackChapters'. Either include it or remove the dependency array

const prioritizeFlow = () => {
const currentFlow = window.nfdOnboarding.currentFlow;
Expand Down Expand Up @@ -405,13 +411,13 @@
initializeSettings();
setInterval( cronTrigger, 45000 );
}
}, [ initialize ] );

Check warning on line 414 in src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteBuild/index.js

View workflow job for this annotation

GitHub Actions / Run Lint Checks 

React Hook useEffect has a missing dependency: 'pluginInstallHash'. Either include it or remove the dependency array

useEffect( () => {
if ( false !== brandConfig?.prioritization ) {
return prioritizeFlow();
}
}, [ experienceLevel, topPriority ] );

Check warning on line 420 in src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteBuild/index.js

View workflow job for this annotation

GitHub Actions / Run Lint Checks 

React Hook useEffect has missing dependencies: 'brandConfig?.prioritization' and 'prioritizeFlow'. Either include them or remove the dependency array

useEffect( () => {
document.body.classList.add( `nfd-brand-${ newfoldBrand }` );
Expand All @@ -421,7 +427,7 @@
syncStoreToDB();
handlePreviousStepTracking();
handleConditionalDesignStepsRoutes();
}, [ location.pathname, onboardingFlow ] );

Check warning on line 430 in src/OnboardingSPA/components/NewfoldInterfaceSkeleton/SiteBuild/index.js

View workflow job for this annotation

GitHub Actions / Run Lint Checks 

React Hook useEffect has missing dependencies: 'handleConditionalDesignStepsRoutes', 'handlePreviousStepTracking', and 'syncStoreToDB'. Either include them or remove the dependency array

const isForkStep =
currentStep === stepTheFork ||
Expand All @@ -434,28 +440,35 @@
isForkStep
);

return (
<ThemeProvider>
<ThemedNewfoldInterfaceSkeleton
className={ classNames(
'nfd-onboarding-skeleton',
`brand-${ newfoldBrand }`,
`path-${ pathname }`,
{ 'is-drawer-open': isDrawerOpen },
{ 'is-large-viewport': isLargeViewport },
{ 'is-small-viewport': ! isLargeViewport },
{
'nfd-onboarding-skeleton--sitegen': isForkStep,
}
) }
header={ <Header /> }
drawer={ <Drawer /> }
content={ <Content /> }
sidebar={ <Sidebar /> }
footer={ isForkStep ? <Footer /> : null }
/>
</ThemeProvider>
);
const commonSkeletonProps = {
className: classNames(
'nfd-onboarding-skeleton',
`brand-${ newfoldBrand }`,
`path-${ pathname }`,
{ 'is-drawer-open': isDrawerOpen },
{ 'is-large-viewport': isLargeViewport },
{ 'is-small-viewport': ! isLargeViewport },
{ 'nfd-onboarding-skeleton--sitegen': isForkStep }
),
header: <Header />,
drawer: <Drawer />,
content: <Content />,
sidebar: <Sidebar />,
footer: isForkStep ? <Footer /> : null,
};

const renderSkeleton = ( Component ) =>
isForkStep ? (
<ThemeProvider>
<Component { ...commonSkeletonProps } />
</ThemeProvider>
) : (
<Component { ...commonSkeletonProps } />
);

return isForkStep
? renderSkeleton( ThemedNewfoldInterfaceSkeleton )
: renderSkeleton( NewfoldInterfaceSkeleton );
};

export default SiteBuild;
15 changes: 10 additions & 5 deletions src/OnboardingSPA/components/NewfoldInterfaceSkeleton/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,16 @@ function NewfoldInterfaceSkeleton(
ref
) {
const navigateRegionsProps = useNavigateRegions( shortcuts );
const { theme } = useContext( ThemeContext );
useHTMLClass(
'nfd-interface-interface-skeleton__html-container',
theme === THEME_DARK
);
const isSiteGenFlow = window.nfdOnboarding.currentFlow === 'sitegen';
if ( isSiteGenFlow ) {
// eslint-disable-next-line react-hooks/rules-of-hooks
const { theme } = useContext( ThemeContext );
// eslint-disable-next-line react-hooks/rules-of-hooks
useHTMLClass(
'nfd-interface-interface-skeleton__html-container',
theme === THEME_DARK
);
}

const defaultLabels = {
/* translators: accessibility text for the nav bar landmark region. */
Expand Down
Loading