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

[VUE] add report date #18498

Merged
merged 3 commits into from Dec 14, 2021
Merged

[VUE] add report date #18498

merged 3 commits into from Dec 14, 2021

Conversation

peterhashair
Copy link
Contributor

@peterhashair peterhashair commented Dec 14, 2021

add report data back

Description:

Add report date back, I think is missing a test, If I am right, there is one here, but somehow it does contain the report generated date, I will make a UI test I guess. https://github.com/matomo-org/matomo/blob/4.x-dev/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png

image

Review

add report data back
@peterhashair peterhashair linked an issue Dec 14, 2021 that may be closed by this pull request
@peterhashair peterhashair added the Needs Review PRs that need a code review label Dec 14, 2021
@justinvelluppillai justinvelluppillai added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Dec 14, 2021
@justinvelluppillai
Copy link
Contributor

justinvelluppillai commented Dec 14, 2021

@peterhashair why does this pass without needing an update to a UI test screenshot?

edit: I see, because it's a date it is purposely hidden and not tested in UI tests.

Peter Zhang added 2 commits December 14, 2021 15:56
@peterhashair
Copy link
Contributor Author

peterhashair commented Dec 14, 2021

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.

Looks good to me

@sgiehl sgiehl added this to the 4.7.0 milestone Dec 14, 2021
@sgiehl sgiehl removed the Needs Review PRs that need a code review label Dec 14, 2021
@sgiehl sgiehl merged commit 933c4a4 into 4.x-dev Dec 14, 2021
@sgiehl sgiehl deleted the hotfix-report-data branch December 14, 2021 10:32
@@ -56,6 +56,8 @@
v-show="showInlineHelp"
>
<div v-html="$sanitize(actualInlineHelp)"/>
<span class="helpDate"
v-html="reportGenerated"></span>
Copy link
Member

Choose a reason for hiding this comment

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

Should this be $sanitize(reportGenerated)? v-html doesn't perform any sanitization.

Copy link
Member

Choose a reason for hiding this comment

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

The reportGenerated should contain text only, which is coming from a translation. Guess it would not hurt to add it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Report generated info missing since Matomo 4.6.x
4 participants