From c493dbf9fa15eab44138a5d6592313ab73bd8dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Maneiro?= <583546+oandregal@users.noreply.github.com> Date: Mon, 4 Dec 2023 09:15:36 +0100 Subject: [PATCH] Fix rebase --- packages/dataviews/src/filter-summary.js | 2 +- .../edit-site/src/components/page-pages/index.js | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/packages/dataviews/src/filter-summary.js b/packages/dataviews/src/filter-summary.js index c7d0f2c9cbda1..3c30c6837103a 100644 --- a/packages/dataviews/src/filter-summary.js +++ b/packages/dataviews/src/filter-summary.js @@ -14,7 +14,7 @@ import { Children, Fragment } from '@wordpress/element'; * Internal dependencies */ import { OPERATOR_IN, OPERATOR_NOT_IN } from './constants'; -import { unlock } from '../../lock-unlock'; +import { unlock } from './lock-unlock'; const { DropdownMenuV2: DropdownMenu, diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js index 1ebe4f9185e6e..cc56aa15122f2 100644 --- a/packages/edit-site/src/components/page-pages/index.js +++ b/packages/edit-site/src/components/page-pages/index.js @@ -15,10 +15,11 @@ import { useSelect, useDispatch } from '@wordpress/data'; import { DataViews, ENUMERATION_TYPE, - VIEW_LAYOUTS, - OPERATOR_IN, LAYOUT_GRID, LAYOUT_TABLE, + OPERATOR_IN, + OPERATOR_NOT_IN, + VIEW_LAYOUTS, } from '@wordpress/dataviews'; /** @@ -26,15 +27,6 @@ import { */ import Page from '../page'; import Link from '../routes/link'; -import { - DataViews, - VIEW_LAYOUTS, - ENUMERATION_TYPE, - LAYOUT_GRID, - LAYOUT_TABLE, - OPERATOR_IN, - OPERATOR_NOT_IN, -} from '../dataviews'; import { default as DEFAULT_VIEWS } from '../sidebar-dataviews/default-views'; import { trashPostAction,