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

Show dialog when active contributors per month limit is hit #3676

Open
wants to merge 18 commits into
base: master
Choose a base branch
from

Conversation

ValentinBuira
Copy link
Contributor

@ValentinBuira ValentinBuira commented Nov 14, 2024

This PR add a new dialog when user try to sync while they have already hit the active contributor per month limit

Screenshot from 2024-11-14 12-32-41

Note for reviewer the error live and is triggered in synchronizationerror and synchronizationmanager

Resolve https://github.com/orgs/MerginMaps/projects/15/views/1?pane=issue&itemId=86203521

Copy link

github-actions bot commented Nov 14, 2024

Pull Request Test Coverage Report for Build 11930671912

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 59 unchanged lines in 3 files lost coverage.
  • Overall coverage increased (+0.03%) to 60.431%

Files with Coverage Reduction New Missed Lines %
input/core/merginapi.cpp 3 78.95%
input/app/synchronizationerror.cpp 6 30.43%
input/app/mmstyle.h 50 1.94%
Totals Coverage Status
Change from base Build 11788282153: 0.03%
Covered Lines: 7882
Relevant Lines: 13043

💛 - Coveralls

Copy link
Contributor

@VitorVieiraZ VitorVieiraZ 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. I’ve left only comments about code styling and a suggestion for when apiSupportsSubscriptions is false.

app/qml/dialogs/MMMonthlyContributorsLimitDialog.qml Outdated Show resolved Hide resolved
app/qml/main.qml Outdated Show resolved Hide resolved
Copy link
Contributor

@VitorVieiraZ VitorVieiraZ left a comment

Choose a reason for hiding this comment

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

Fix tests

app/qml/dialogs/MMMonthlyContributorsLimitDialog.qml Outdated Show resolved Hide resolved
app/qml/main.qml Outdated Show resolved Hide resolved
app/qml/main.qml Outdated Show resolved Hide resolved
app/inputhelp.cpp Outdated Show resolved Hide resolved
app/synchronizationerror.cpp Outdated Show resolved Hide resolved
app/synchronizationerror.cpp Outdated Show resolved Hide resolved
Copy link
Collaborator

@tomasMizera tomasMizera left a comment

Choose a reason for hiding this comment

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

Just a tiny change, feel free to merge once adjusted 👍🏻 Thanks!

@@ -895,6 +901,10 @@ ApplicationWindow {
storageLimitDialog.open()
}

function onMonthlyContributorLimitReached( uploadSize ) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

We do not use this uploadSize anywhere. What would be nice though is to include the actual limit - similarly to what we did on plugin (see MerginMaps/qgis-plugin@f1ea460#diff-d5f841eda10b7504474461cbece2f5a718c04995de1956f64f1674138655c675R28)

Suggested change
function onMonthlyContributorLimitReached( uploadSize ) {
function onMonthlyContributorLimitReached( contributorsQuota ) {

@tomasMizera
Copy link
Collaborator

Fix tests

... aand yes, we will need to fix tests in case they will still be failing once the CI is re-run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show dialog when active contributors per month limit is hit [mobile]
4 participants