Skip to content

Commit

Permalink
Revert footer in pages list with DataViews (#59151)
Browse files Browse the repository at this point in the history 
Co-authored-by: ntsekouras <ntsekouras@git.wordpress.org>
Co-authored-by: youknowriad <youknowriad@git.wordpress.org>
# Conflicts:
#	packages/edit-site/src/components/sidebar/index.js
  • Loading branch information
@ntsekouras @youknowriad
ntsekouras authored and youknowriad committed Feb 20, 2024
1 parent c5f56de commit d750b3d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 105 deletions.
103 changes: 0 additions & 103 deletions packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
View file

This file was deleted.

9 changes: 7 additions & 2 deletions packages/edit-site/src/components/sidebar/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
__experimentalNavigatorScreen as NavigatorScreen,
} from '@wordpress/components';
import { privateApis as routerPrivateApis } from '@wordpress/router';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
Expand All @@ -31,7 +32,8 @@ import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen
import SaveHub from '../save-hub';
import { unlock } from '../../lock-unlock';
import SidebarNavigationScreenPages from '../sidebar-navigation-screen-pages';
import SidebarNavigationScreenPagesDataViews from '../sidebar-navigation-screen-pages-dataviews';
import SidebarNavigationScreen from '../sidebar-navigation-screen';
import DataViewsSidebarContent from '../sidebar-dataviews';
import SidebarNavigationScreenPage from '../sidebar-navigation-screen-page';

const { useLocation } = unlock( routerPrivateApis );
Expand Down Expand Up @@ -69,7 +71,10 @@ function SidebarScreens() {
<SidebarNavigationScreenPages />
</SidebarScreenWrapper>
<SidebarScreenWrapper path="/pages">
<SidebarNavigationScreenPagesDataViews />
<SidebarNavigationScreen
title={ __( 'Pages' ) }
content={ <DataViewsSidebarContent /> }
/>
</SidebarScreenWrapper>
<SidebarScreenWrapper path="/page/:postId">
<SidebarNavigationScreenPage />
Expand Down

1 comment on commit d750b3d

@github-actions
Copy link

Choose a reason for hiding this comment

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

Flaky tests detected in d750b3d.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/7971851096
📝 Reported issues:

Please sign in to comment.