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 site selector model adapter and fix siteselector.vue bug #18431

Merged
merged 514 commits into from Dec 15, 2021

Conversation

diosmosis
Copy link
Member

@diosmosis diosmosis commented Dec 2, 2021

Description:

This PR is based off of #18430.

Changes:

  • Add an adapter for sitesstore => siteselector model so the angularjs code can be removed.\
  • Fix issue in SiteSelector.vue, the previous angularjs version only set the current site to the first site in the list if there was only one site in the Matomo overall. Changing that breaks the manage rollup field.

image

Review

@peterhashair
Copy link
Contributor

@diosmosis working as expected, test VUE parts, interface, and CSS. I did conflicts resolve for this PR. Can you review it, in case I merge the wrong parts?

@diosmosis
Copy link
Member Author

@peterhashair I'll check eventually, but these PRs are all based on each other like a chain. The next one to review is #18430, then when that gets merged I'll merge into the next PR, etc. This PR, eg, contains changes in other PRs so I wouldn't want to get this merged right away, instead would look at the PR it's based on first.

This is the link I've been using to look at the PRs in the order that they were created: https://github.com/matomo-org/matomo/pulls?q=is%3Apr+%5BVue%5D+sort%3Acreated-asc+is%3Aopen

@diosmosis diosmosis added Do not close PRs with this label won't be marked as stale by the Close Stale Issues action and removed Stale The label used by the Close Stale Issues action labels Dec 14, 2021
Copy link
Contributor

@peterhashair peterhashair left a comment

Choose a reason for hiding this comment

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

Review Vue and interface, working as expected, made some suggestions for the code style, but can be ignored 😀

plugins/CoreHome/vue/src/ReportingPage/ReportingPage.vue Outdated Show resolved Hide resolved
plugins/CoreHome/vue/src/ReportingPage/ReportingPage.vue Outdated Show resolved Hide resolved
@diosmosis
Copy link
Member Author

@peterhashair fixed

@sgiehl
Copy link
Member

sgiehl commented Dec 15, 2021

@diosmosis this seems to work fine. While testing I discovered anther bug in RollUpReporting that seems to be caused by the vue migration (at least it worked with Matomo 4.5).
When the all sites object is added to an roll up, it can't be removed anymore. There is no javascript error, but the dom keeps updating the site elements, without really removing it...
Feel free to merge this one and create another PR for that if you find a fix.

@sgiehl sgiehl removed the Needs Review PRs that need a code review label Dec 15, 2021
@diosmosis
Copy link
Member Author

@sgiehl 👍 just found the fix, will create a new PR

@diosmosis diosmosis merged commit ad62f30 into 4.x-dev Dec 15, 2021
@diosmosis diosmosis deleted the vue-site-selector-model branch December 15, 2021 17:26
@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 Feb 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Do not close PRs with this label won't be marked as stale by the Close Stale Issues action 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.

None yet

5 participants