Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Dashboard: Fix global error handling for widgets.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"page": "jetpack-premium-analytics"
},
"dependencies": {
"@automattic/jetpack-premium-analytics-data": "link:../../packages/data",
"@automattic/jetpack-script-data": "workspace:*",
"@jetpack-premium-analytics/routing": "workspace:*",
"@wordpress/admin-ui": "2.1.0",
Expand Down
77 changes: 40 additions & 37 deletions projects/packages/premium-analytics/routes/dashboard/stage.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GlobalErrorProvider } from '@jetpack-premium-analytics/data';
import { Page } from '@wordpress/admin-ui';
import { store as coreStore } from '@wordpress/core-data';
import { useSelect } from '@wordpress/data';
Expand Down Expand Up @@ -45,46 +46,48 @@ function Dashboard(): JSX.Element {
const [ editMode, setEditMode ] = useState( false );

return (
<WidgetDashboard
widgetTypes={ widgetTypes }
isResolvingWidgetTypes={ isResolvingWidgetTypes }
layout={ layout }
onLayoutChange={ setLayout }
onLayoutReset={ resetLayout }
gridSettings={ gridSettings }
onGridSettingsChange={ setGridSettings }
editMode={ editMode }
onEditChange={ setEditMode }
>
<Page
title={ __( 'Analytics', 'jetpack-premium-analytics' ) }
subTitle={ __(
'Track your site performance and visitor insights.',
'jetpack-premium-analytics'
) }
actions={ <WidgetDashboard.Actions /> }
className={ styles.dashboard }
<GlobalErrorProvider>
<WidgetDashboard
widgetTypes={ widgetTypes }
isResolvingWidgetTypes={ isResolvingWidgetTypes }
layout={ layout }
onLayoutChange={ setLayout }
onLayoutReset={ resetLayout }
gridSettings={ gridSettings }
onGridSettingsChange={ setGridSettings }
editMode={ editMode }
onEditChange={ setEditMode }
>
<DashboardSections
sections={ sections }
value={ activeSection }
onChange={ setActiveSection }
<Page
title={ __( 'Analytics', 'jetpack-premium-analytics' ) }
subTitle={ __(
'Track your site performance and visitor insights.',
'jetpack-premium-analytics'
) }
actions={ <WidgetDashboard.Actions /> }
className={ styles.dashboard }
>
{ sections.map( section => (
<Tabs.Panel key={ section.id } value={ section.id } className={ styles.content }>
{ activeSection === section.id ? (
<>
<WidgetDashboard.NoWidgetsState />
<WidgetDashboard.Widgets />
</>
) : null }
</Tabs.Panel>
) ) }
</DashboardSections>
<DashboardSections
sections={ sections }
value={ activeSection }
onChange={ setActiveSection }
>
{ sections.map( section => (
<Tabs.Panel key={ section.id } value={ section.id } className={ styles.content }>
{ activeSection === section.id ? (
<>
<WidgetDashboard.NoWidgetsState />
<WidgetDashboard.Widgets />
</>
) : null }
</Tabs.Panel>
) ) }
</DashboardSections>

<WidgetDashboard.Commands />
</Page>
</WidgetDashboard>
<WidgetDashboard.Commands />
</Page>
</WidgetDashboard>
</GlobalErrorProvider>
);
}

Expand Down