Skip to content

Add instruction tab for React.js to no data screen & improve JS code instruction tab #20890

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

Merged
merged 12 commits into from
Jun 19, 2023

Conversation

AltamashShaikh
Copy link
Contributor

@AltamashShaikh AltamashShaikh commented Jun 14, 2023

Description:

Merged React no data screen and JS code cleanup.
Fixes: #PG-2779, #PG-2799

Review

@AltamashShaikh AltamashShaikh added the Needs Review PRs that need a code review label Jun 14, 2023
@AltamashShaikh AltamashShaikh requested review from bx80 and sgiehl June 14, 2023 06:46
@AltamashShaikh AltamashShaikh marked this pull request as ready for review June 14, 2023 06:47
@AltamashShaikh AltamashShaikh changed the title Merged React no data screen Merged React no data screen and JS code cleanup Jun 15, 2023
@bx80
Copy link
Contributor

bx80 commented Jun 15, 2023

@AltamashShaikh I think the TagManager submodule reference might need updating in this PR?

I got this error when loading the no-data react tab:

Too few arguments to function Piwik\Plugins\TagManager\TagManager::embedReactTagManagerTrackingCode(), 
1 passed and exactly 3 expected
in /var/www/matomo/plugins/TagManager/TagManager.php line 271

The same error is shown on the UI tests. Running git submodule update after checking out this branch results in a detached head for the TagManager submodule. Checking out the TagManager 4.x-dev branch fixed the issue for me locally.

You probably need to do something like:

cd [matomo folder]
git checkout cherrypick-react-and-js-cleanup
cd plugins/TagManager
git checkout 4.x-dev
cd ../..
git add plugins/TagManager
git commit -m "Update submodule"
git push

Which should update this PR to reference the 4.x-dev branch for TagManager and fix the UI test.

@AltamashShaikh
Copy link
Contributor Author

@bx80 updated submodule as suggested

@AltamashShaikh
Copy link
Contributor Author

@sgiehl @bx80 are we good to merge this ?

@sgiehl sgiehl added this to the 4.15.0 milestone Jun 19, 2023
Copy link
Member

@sgiehl sgiehl left a comment

Choose a reason for hiding this comment

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

Only had a rough look through the code and did some quick testing in the UI, as those changes should already have been reviewed in detail for 5.x-dev. Looks good for me though.

@sgiehl sgiehl merged commit 160a170 into 4.x-dev Jun 19, 2023
@sgiehl sgiehl changed the title Merged React no data screen and JS code cleanup Add instruction tab for React.js to no data screen & improve JS code instruction tab Jul 5, 2023
@sgiehl sgiehl deleted the cherrypick-react-and-js-cleanup branch July 26, 2023 05:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review
Development

Successfully merging this pull request may close these issues.

3 participants