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

Style panel: use correct revisions count #67180

Merged
merged 2 commits into from
Nov 24, 2024
+23 −19
Merged

Style panel: use correct revisions count #67180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33d0c43
For the styles panel, send the correct recordCount via optional prop …
ramonjd Nov 20, 2024
409b9a3
Implement feedback
ramonjd Nov 22, 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
18 changes: 15 additions & 3 deletions packages/edit-site/src/components/sidebar-navigation-screen-details-footer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import SidebarNavigationItem from '../sidebar-navigation-item';

export default function SidebarNavigationScreenDetailsFooter( {
record,
revisionsCount,
...otherProps
} ) {
/*
Expand All @@ -34,9 +35,20 @@ export default function SidebarNavigationScreenDetailsFooter( {
const hrefProps = {};
const lastRevisionId =
record?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id ?? null;
const revisionsCount =
record?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
// Enable the revisions link if there is a last revision and there are more than one revisions.

// Use incoming prop first, then the record's version history, if available.
revisionsCount =
revisionsCount ||
record?._links?.[ 'version-history' ]?.[ 0 ]?.count ||
0;

/*
* Enable the revisions link if there is a last revision and there is more than one revision.
* This link is used for theme assets, e.g., templates, which have no database record until they're edited.
* For these files there's only a "revision" after they're edited twice,
* which means the revision.php page won't display a proper diff.
* See: https://github.com/WordPress/gutenberg/issues/49164.
*/
if ( lastRevisionId && revisionsCount > 1 ) {
hrefProps.href = addQueryArgs( 'revision.php', {
revision: record?._links[ 'predecessor-version' ][ 0 ].id,
Expand Down
24 changes: 8 additions & 16 deletions packages/edit-site/src/components/sidebar-navigation-screen-global-styles/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,15 @@ export function SidebarNavigationItemGlobalStyles( props ) {
export default function SidebarNavigationScreenGlobalStyles() {
const history = useHistory();
const { params } = useLocation();
const { revisions, isLoading: isLoadingRevisions } =
useGlobalStylesRevisions();
const {
revisions,
isLoading: isLoadingRevisions,
revisionsCount,
} = useGlobalStylesRevisions();
const { openGeneralSidebar } = useDispatch( editSiteStore );
const { setEditorCanvasContainerView } = unlock(
useDispatch( editSiteStore )
);
const { revisionsCount } = useSelect( ( select ) => {
const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
select( coreStore );
const globalStylesId = __experimentalGetCurrentGlobalStylesId();
const globalStyles = globalStylesId
? getEntityRecord( 'root', 'globalStyles', globalStylesId )
: undefined;
return {
revisionsCount:
globalStyles?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0,
};
}, [] );
const { set: setPreference } = useDispatch( preferencesStore );

const openGlobalStyles = useCallback( async () => {
Expand Down Expand Up @@ -95,10 +86,10 @@ export default function SidebarNavigationScreenGlobalStyles() {
}, [ openGlobalStyles, setEditorCanvasContainerView ] );

// If there are no revisions, do not render a footer.
const hasRevisions = revisionsCount > 0;
const modifiedDateTime = revisions?.[ 0 ]?.modified;
const shouldShowGlobalStylesFooter =
hasRevisions && ! isLoadingRevisions && modifiedDateTime;
revisionsCount > 0 && ! isLoadingRevisions && modifiedDateTime;

return (
<>
<SidebarNavigationScreen
Expand All @@ -114,6 +105,7 @@ export default function SidebarNavigationScreenGlobalStyles() {
shouldShowGlobalStylesFooter && (
<SidebarNavigationScreenDetailsFooter
record={ revisions?.[ 0 ] }
revisionsCount={ revisionsCount }
onClick={ openRevisions }
/>
)
Expand Down
Loading