[9962] Post level RRM settings #10246
Open
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 b8d40f7 are ready:
|
|
Size Change: +49.9 kB (+2.47%) Total Size: 2.07 MB
ℹ️ View Unchanged
|
ankitrox
changed the title
19 tasks
techanvil
requested changes
Feb 21, 2025
There was a problem hiding this comment.
There's no styling here, and this is how the dropdown label looks on my install (running WP 6.6.1):
The label should not be all-caps, and the text should should wrap to the next line as needed.
Let's also move the SCSS file to blocks/reader-revenue-manager/block-editor-plugin/editor-styles.scss as discussed below.
|
|
||
| export default function SettingPanel() { | ||
| return ( | ||
| <Fragment> |
There was a problem hiding this comment.
This Fragment is redundant and can be removed.
| } | ||
|
|
||
| return ( | ||
| <Fragment> |
There was a problem hiding this comment.
This Fragment can also be removed.
Comment on lines
+36
to
+37
| registerStore( Data ); | ||
|
|
There was a problem hiding this comment.
It's a bit odd having this file exporting a function to register the plugin on demand, but at the same time having the unconditional call to registerStore( Data ).
Let's move the call to registerStore to index.js where the exported function is called. Then, in the test for this file, call registerStore( Data ) in the test setup to ensure the tests still work.
Comment on lines
+56
to
+65
| dispatch( CORE_MODULES ).receiveGetModules( [ | ||
| { | ||
| slug: 'reader-revenue-manager', | ||
| active: true, | ||
| connected: true, | ||
| shareable: true, | ||
| recoverable: true, | ||
| internal: false, | ||
| }, | ||
| ] ); |
There was a problem hiding this comment.
Let's use provideModules() here, with a similar call to how it's used elsewhere for RRM:
Suggested change
| dispatch( CORE_MODULES ).receiveGetModules( [ | |
| { | |
| slug: 'reader-revenue-manager', | |
| active: true, | |
| connected: true, | |
| shareable: true, | |
| recoverable: true, | |
| internal: false, | |
| }, | |
| ] ); | |
| provideModules( Data, [ | |
| { | |
| slug: 'reader-revenue-manager', | |
| active: true, | |
| connected: true, | |
| }, | |
| ] ); |
There was a problem hiding this comment.
Taking a look at what's coming in #10247, I'd suggest a reorganisation of the files under blocks as follows:
blocks/reader-revenue-manager
├── block-editor-plugin
│ ├── editor-styles.scss
│ ├── index.js
│ ├── plugin-registration.js
│ ├── plugin-registration.test.js
│ ├── SettingPanel.js
│ └── SettingsForm.js
└── common
└── constants.js
| import { MODULES_READER_REVENUE_MANAGER } from '../../../assets/js/modules/reader-revenue-manager/datastore/constants'; | ||
|
|
||
| const { select, dispatch } = Data; | ||
| const CORE_EDITOR = 'core/editor'; |
There was a problem hiding this comment.
Let's extract this constant to blocks/reader-revenue-manager/common/constants.js, in line with the changes that are coming in https://github.com/google/site-kit-wp/pull/10247/files#diff-eebc7bb1047fb0c0e7a220332932857840c7bfdba8549a67ab518a829497024f.
| array( | ||
| 'src' => $base_url . 'js/blocks/googlesitekit-reader-revenue-manager-block-editor.js', | ||
| 'src' => $this->context->url( 'dist/assets/js/blocks/reader-revenue-manager/index.js' ), |
There was a problem hiding this comment.
Let's stick with using $base_url for consistency:
Suggested change
| 'src' => $this->context->url( 'dist/assets/js/blocks/reader-revenue-manager/index.js' ), | |
| 'src' => $base_url . 'js/blocks/reader-revenue-manager/index.js', |
Comment on lines
+44
to
+45
| 'reader-revenue-manager/index': | ||
| './blocks/reader-revenue-manager/index.js', |
There was a problem hiding this comment.
Again, taking future changes into account let's update this:
Suggested change
| 'reader-revenue-manager/index': | |
| './blocks/reader-revenue-manager/index.js', | |
| 'reader-revenue-manager/block-editor-plugin/index': | |
| './blocks/reader-revenue-manager/block-editor-plugin/index.js', |
| @@ -35,6 +35,7 @@ module.exports = ( mode ) => ( { | |||
| 'googlesitekit-wp-dashboard-css': './assets/sass/wpdashboard.scss', | |||
| 'googlesitekit-authorize-application-css': | |||
| './assets/sass/authorize-application.scss', | |||
| 'googlesitekit-block-editor-css': './assets/sass/block-editor.scss', | |||
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:
Relevant 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