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

Jump to bottom

Expand the multi-entity saving panel by default #27437

Merged
merged 3 commits into from
Dec 2, 2020
Merged

Expand the multi-entity saving panel by default #27437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abf76ea
Expand the multi-entity saving panel by default
youknowriad Dec 2, 2020
b6ccfe7
Remove the expanding capabilities
youknowriad Dec 2, 2020
bc4aa62
Fix end2end tests
youknowriad Dec 2, 2020
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
11 changes: 0 additions & 11 deletions packages/e2e-tests/specs/experiments/multi-entity-editing.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,6 @@ const openEntitySavePanel = async () => {
}
// If we made it this far, the panel is opened.

// Expand to view savable entities if necessary.
const reviewChangesButton = await page.$(
'.entities-saved-states__review-changes-button'
);
const [ needsToOpen ] = await reviewChangesButton.$x(
'//*[contains(text(),"Review changes.")]'
);
if ( needsToOpen ) {
await reviewChangesButton.click();
}

return true;
};

Expand Down
11 changes: 0 additions & 11 deletions packages/e2e-tests/specs/experiments/multi-entity-saving.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,6 @@ describe( 'Multi-entity save flow', () => {

// Reusable assertions across Post/Site editors.
const assertAllBoxesChecked = async () => {
// Expand to view savable entities if necessary.
const reviewChangesButton = await page.$(
'.entities-saved-states__review-changes-button'
);
const [ needsToOpen ] = await reviewChangesButton.$x(
'//*[contains(text(),"Review changes.")]'
);
if ( needsToOpen ) {
await reviewChangesButton.click();
}

const checkedBoxes = await page.$$( checkedBoxSelector );
const checkboxInputs = await page.$$( checkboxInputSelector );
expect( checkedBoxes.length - checkboxInputs.length ).toBe( 0 );
Expand Down
55 changes: 23 additions & 32 deletions packages/editor/src/components/entities-saved-states/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,21 @@ const PLACEHOLDER_PHRASES = {
// 0 is a back up, but should never be observed.
0: __( 'There are no changes.' ),
/* translators: placeholders represent pre-translated singular/plural entity names (page, post, template, site, etc.) */
1: __( 'Changes have been made to your %s.' ),
1: __( 'The following changes have been made to your %s.' ),
/* translators: placeholders represent pre-translated singular/plural entity names (page, post, template, site, etc.) */
2: __( 'Changes have been made to your %1$s and %2$s.' ),
2: __( 'The following changes have been made to your %1$s and %2$s.' ),
/* translators: placeholders represent pre-translated singular/plural entity names (page, post, template, site, etc.) */
3: __( 'Changes have been made to your %1$s, %2$s, and %3$s.' ),
3: __(
'The following changes have been made to your %1$s, %2$s, and %3$s.'
),
/* translators: placeholders represent pre-translated singular/plural entity names (page, post, template, site, etc.) */
4: __( 'Changes have been made to your %1$s, %2$s, %3$s, and %4$s.' ),
4: __(
'The following changes have been made to your %1$s, %2$s, %3$s, and %4$s.'
),
/* translators: placeholders represent pre-translated singular/plural entity names (page, post, template, site, etc.) */
5: __( 'Changes have been made to your %1$s, %2$s, %3$s, %4$s, and %5$s.' ),
5: __(
'The following changes have been made to your %1$s, %2$s, %3$s, %4$s, and %5$s.'
),
};

export default function EntitiesSavedStates( { isOpen, close } ) {
Expand Down Expand Up @@ -69,7 +75,7 @@ export default function EntitiesSavedStates( { isOpen, close } ) {
const placeholderPhrase =
PLACEHOLDER_PHRASES[ entityNamesForPrompt.length ] ||
// Fallback for edge case that should not be observed (more than 5 entity types edited).
__( 'Changes have been made to multiple entity types.' );
__( 'The following changes have been made to multiple entities.' );
// eslint-disable-next-line @wordpress/valid-sprintf
const promptPhrase = sprintf( placeholderPhrase, ...entityNamesForPrompt );

Expand Down Expand Up @@ -114,9 +120,6 @@ export default function EntitiesSavedStates( { isOpen, close } ) {
} );
};

const [ isReviewing, setIsReviewing ] = useState( false );
const toggleIsReviewing = () => setIsReviewing( ( value ) => ! value );

// Explicitly define this with no argument passed. Using `close` on
// its own will use the event object in place of the expected saved entities.
const dismissPanel = useCallback( () => close(), [ close ] );
Expand Down Expand Up @@ -146,31 +149,19 @@ export default function EntitiesSavedStates( { isOpen, close } ) {
<div className="entities-saved-states__text-prompt">
<strong>{ __( 'Are you ready to save?' ) }</strong>
<p>{ promptPhrase }</p>
<p>
<Button
onClick={ toggleIsReviewing }
isLink
className="entities-saved-states__review-changes-button"
>
{ isReviewing
? __( 'Hide changes.' )
: __( 'Review changes.' ) }
</Button>
</p>
</div>

{ isReviewing &&
partitionedSavables.map( ( list ) => {
return (
<EntityTypeList
key={ list[ 0 ].name }
list={ list }
closePanel={ dismissPanel }
unselectedEntities={ unselectedEntities }
setUnselectedEntities={ setUnselectedEntities }
/>
);
} ) }
{ partitionedSavables.map( ( list ) => {
return (
<EntityTypeList
key={ list[ 0 ].name }
list={ list }
closePanel={ dismissPanel }
unselectedEntities={ unselectedEntities }
setUnselectedEntities={ setUnselectedEntities }
/>
);
} ) }
</div>
) : null;
}
1 change: 0 additions & 1 deletion packages/editor/src/components/entities-saved-states/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
}

.entities-saved-states__text-prompt {
border-bottom: $border-width solid $gray-300;
padding: $grid-unit-20;
padding-bottom: $grid-unit-05;
}
Expand Down