diff --git a/packages/edit-post/src/components/sidebar/post-status/index.js b/packages/edit-post/src/components/sidebar/post-status/index.js index ed828e2d1d557..d6a9312623297 100644 --- a/packages/edit-post/src/components/sidebar/post-status/index.js +++ b/packages/edit-post/src/components/sidebar/post-status/index.js @@ -15,6 +15,7 @@ import { PostURLPanel, PostTemplatePanel, PostFeaturedImagePanel, + PostStatus as PostStatusPanel, store as editorStore, } from '@wordpress/editor'; @@ -62,6 +63,7 @@ export default function PostStatus() { { ( fills ) => ( <> + diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/index.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/index.js index 552367c5777c4..de84ede653ff0 100644 --- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/index.js +++ b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/index.js @@ -30,39 +30,27 @@ import PageContent from './page-content'; import PageSummary from './page-summary'; export default function PagePanels() { - const { - id, - type, - hasResolved, - status, - date, - password, - title, - modified, - renderingMode, - } = useSelect( ( select ) => { - const { getEditedPostContext } = select( editSiteStore ); - const { getEditedEntityRecord, hasFinishedResolution } = - select( coreStore ); - const { getRenderingMode } = select( editorStore ); - const context = getEditedPostContext(); - const queryArgs = [ 'postType', context.postType, context.postId ]; - const page = getEditedEntityRecord( ...queryArgs ); - return { - hasResolved: hasFinishedResolution( - 'getEditedEntityRecord', - queryArgs - ), - title: page?.title, - id: page?.id, - type: page?.type, - status: page?.status, - date: page?.date, - password: page?.password, - modified: page?.modified, - renderingMode: getRenderingMode(), - }; - }, [] ); + const { hasResolved, title, modified, renderingMode } = useSelect( + ( select ) => { + const { getEditedPostContext } = select( editSiteStore ); + const { getEditedEntityRecord, hasFinishedResolution } = + select( coreStore ); + const { getRenderingMode } = select( editorStore ); + const context = getEditedPostContext(); + const queryArgs = [ 'postType', context.postType, context.postId ]; + const page = getEditedEntityRecord( ...queryArgs ); + return { + hasResolved: hasFinishedResolution( + 'getEditedEntityRecord', + queryArgs + ), + title: page?.title, + modified: page?.modified, + renderingMode: getRenderingMode(), + }; + }, + [] + ); if ( ! hasResolved ) { return null; @@ -88,13 +76,7 @@ export default function PagePanels() { /> - + { renderingMode !== 'post-only' && ( diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-summary.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-summary.js index f00740639e9ad..e833d79792d0b 100644 --- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-summary.js +++ b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/page-summary.js @@ -8,30 +8,14 @@ import { PostSchedulePanel, PostTemplatePanel, PostFeaturedImagePanel, + PostStatus, } from '@wordpress/editor'; -/** - * Internal dependencies - */ -import PageStatus from './page-status'; - -export default function PageSummary( { - status, - date, - password, - postId, - postType, -} ) { +export default function PageSummary() { return ( - + diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/style.scss b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/style.scss index 6ccf4b63ed8e1..ff4367c15f433 100644 --- a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/style.scss +++ b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/style.scss @@ -3,38 +3,3 @@ .edit-site-page-panels__swap-template__confirm-modal__actions { margin-top: $grid-unit-30; } - -.edit-site-change-status__content { - .components-popover__content { - min-width: 320px; - padding: $grid-unit-20; - } - - .edit-site-change-status__options { - .components-base-control__field > .components-v-stack { - gap: $grid-unit-10; - } - - label { - .components-text { - display: block; - } - } - } - - .edit-site-change-status__password-legend { - padding: 0; - margin-bottom: $grid-unit-10; - } -} - -.edit-site-summary-field__trigger { - max-width: 100%; - - // Truncate - display: block; - text-align: left; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-page/page-details.js b/packages/edit-site/src/components/sidebar-navigation-screen-page/page-details.js index 7fcedcf40ce13..01eda4ee81729 100644 --- a/packages/edit-site/src/components/sidebar-navigation-screen-page/page-details.js +++ b/packages/edit-site/src/components/sidebar-navigation-screen-page/page-details.js @@ -8,11 +8,11 @@ import { useSelect } from '@wordpress/data'; import { decodeEntities } from '@wordpress/html-entities'; import { store as coreStore, useEntityRecord } from '@wordpress/core-data'; import { safeDecodeURIComponent } from '@wordpress/url'; +import { PostStatusLabel } from '@wordpress/editor'; /** * Internal dependencies */ -import StatusLabel from './status-label'; import { unlock } from '../../lock-unlock'; import { store as editSiteStore } from '../../store'; import { @@ -35,7 +35,7 @@ function getPageDetails( page ) { { label: __( 'Status' ), value: ( - %s' ), - relateToNow - ), - { time: