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

PLANET-7635 Move remaining code from plugin #2483

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

PLANET-7635 Move remaining code from plugin #2483

wants to merge 16 commits into from
+1,608 −117

Conversation

mleray
Copy link
Contributor

@mleray mleray commented Dec 18, 2024 •
edited
Loading

Description

See PLANET-7635

Moved code:

Other changes

  • Remove last uses of p4bk_vars
  • Wait for DOM content to be loaded before using frontend functions in app.js
  • Fix Happy Point default image
  • Moved filters from planet4-plugin-gutenberg-blocks

Note: the editor validation feature also needs to be moved, it's done in #2470

@mleray mleray self-assigned this Dec 18, 2024
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 6bb6fea1
a54f281 
/unhold fa41d8a9-8b7d-4dac-a210-1c1beff7f362
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 6f8692b0
0603334 
/unhold 600b91e4-0af2-4943-8b1f-2efd4982d0ff
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 290f7719
510a24c 
/unhold ba88e203-4e03-4a37-9697-60664f3321cc
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 4b216e9d
9e5326f 
/unhold 21dc9923-08b4-42a2-a8ce-e4c03787cd01
@mleray mleray force-pushed the plugin-retirement branch 2 times, most recently from a67d320 to f643e97 Compare December 18, 2024 14:56
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at f643e97f
37fcaff 
/unhold aefb8362-e8ba-4cf9-a778-05e8a5fe5898
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 0d1ff16e
32164c9 
/unhold e7ca49ea-424a-4b4b-9f0c-187c20179cb4
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 0088adb2
f98d69b 
/unhold a81dcfe8-f6a4-45dc-9a00-1be5f0489e6f
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 239889eb
4f399b6 
/unhold 15c9f992-8501-459c-bf82-325d11d93fa6
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at bb5f4205
ee3c899 
/unhold 122a1fc2-04e1-43df-babe-8e5b3638925c
@mleray mleray force-pushed the plugin-retirement branch 2 times, most recently from 925c4a3 to 447ecf7 Compare December 18, 2024 15:50
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 925c4a39
cb8f4a4 
/unhold 684c4a03-dbf6-418c-89ec-7999c59fd837
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 447ecf7e
f4866d1 
/unhold b4e119b3-104b-4798-af3b-89778ea1c25b
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 48c2771a
3cd31d0 
/unhold d0ff754a-d777-4fb8-9f3e-9abe12e5ae16
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at ec06f4db
040ae3b 
/unhold 7347750d-5a3b-474e-b1e6-ea2b6def96f2
planet-4 added a commit to greenpeace/planet4-test-titan that referenced this pull request Dec 18, 2024
@planet-4
greenpeace/planet4-master-theme#2483 at 001aaf26
f71efb6 
/unhold 7c44179c-eaf0-46cd-8494-5768d7469a80
@mleray
Copy link
Contributor Author

mleray commented Jan 14, 2025

Do we have to move the code lines 129 to 154 from the planet4-gutenberg-blocks.php file?
In the planet4-gutenberg-blocks.php file, starting at line 164 there are a bunch of actions and filters. Should we move them, too?

@mardelnet both great catches and now moved!

@mleray mleray requested a review from mardelnet January 14, 2025 15:08
@mleray
Copy link
Contributor Author

mleray commented Jan 14, 2025 •
edited
Loading

Do we have to move these elements?

  • classes/command/class-controller.php
  • classes/controller/class-uninstall-controller.php
  • classes/exception/class-notimplemented.php

For these, again I'll refer to @comzeradd, sorry but I'm not sure 😬

Edit: @comzeradd the only one I'm unsure of is classes/command/class-controller.php, because:

  • classes/controller/class-uninstall-controller.php is for uninstalling the plugin so it shouldn't be needed anymore once we deprecate it
  • classes/exception/class-notimplemented.php seemed to be used only in this update_data function that we never use, so I removed this code

@comzeradd
Copy link
Member

Edit: this second endpoint seems to be only used in this function, which itself seems to never be called? Pinging @comzeradd again to double-check 😬

Yes, I couldn't find any usage of this function either. We should probably also clean up that code in the theme then.

planet-4 added a commit to greenpeace/planet4-test-umbriel that referenced this pull request Jan 15, 2025
@planet-4
greenpeace/planet4-master-theme#2483 at a0850c6b
3195dff 
/unhold fd5701f1-903a-4752-8ade-8453eb35ba00
planet-4 added a commit to greenpeace/planet4-test-umbriel that referenced this pull request Jan 15, 2025
@planet-4
greenpeace/planet4-master-theme#2483 at d0fd1b18
ead7e84 
/unhold a40ed880-76a9-4775-80a9-e09d2e4a8c4e
@comzeradd
Copy link
Member

@comzeradd the only one I'm unsure of is classes/command/class-controller.php, because:

I think it's fine to leave this out. We already have moved the menu options for this functionality.

@mleray mleray force-pushed the plugin-retirement branch from d0fd1b1 to c798b57 Compare January 20, 2025 09:15
planet-4 added a commit to greenpeace/planet4-test-umbriel that referenced this pull request Jan 20, 2025
@planet-4
greenpeace/planet4-master-theme#2483 at c798b573
08d89e2 
/unhold 12df2ee6-d894-4b8e-b7ad-1911f6e884c2
mardelnet
mardelnet reviewed Jan 20, 2025
View reviewed changes
Copy link
Contributor

@mardelnet mardelnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great job, @mleray
Once the file conflict is solved, I'll approve this PR.
However, due to the complexity and risk of merging this, I'd suggest you go for a second approval and UAT approval, as well.

mleray added 16 commits January 20, 2025 16:31
@mleray
PLANET-7635 Move remaining code from plugin
86d542e 
This is in preparation to finally retire it
@mleray
Remove uses of p4bk_vars
5328806 
This was set in the plugin but in the theme we use p4_vars
@mleray
Wait for DOM content to be loaded for frontend functions
1b9ccd2 
This is causing issues otherwise
@mleray
Fix Happy Point default image
23dc5b8 
We made some simplifications when migrating the block to the theme that broke this behaviour
@mleray
Remove File CSS file
094ae34 
We can just add these in the editor overrides
@mleray
Simplify HappyPoint image selection
59826ae 
This removes one line of code with an unnecessary variable
@mleray
Simplify BlockFilters file
2b753b8 
This removes a file and some unnecessary code
@mleray
Add missing JS docs
a8469f5 
This was requested by PR feedback
@mleray
Move HTMLSidebarHelp and EmptyMessage CSS
3d39901 
These were really small files so we can directly include the code in editorStyle
@mleray
Remove unnecessary Articles frontendRendered file
de0381c 
Not sure why this function was duplicated there
@mleray
Fix small typo
552a81e 
The slug was incorrect
@mleray
Move Query Loop pagination filters to the theme
10c4d19 
These used to be in the plugin
@mleray
Move RTL fix to the theme
03a055e 
This used to be in the plugin
@mleray
Move breakpoint image sizes to the theme
871bbf6 
This filter used to be in the plugin
@mleray
Remove saveMetaToPreview function
4c6f38e 
This is no longer used
@mleray
Remove update_data function from BaseBlock.php
1f43bc6 
This was not used
@mleray mleray force-pushed the plugin-retirement branch from c798b57 to 1f43bc6 Compare January 20, 2025 15:32
@mleray mleray requested a review from mardelnet January 20, 2025 15:32
planet-4 added a commit to greenpeace/planet4-test-umbriel that referenced this pull request Jan 20, 2025
@planet-4
greenpeace/planet4-master-theme#2483 at 1f43bc60
131b193 
/unhold 10493e6b-e1e1-40b8-a504-598a05080640
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mardelnet mardelnet mardelnet approved these changes

@GP-Dan-Tovbein GP-Dan-Tovbein Awaiting requested review from GP-Dan-Tovbein

@sagarsdeshmukh sagarsdeshmukh Awaiting requested review from sagarsdeshmukh sagarsdeshmukh was automatically assigned from greenpeace/planet-4-developers

@comzeradd comzeradd Awaiting requested review from comzeradd

Assignees

@mleray mleray

Labels
Review [Test Env] umbriel
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mleray @planet-4 @comzeradd @mardelnet