Detect AMP modes correctly #7444
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Build files for 46ef775 have been deleted. |
|
Size Change: +2.44 kB (0%) Total Size: 1.41 MB
ℹ️ View Unchanged
|
techanvil
requested changes
Aug 17, 2023
There was a problem hiding this comment.
Thanks @kuasha420, this is generally looking good. I've left a few comments, please take a look.
| } ); | ||
| it.each( [ AMP_MODE_PRIMARY, AMP_MODE_SECONDARY ] )( | ||
| 'should be labeled as "Web Container" in a %s AMP context', | ||
| ( mode ) => { |
There was a problem hiding this comment.
It's a small change, but let's rename mode to ampMode, it's more explicit and means the provideSiteInfo() args below can use the shorthand { ampMode } :)
Suggested change
| ( mode ) => { | |
| ( ampMode ) => { |
| registry | ||
| .dispatch( MODULES_TAGMANAGER ) | ||
| .finishResolution( 'getContainers', [ accountID ] ); | ||
| provideSiteInfo( registry, { ampMode: mode } ); |
There was a problem hiding this comment.
As mentioned above:
Suggested change
| provideSiteInfo( registry, { ampMode: mode } ); | |
| provideSiteInfo( registry, { ampMode } ); |
| } | ||
|
|
||
| const label = isSecondaryAMP | ||
| const label = ampMode |
There was a problem hiding this comment.
Good spot here. We should do the same thing in AMPContainerSelect to keep the labels in sync:
There was a problem hiding this comment.
Looks like there's no scenario where it would render as only container, as we're rendering Web Container unconditionally. I'll remove this logic so it is always AMP Container.
| @@ -323,13 +321,14 @@ public function is_amp() { | |||
| * false if AMP not active, or unknown mode | |||
| */ | |||
| public function get_amp_mode() { | |||
| // If the Web Stories plugin is enabled, consider the site to be running | |||
There was a problem hiding this comment.
With regard to the changes in this file, IMHO it would be a little cleaner to move the non-web stories code into a separate function, say get_amp_mode_from_amp_plugin(), and then this function could be simplified along these lines. What do you think?
public function get_amp_mode() {
$amp_mode = $this->get_amp_mode_from_amp_plugin();
if ( false === $amp_mode ) {
// If the Web Stories plugin is enabled, consider the site to be running
// in Secondary AMP mode.
if ( defined( 'WEBSTORIES_VERSION' ) ) {
return self::AMP_MODE_SECONDARY;
}
}
return $amp_mode;
}
techanvil
approved these changes
Aug 21, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Addresses issue:
secondaryrather thanprimaryAMP mode (V2 AMP plugin). #5118Relevant technical choices
PR Author Checklist
Do not alter or remove anything below. The following sections will be managed by moderators only.
Code Reviewer Checklist
Merge Reviewer Checklist