Merge branch 'master' into enhancementUiUx/readerCantEdit

MerginMaps · Jan 10, 2025 · 493bb18 · 493bb18
2 parents 193574d + 7892d92
commit 493bb18
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 114 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -266,7 +266,7 @@ jobs:
             ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.apk
 
       - name: Upload APK to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.apk
           name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} APK [v7 + v8a]
@@ -294,7 +294,7 @@ jobs:
 
       - name: Upload AAB to Artifacts
         if: ${{ github.ref_name == 'master' || github.ref_type == 'tag' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/merginmaps-${{ env.INPUT_VERSION_CODE }}.aab
           name: Mergin Maps ${{ env.INPUT_VERSION_CODE }} AAB
diff --git a/.github/workflows/gallery.yml b/.github/workflows/gallery.yml
@@ -121,7 +121,7 @@ jobs:
           tar -czf ${{ github.workspace }}/merginmaps-gallery-${{ matrix.os }}.tar.gz .
           
       - name: Upload APK to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/merginmaps-gallery-${{ matrix.os }}.tar.gz
           name: Mergin Maps Gallery ${{ matrix.os }}

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -214,6 +214,6 @@ jobs:
           tar -c -z -f ${{ github.workspace }}/${INPUT_TAR} ./
 
       - name: Upload Sdk in Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/${{ env.INPUT_TAR }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -197,6 +197,6 @@ jobs:
           tar -c -z -f ${{ github.workspace }}/${INPUT_TAR} "./Input.app"
 
       - name: Upload Sdk in Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/${{ env.INPUT_TAR }}
diff --git a/.github/workflows/macos_arm64.yml b/.github/workflows/macos_arm64.yml
@@ -168,6 +168,6 @@ jobs:
           tar -c -z -f ${{ github.workspace }}/${INPUT_TAR} "./Input.app"
 
       - name: Upload Sdk in Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: ${{ github.workspace }}/${{ env.INPUT_TAR }}
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -199,7 +199,7 @@ jobs:
             xcopy C:\input-package\inputapp-win-x86_64.exe mergin-maps-input-win64-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.exe* /Y
 
       - name: Upload Sdk in Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: mergin-maps-input-win64-${{ steps.time.outputs.formattedTime }}-${{ github.run_number }}.exe
           if-no-files-found: error

diff --git a/app/images/ReachedMonthlyContributorLimit.svg b/app/images/ReachedMonthlyContributorLimit.svg
diff --git a/app/images/images.qrc b/app/images/images.qrc
@@ -35,6 +35,5 @@
         <file>SignIn.svg</file>
         <file>NoWorkspace.svg</file>
         <file>BlueInfo.svg</file>
-        <file>ReachedMonthlyContributorLimit.svg</file>
     </qresource>
 </RCC>
diff --git a/app/mmstyle.h b/app/mmstyle.h
@@ -198,7 +198,6 @@ class MMStyle: public QObject
     Q_PROPERTY( QUrl acceptInvitationImage READ acceptInvitationImage CONSTANT )
     Q_PROPERTY( QUrl acceptInvitationLogoImage READ acceptInvitationLogoImage CONSTANT )
     Q_PROPERTY( QUrl reachedDataLimitImage READ reachedDataLimitImage CONSTANT )
-    Q_PROPERTY( QUrl reachedMonthlyContributorLimitImage READ reachedMonthlyContributorLimitImage CONSTANT )
     Q_PROPERTY( QUrl uploadImage READ uploadImage CONSTANT )
     Q_PROPERTY( QUrl noMapThemesImage READ noMapThemesImage CONSTANT )
     Q_PROPERTY( QUrl syncFailedImage READ syncFailedImage CONSTANT )
@@ -497,7 +496,6 @@ class MMStyle: public QObject
     QUrl noPermissionsImage() {return QUrl( "qrc:/images/NoPermissions.svg" );}
     QUrl signInImage() {return QUrl( "qrc:/images/SignIn.svg" );}
     QUrl reachedDataLimitImage() {return QUrl( "qrc:/images/ReachedDataLimit.svg" );}
-    QUrl reachedMonthlyContributorLimitImage() {return QUrl( "qrc:/images/ReachedMonthlyContributorLimit.svg" );}
     QUrl warnLogoImage() {return QUrl( "qrc:/images/WarnLogoImage.svg" );}
     QUrl mapPinImage() {return QUrl( "qrc:/images/MapPin.svg" );}
     QUrl positionTrackingRunningImage() {return QUrl( "qrc:/images/PositionTrackingRunning.svg" );}

diff --git a/app/qml/CMakeLists.txt b/app/qml/CMakeLists.txt
@@ -59,7 +59,6 @@ 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
diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -716,12 +716,6 @@ ApplicationWindow {
     onManageAccountClicked: Qt.openUrlExternally(__inputHelp.merginSubscriptionLink)
   }
 
-  MMMonthlyContributorsLimitDialog {
-    id: monthlyContributorsLimitDialog
-
-    onManageAccountClicked: Qt.openUrlExternally(__inputHelp.merginSubscriptionLink)
-  }
-
   MMProjectLimitDialog {
     id: projectLimitDialog
 
@@ -902,11 +896,6 @@ ApplicationWindow {
       storageLimitDialog.open()
     }
 
-    function onMonthlyContributorLimitReached( quota, serverMsg ) {
-      monthlyContributorsLimitDialog.contributorsQuota = quota
-      monthlyContributorsLimitDialog.open()
-    }
-
     function onProjectLimitReached( maxProjects, errorMsg ) {
       __merginApi.getUserInfo()
       if (__merginApi.apiSupportsSubscriptions) {
@@ -926,7 +915,7 @@ ApplicationWindow {
     }
 
     function onMigrationRequested( version ) {
-      if ( __appSettings.ignoreMigrateVersion !== version ) {
+      if( __appSettings.ignoreMigrateVersion !== version ) {
         migrationDialog.version = version
         migrationDialog.open()
       }

diff --git a/core/merginapi.cpp b/core/merginapi.cpp
@@ -2117,13 +2117,14 @@ void MerginApi::pushStartReplyFinished()
       serverMsg = sSyncCanceledMessage;
 
     QString code = extractServerErrorCode( data );
+    bool showLimitReachedDialog = EnumHelper::isEqual( code, ErrorCode::StorageLimitHit );
 
     CoreUtils::log( "push " + projectFullName, QStringLiteral( "FAILED - %1. %2" ).arg( r->errorString(), serverMsg ) );
 
     transaction.replyPushStart->deleteLater();
     transaction.replyPushStart = nullptr;
 
-    if ( EnumHelper::isEqual( code, ErrorCode::StorageLimitHit ) )
+    if ( showLimitReachedDialog )
     {
       const QList<MerginFile> files = transaction.pushQueue;
       qreal uploadSize = 0;
@@ -2143,14 +2144,6 @@ void MerginApi::pushStartReplyFinished()
         deleteProject( projectNamespace, projectName, false );
       }
     }
-    else if ( EnumHelper::isEqual( code, ErrorCode::MonthlyContributorsLimitHit ) )
-    {
-      int quota = 0;
-      QVariant maximunMonthlyContributor = extractServerErrorValue( data, "projects_quota" );
-      if ( maximunMonthlyContributor.isValid() )
-        quota = maximunMonthlyContributor.toInt();
-      emit monthlyContributorLimitReached( quota, serverMsg );
-    }
     else
     {
       int httpCode = r->attribute( QNetworkRequest::HttpStatusCodeAttribute ).toInt();

diff --git a/core/merginapi.h b/core/merginapi.h
@@ -195,8 +195,7 @@ class ErrorCode
     {
       Unknown = 0,
       ProjectsLimitHit,
-      StorageLimitHit,
-      MonthlyContributorsLimitHit,
+      StorageLimitHit
     };
     Q_ENUM( Value );
 };
@@ -603,7 +602,6 @@ class MerginApi: public QObject
     );
 
     void storageLimitReached( qreal uploadSize );
-    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.qrc b/gallery/qml.qrc
@@ -30,7 +30,6 @@
         <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,11 +38,6 @@ Page {
         onClicked: storageLimitDialog.open()
       }
 
-      Button {
-        text: "MMMonthlyContributorsLimitDialog"
-        onClicked: monthlyContributorsLimitDialog.open()
-      }
-
       Button {
         text: "MMCloseAccountDialog"
         onClicked: closeAccountDialog.open()
@@ -294,16 +289,6 @@ Page {
     }
   }
 
-  MMMonthlyContributorsLimitDialog {
-    id: monthlyContributorsLimitDialog
-
-    contributorsQuota: 15
-
-    onPrimaryButtonClicked: {
-      console.log("Manage workspace clicked")
-    }
-  }
-
   MMSyncFailedDialog {
     id: syncFailedDialog
   }

diff --git a/gallery/qml/pages/ImagesPage.qml b/gallery/qml/pages/ImagesPage.qml
@@ -41,7 +41,6 @@ ScrollView {
         Column { Image { source: __style.externalGpsGreenImage } Text { text: "externalGpsGreenImage" } }
         Column { Image { source: __style.externalGpsRedImage } Text { text: "externalGpsRedImage" } }
         Column { Image { source: __style.reachedDataLimitImage } Text { text: "reachedDataLimitImage" } }
-        Column { Image { source: __style.reachedMonthlyContributorLimitImage } Text { text: "reachedMonthlyContributorLimitImage" } }
         Column { Image { source: __style.positiveMMSymbolImage } Text { text: "positiveMMSymbolImage" } }
         Column { Image { source: __style.negativeMMSymbolImage } Text { text: "negativeMMSymbolImage" } }
         Column { Image { source: __style.closeAccountImage } Text { text: "closeAccountImage" } }