Add the maximun number of contributor in the dialog like in the plugin

MerginMaps · Nov 25, 2024 · a87025b · a87025b · inputapp-bot · Nov 25, 2024
1 parent 7755a68
commit a87025b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/app/qml/dialogs/MMMonthlyContributorsLimitDialog.qml b/app/qml/dialogs/MMMonthlyContributorsLimitDialog.qml
@@ -15,9 +15,11 @@ import "../components" as MMComponents
 MMComponents.MMDrawerDialog {
   id: root
 
+  property int contributorsQuota
+
   signal manageAccountClicked()
 
-  title: qsTr( "You've reached the maximum number of active monthly contributors for your current subscription." )
+  title: qsTr( "You've reached the maximum number of active monthly contributors (%1) for your current subscription." ).arg( contributorsQuota )
   imageSource: __style.reachedMonthlyContributorLimitImage
 
   description: qsTr( "Upgrade your subscription or wait until next month for the limit to reset." )

diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -901,7 +901,8 @@ ApplicationWindow {
       storageLimitDialog.open()
     }
 
-    function onMonthlyContributorLimitReached( uploadSize ) {
+    function onMonthlyContributorLimitReached( quota, serverMsg ) {
+      monthlyContributorsLimitDialog.contributorsQuota = quota
       monthlyContributorsLimitDialog.open()
     }
 

diff --git a/core/merginapi.cpp b/core/merginapi.cpp
@@ -2145,7 +2145,11 @@ void MerginApi::pushStartReplyFinished()
     }
     else if ( EnumHelper::isEqual( code, ErrorCode::MonthlyContributorsLimitHit ) )
     {
-      emit monthlyContributorLimitReached( serverMsg );
+      int quota = 0;
+      QVariant maximunMonthlyContributor = extractServerErrorValue( data, "projects_quota" );
+      if ( maximunMonthlyContributor.isValid() )
+        quota = maximunMonthlyContributor.toInt();
+      emit monthlyContributorLimitReached( quota, serverMsg );
     }
     else
     {

diff --git a/core/merginapi.h b/core/merginapi.h
@@ -598,7 +598,7 @@ class MerginApi: public QObject
     );
 
     void storageLimitReached( qreal uploadSize );
-    void monthlyContributorLimitReached( const QString &message );
+    void monthlyContributorLimitReached( int contributorsQuota, const QString &message );
     void projectLimitReached( int maxProjects, const QString &message );
     void migrationRequested( const QString &version );
     void notifySuccess( const QString &message );

diff --git a/gallery/qml/pages/DrawerPage.qml b/gallery/qml/pages/DrawerPage.qml
@@ -297,6 +297,8 @@ Page {
   MMMonthlyContributorsLimitDialog {
     id: monthlyContributorsLimitDialog
 
+    contributorsQuota: 15
+
     onPrimaryButtonClicked: {
       console.log("Manage workspace clicked")
     }