Add dialog for montly active contributor limit

MerginMaps · Nov 14, 2024 · 84d4d8f · 84d4d8f
1 parent 5cf54a6
commit 84d4d8f
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 0 deletions.
diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
@@ -59,6 +59,7 @@ set(MM_QML
     dialogs/MMDownloadProjectDialog.qml
     dialogs/MMMigrateToMerginDialog.qml
     dialogs/MMMissingAuthDialog.qml
+    dialogs/MMMonthlyContributorsLimitDialog.qml
     dialogs/MMNoPermissionsDialog.qml
     dialogs/MMPositionTrackingDialog.qml
     dialogs/MMProjectLimitDialog.qml

diff --git a/app/qml/dialogs/MMMonthlyContributorsLimitDialog.qml b/app/qml/dialogs/MMMonthlyContributorsLimitDialog.qml
@@ -0,0 +1,34 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+import QtQuick
+
+import "../components" as MMComponents
+
+
+MMComponents.MMDrawerDialog {
+  id: root
+
+  required property bool apiSupportsSubscription
+
+  signal manageAccountClicked()
+
+  title: qsTr("You've reached the maximum number of active monthly contributors for your current subscription.")
+  imageSource: __style.reachedDataLimitImage
+
+  description: qsTr( "Upgrade your subscription or wait until next month for the limit to reset." )
+
+  primaryButton.text: apiSupportsSubscription ? qsTr("Manage account") : ""
+  secondaryButton.text: qsTr("Cancel")
+
+  onPrimaryButtonClicked: {
+    root.manageAccountClicked()
+    close()
+  }
+}
diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -715,6 +715,14 @@ ApplicationWindow {
     onManageAccountClicked: Qt.openUrlExternally(__inputHelp.merginSubscriptionLink)
   }
 
+  MMMonthlyContributorsLimitDialog {
+    id: monthlyContributorsLimitDialog
+
+    apiSupportsSubscription: __merginApi.apiSupportsSubscriptions
+
+    onManageAccountClicked: Qt.openUrlExternally(__inputHelp.merginSubscriptionLink)
+  }
+
   MMProjectLimitDialog {
     id: projectLimitDialog
 
@@ -874,6 +882,10 @@ ApplicationWindow {
         }
       }
     }
+
+    function onMonthlyContributorsLimitReached( uploadSize ) {
+      monthlyContributorsLimitDialog.open()
+    }
   }
 
   Connections {

diff --git a/app/synchronizationerror.cpp b/app/synchronizationerror.cpp
@@ -37,6 +37,11 @@ SynchronizationError::ErrorType SynchronizationError::errorType( int errorCode,
     // Project no longer exists / is on different server
     return ErrorType::ProjectNotFound;
   }
+  else if ( errorCode == 422 )
+  {
+    // Hit the maximun number of contributor per month
+    return ErrorType::MonthlyContributorsLimitHit;
+  }
   else if ( errorCode >= 500 )
   {
     // Exceptions in server code or maintenance mode

diff --git a/app/synchronizationerror.h b/app/synchronizationerror.h
@@ -31,6 +31,7 @@ class SynchronizationError
       ProjectNotFound,
       VersionMismatch,
       ServerError,
+      MonthlyContributorsLimitHit,
       UnknownError
     };
     Q_ENUMS( ErrorType );

diff --git a/app/synchronizationmanager.cpp b/app/synchronizationmanager.cpp
@@ -286,6 +286,9 @@ void SynchronizationManager::onProjectSyncFailure(
   }
   else
   {
+    if (error == SynchronizationError::MonthlyContributorsLimitHit){
+      emit monthlyContributorsLimitReached("");
+    }
     mSyncProcesses.remove( projectFullName );
     emit syncFinished( projectFullName, false, -1, false );
 

diff --git a/app/synchronizationmanager.h b/app/synchronizationmanager.h
@@ -64,6 +64,7 @@ class SynchronizationManager : public QObject
     void syncFinished( const QString &projectFullName, bool success, int newVersion, bool reloadNeeded );
 
     void syncError( const QString &projectFullName, int errorType, bool willRetry = false, const QString &errorMessage = QLatin1String() );
+    void monthlyContributorsLimitReached( const QString &message );
 
   public slots:
 

diff --git a/gallery/qml.qrc b/gallery/qml.qrc
@@ -30,6 +30,7 @@
         <file>../app/qml/dialogs/MMStreamingModeDialog.qml</file>
         <file>../app/qml/dialogs/MMPositionTrackingDialog.qml</file>
         <file>../app/qml/dialogs/MMStorageLimitDialog.qml</file>
+        <file>../app/qml/dialogs/MMMonthlyContributorsLimitDialog.qml</file>
         <file>../app/qml/dialogs/MMCloseAccountDialog.qml</file>
         <file>../app/qml/dialogs/MMRemoveProjectDialog.qml</file>
         <file>../app/qml/dialogs/MMDownloadProjectDialog.qml</file>

diff --git a/gallery/qml/pages/DrawerPage.qml b/gallery/qml/pages/DrawerPage.qml
@@ -38,6 +38,11 @@ Page {
         onClicked: storageLimitDialog.open()
       }
 
+      Button {
+        text: "MMMonthlyContributorsLimitDialog"
+        onClicked: monthlyContributorsLimitDialog.open()
+      }
+
       Button {
         text: "MMCloseAccountDialog"
         onClicked: closeAccountDialog.open()
@@ -289,6 +294,19 @@ Page {
     }
   }
 
+  MMMonthlyContributorsLimitDialog {
+    id: monthlyContributorsLimitDialog
+
+    dataToSync: "643.8 MB"
+    dataUsing: "9.23 MB / 10.0 MB"
+    usedData: 0.923
+    apiSupportsSubscription: true
+
+    onPrimaryButtonClicked: {
+      console.log("Manage workspace clicked")
+    }
+  }
+
   MMSyncFailedDialog {
     id: syncFailedDialog
   }