Skip to content

Changes to show SPA/PWA tab for no data screen #20910

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
Merged
merged 14 commits into from
Jun 23, 2023
Merged

Changes to show SPA/PWA tab for no data screen #20910

merged 14 commits into from
Jun 23, 2023

Conversation

AltamashShaikh
Copy link
Contributor

@AltamashShaikh AltamashShaikh commented Jun 19, 2023 •
edited
Loading

Description:

Changes to show SPA/PWA tab for no data screen.
Requires: matomo-org/tag-manager#647, matomo-org/tag-manager#649
Fixes: #PG-2845

Review

@sgiehl sgiehl added this to the 5.0.0 milestone Jun 20, 2023
@AltamashShaikh AltamashShaikh marked this pull request as ready for review June 21, 2023 04:30
@AltamashShaikh AltamashShaikh added the Needs Review PRs that need a code review label Jun 21, 2023
@AltamashShaikh AltamashShaikh requested review from sgiehl, bx80 and michalkleiner and removed request for bx80 June 21, 2023 04:30
@AltamashShaikh AltamashShaikh marked this pull request as draft June 21, 2023 06:18
@AltamashShaikh AltamashShaikh removed the Needs Review PRs that need a code review label Jun 21, 2023
@AltamashShaikh AltamashShaikh marked this pull request as ready for review June 21, 2023 09:01
@AltamashShaikh AltamashShaikh requested review from sgiehl, bx80 and michalkleiner and removed request for sgiehl and bx80 June 21, 2023 09:01
@AltamashShaikh AltamashShaikh added the Needs Review PRs that need a code review label Jun 21, 2023
@michalkleiner
Copy link
Contributor

@AltamashShaikh can you update the UI test screenshot? https://github.com/matomo-org/matomo/actions/runs/5330108976/jobs/9656459310?pr=20910#step:3:848

bx80
bx80 reviewed Jun 21, 2023
View reviewed changes
@AltamashShaikh
Copy link
Contributor Author

@AltamashShaikh can you update the UI test screenshot? https://github.com/matomo-org/matomo/actions/runs/5330108976/jobs/9656459310?pr=20910#step:3:848

@michalkleiner Just waiting for other TagManager PR to merge and will update the UI, I added this for review since its the end of sprint and would like to get this issue completed and get early feedback on it

@AltamashShaikh
Copy link
Contributor Author

"SiteWithoutDataSPADescription": "In the rapidly evolving digital landscape, %1$sSingle Page Applications (SPAs)%2$s and %1$sProgressive Web Apps (PWAs)%2$s have emerged as a prevalent choice for developers, given their fast load times, smooth user experience, and offline capabilities. It is easy to start tracking your SPA or PWA using Matomo Analytics. The easiest way to do this is using the Matomo Tag Manager (%3$slearn more%4$s) using the steps below, alternatively you can use the JavaScript Tracking code (%5$sfollow this guide%6$s).",

@michalkleiner Updated UI screenshot

@sgiehl
Copy link
Member

sgiehl commented Jun 22, 2023

@AltamashShaikh the UI test might need some more love ❤️ Seems some timeouts are missing to wait until the tab animation finished and also the filename of the container in the code block might differ from run to run. Might be good to dynamically replace that name with a static name, so the test can actually pass.

sgiehl
sgiehl reviewed Jun 22, 2023
View reviewed changes
@AltamashShaikh
Copy link
Contributor Author

@AltamashShaikh the UI test might need some more love heart Seems some timeouts are missing to wait until the tab animation finished and also the filename of the container in the code block might differ from run to run. Might be good to dynamically replace that name with a static name, so the test can actually pass.

@sgiehl Was able to fix the tests using timeout and replaced container with a static name for tests

@AltamashShaikh AltamashShaikh requested a review from sgiehl June 22, 2023 14:03
@michalkleiner
Copy link
Contributor

😮 seems like the stars aligned for this PR and all UI tests passed! 👍

michalkleiner
michalkleiner approved these changes Jun 23, 2023
View reviewed changes
Copy link
Contributor

@michalkleiner michalkleiner left a comment

Choose a reason for hiding this comment

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

Tested locally and works as expected. Since the majority of the content is coming from MTM anyway I'm happy with this.

michalkleiner
michalkleiner reviewed Jun 23, 2023
View reviewed changes
@sgiehl sgiehl merged commit dacebbe into 5.x-dev Jun 23, 2023
@sgiehl sgiehl deleted the PG-2845-spa branch June 23, 2023 10:12
AltamashShaikh added a commit that referenced this pull request Jun 26, 2023
@AltamashShaikh @sgiehl
Changes to show SPA/PWA tab for no data screen (#20910)
6e38533 
* Changes to show SPA/PWA tab for no data screen

* UI screenshot updated

* test cases updated

* New textual changes

* Updated UI screenshot and plugin reference

* Fix for UI test

* UI testcase fixed

* Added timeout for spa UI test

* Removed unwanted text from translation

* Updated UI screenshot

* TagManager commit reverted

* Fix possible javascript errors if materialize isn't loaded fast enough

The errors occured in UI demo screenshot tests

---------

Co-authored-by: sgiehl <stefan@matomo.org>
sgiehl added a commit that referenced this pull request Jun 26, 2023
@AltamashShaikh @sgiehl
Changes to show SPA/PWA tab for no data screen (#20928)
223f361 
* Changes to show SPA/PWA tab for no data screen (#20910)

* Changes to show SPA/PWA tab for no data screen

* UI screenshot updated

* test cases updated

* New textual changes

* Updated UI screenshot and plugin reference

* Fix for UI test

* UI testcase fixed

* Added timeout for spa UI test

* Removed unwanted text from translation

* Updated UI screenshot

* TagManager commit reverted

* Fix possible javascript errors if materialize isn't loaded fast enough

The errors occured in UI demo screenshot tests

---------

Co-authored-by: sgiehl <stefan@matomo.org>

* Updated CorePluginsAdmin

* Updated submodule

* Blank commit to trigger stalled tests

* Updated UI screenshots

---------

Co-authored-by: sgiehl <stefan@matomo.org>
Co-authored-by: Ben <ben.burgess@innocraft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michalkleiner michalkleiner michalkleiner approved these changes

@bx80 bx80 bx80 left review comments

@sgiehl sgiehl Awaiting requested review from sgiehl

Assignees
No one assigned
Labels
Needs Review PRs that need a code review
Milestone
5.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@AltamashShaikh @michalkleiner @sgiehl @bx80