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.

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

End of Support Plugin for Joomla 4.4 #40565

Merged
merged 37 commits into from
May 24, 2023

Conversation

mfleeson
Copy link
Contributor

@mfleeson mfleeson commented May 9, 2023

Pull Request for Issue # .

Originally this code was monitored and checked in #40556
I messed up my local installation and then managed to close the original PR when I renamed the branch. Mea Culpa. My apologies.

Summary of Changes

Rewriting the 3.10 End of Service Notification and placing it into Joomla 4 coding structure and style.
Simplified the language definitions to not be hardcoded for 3 to 4
Currently using const EOS_DATE = '2023-10-25'; in file plugins/quickicon/eos/src/Extension/Eos.php The correct date should be 2025-10-25 but then the notification does not appear.
Dimitris converted the jQuery code into working javascript for closing the notification and also calling the com_ajax so the hide me is stored in the plugin parameters.

Testing Instructions

Build.
Check plg_quickicon_eos is enabled.
View Home Dashboard in the back end.

Actual result BEFORE applying this Pull Request

No notification is displayed

Expected result AFTER applying this Pull Request

A notification is displayed

Link to documentations

Please select:

  • Documentation link for docs.joomla.org:

  • No documentation changes for docs.joomla.org needed

  • Pull Request link for manual.joomla.org:

  • No documentation changes for manual.joomla.org needed

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.4-dev labels May 9, 2023
@mfleeson mfleeson mentioned this pull request May 9, 2023
3 tasks
@mfleeson mfleeson self-assigned this May 9, 2023
@alikon
Copy link
Contributor

alikon commented May 9, 2023

I messed up my local installation

@mfleeson: me ? quite often too 😃

@mfleeson
Copy link
Contributor Author

mfleeson commented May 9, 2023

Build is failing due to a missing , in the base.sql file and when that's manually corrected the announcement is displayed and closes. But does not appear to call the ajax to write back to the database. Need to investigate further now I have a working 4.4 site.

plugins/quickicon/eos/src/Extension/Eos.php Show resolved Hide resolved
plugins/quickicon/eos/src/Extension/Eos.php Outdated Show resolved Hide resolved
plugins/quickicon/eos/src/Extension/Eos.php Outdated Show resolved Hide resolved
plugins/quickicon/eos/src/Extension/Eos.php Outdated Show resolved Hide resolved
plugins/quickicon/eos/src/Extension/Eos.php Outdated Show resolved Hide resolved
plugins/quickicon/eos/src/Extension/Eos.php Outdated Show resolved Hide resolved
mfleeson and others added 5 commits May 9, 2023 22:48
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
Co-authored-by: heelc29 <66922325+heelc29@users.noreply.github.com>
plugins/quickicon/eos/services/provider.php Outdated Show resolved Hide resolved
plugins/quickicon/eos/services/provider.php Outdated Show resolved Hide resolved
plugins/quickicon/eos/services/provider.php Outdated Show resolved Hide resolved
plugins/quickicon/eos/src/Extension/Eos.php Outdated Show resolved Hide resolved
plugins/quickicon/eos/src/Extension/Eos.php Outdated Show resolved Hide resolved
@laoneo
Copy link
Member

laoneo commented May 10, 2023

Please do not catch all the exceptions better to propagate them to the client.

@mfleeson
Copy link
Contributor Author

I've come to the code this morning knowng that a lot of the changes being requested have been made and git tells me my fork which is based 4.4 is behind. It offered sync the fork which i clicked and it synced it with 4.3! so now it's saying i'm 140 commits ahead of 4.3. I don't understand how even though I created the fork on 4.4 and it worked fine yesterday it's now all gone back to 4.3. And I'm not sure how to get my fork back to 4.4 so I can make these last few uploads. Hope someone can help.

mfleeson and others added 2 commits May 10, 2023 09:57
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
@mfleeson
Copy link
Contributor Author

Overnight this PR has aquired extra files which are not part of my commit. When I try and remove them from the PR I get Looks like something went wrong!

We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.

@mfleeson
Copy link
Contributor Author

It just gets better, I have the definitive code but it wont let me push it and gives the error "remote: fatal: bad tree object fa00be88a9b5283659b312b36877286b9c8f1f08 remote: aborting due to possible repository corruption on the remote side.
fatal: protocol error: bad pack header"

@mfleeson
Copy link
Contributor Author

@laoneo
Copy link
Member

laoneo commented May 10, 2023

I think it should be back to normal, merged 4.3 into 4.4 and updated this pr.

@laoneo laoneo changed the title End of Support Plugin for Joomla 4.4 (based on previous PR #40556) End of Support Plugin for Joomla 4.4 May 10, 2023
@dgrammatiko
Copy link
Contributor

@mfleeson to fix the failing tests change this line

messageContainer.insertAdjacentHTML('beforeend', Joomla.sanitizeHtml(json.html, allowed));

to

messageContainer.insertAdjacentHTML('afterbegin', Joomla.sanitizeHtml(json.html, allowed));

@laoneo
Copy link
Member

laoneo commented May 15, 2023

Thank you very much to all the testers and reviewers here, and especially @mfleeson for your great work. Just a short reminder. We will ship the first alpha on 30 May. So it would be cool to heave it ready in a proper state by the end of this week. Then we have enough time to iron out some bugs till the shipping date.

@richard67
Copy link
Member

Thank you very much to all the testers and reviewers here, and especially @mfleeson for your great work. Just a short reminder. We will ship the first alpha on 30 May. So it would be cool to heave it ready in a proper state by the end of this week. Then we have enough time to iron out some bugs till the shipping date.

@laoneo @mfleeson It still needs to change the EOS date to the right value here: https://github.com/joomla/joomla-cms/pull/40565/files#diff-43fd4a40d7409ad1e608154c3e900ae13a92340cf68d97225fccdcc9e300c008R42 . We can't leave it like it is because the value '2023-10-25' was just for testing purpose.

@dgrammatiko
Copy link
Contributor

On top of what @richard67 wrote above there's #40599 which fixes the tests (the last 2-3 commits). I guess @laoneo should decide if he wants the tests fixed with this PR or in another.

@laoneo
Copy link
Member

laoneo commented May 15, 2023

All I wanted to point out was that the failing tests should not hold back the progress of this pr. If they can get fixed it is even better.

@sandewt
Copy link
Contributor

sandewt commented May 15, 2023

When you click on the image with the text, a link will open in the same screen. It would be nicer to open the documentation in another screen (target="_blank"), like in the J3 plugin.
I don't see immediately a solution when I look at the code. Because J4 is something different.
Schermafbeelding 2023-05-15 165230
An adjustment is not in a hurry at the moment. Can always do so later if we think this should be done.

@richard67
Copy link
Member

@sandewt Yes, I've noticed that, too. It might be out of the scope of this PR here to fix that because it seems to be a general thing with the quickicons in J4.

@dgrammatiko
Copy link
Contributor

FWIW #40602 should fix the failing tests so only the date should be changed here. @laoneo check the #40602

@MacJoom
Copy link
Contributor

MacJoom commented May 22, 2023

@mfleeson Thank you for your work - could you please change the date to correct value in 2025?

@MacJoom MacJoom merged commit 52d9fcc into joomla:4.4-dev May 24, 2023
@laoneo laoneo removed the Updates Requested Indicates that this pull request needs an update from the author and should not be tested. label May 24, 2023
@sandewt
Copy link
Contributor

sandewt commented May 24, 2023

Update Eos.php - set hardcoded date to 2025-10-25

Something is wrong here, the date is not correct according to the roadmap.

@mfleeson
Copy link
Contributor Author

The reason I hadn't set the final date was because it was being discussed at a recent meeting. Also the text definitions still need to be updated once finalised. Please reopen my branch. The current date from https://developer.joomla.org/roadmap.html is 17th October 2025 for end of support for J4.X

@heelc29
Copy link
Contributor

heelc29 commented Jun 27, 2023

@MacJoom Could you please add the milestone for J4.4?

@MacJoom MacJoom added this to the Joomla! 4.4.0 milestone Jun 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.4-dev
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants