CU-861n8yh4d Show migration dialogue when Legacy CE servers version i…

…s lower than 2023.2.0
MerginMaps · Sep 14, 2023 · f63dbf1 · f63dbf1 · inputapp-bot · Sep 14, 2023
1 parent 77f8c75
commit f63dbf1
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 0 deletions.
diff --git a/app/inputhelp.cpp b/app/inputhelp.cpp
@@ -136,6 +136,11 @@ QString InputHelp::whatsNewPostLink() const
   return inputWeb + "/blog/introducing-workspaces-simplified-collaboration" + utmTagOther;
 }
 
+QString InputHelp::migrationGuides() const
+{
+  return helpRoot + "/dev/ce-migration/" + utmTagHelp;
+}
+
 bool InputHelp::submitReportPending() const
 {
   return mSubmitReportPending;

diff --git a/app/inputhelp.h b/app/inputhelp.h
@@ -40,6 +40,7 @@ class InputHelp: public QObject
     Q_PROPERTY( QString merginTermsLink READ merginTermsLink NOTIFY linkChanged )
     Q_PROPERTY( QString projectLoadingErrorHelpLink READ projectLoadingErrorHelpLink NOTIFY linkChanged )
     Q_PROPERTY( QString whatsNewPostLink READ whatsNewPostLink NOTIFY linkChanged )
+    Q_PROPERTY( QString migrationGuides READ migrationGuides CONSTANT )
 
     //! When adding new link, make sure you also create unit test for it in TestLinks
 
@@ -73,6 +74,7 @@ class InputHelp: public QObject
     QString merginTermsLink() const;
     QString projectLoadingErrorHelpLink() const;
     QString whatsNewPostLink() const;
+    QString migrationGuides() const;
 
     bool submitReportPending() const;
     /**

diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -643,6 +643,20 @@ ApplicationWindow {
         }
     }
 
+    MessageDialog {
+      id: migrationDialog
+
+      onAccepted: migrationDialog.close()
+      text: qsTr("Your server will soon be out of date \n\n Please contact your server administrator to upgrade your server to the latest version. Subsequent releases of our mobile app may not be compatible with your current server version.")
+      buttons: MessageDialog.Close | MessageDialog.Help
+      onButtonClicked: function(clickedButton) {
+        if (clickedButton === MessageDialog.Help) {
+          Qt.openUrlExternally(__inputHelp.migrationGuides)
+        }
+        close()
+      }
+    }
+
     FormsStackManager {
       id: formsStackManager
 
@@ -773,6 +787,10 @@ ApplicationWindow {
             map.mapSettings.extentChanged()
           }
         }
+
+        function onMigrationRequested() {
+          migrationDialog.open()
+        }
     }
 
     Connections {

diff --git a/core/merginapi.cpp b/core/merginapi.cpp
@@ -1364,6 +1364,11 @@ void MerginApi::checkMerginVersion( QString apiVersion, bool serverSupportsSubsc
     {
       setApiVersionStatus( MerginApiStatus::INCOMPATIBLE );
     }
+
+    if ( ( MERGIN_SERVER_VERSION_MAJOR == major && MERGIN_SERVER_VERSION_MINOR > minor ) || ( MERGIN_SERVER_VERSION_MAJOR > major ) )
+    {
+      emit migrationRequested();
+    }
   }
   else
   {
@@ -3363,6 +3368,7 @@ void MerginApi::getServerConfigReplyFinished()
     if ( statusCode == 404 ) // legacy (old) server
     {
       setServerType( MerginServerType::OLD );
+      emit migrationRequested();
     }
     else
     {

diff --git a/core/merginapi.h b/core/merginapi.h
@@ -370,6 +370,8 @@ class MerginApi: public QObject
 
     static const int MERGIN_API_VERSION_MAJOR = 2020;
     static const int MERGIN_API_VERSION_MINOR = 4;
+    static const int MERGIN_SERVER_VERSION_MAJOR = 2023;
+    static const int MERGIN_SERVER_VERSION_MINOR = 2;
     static const QString sMetadataFile;
     static const QString sMetadataFolder;
     static const QString sMerginConfigFile;
@@ -567,6 +569,7 @@ class MerginApi: public QObject
 
     void storageLimitReached( qreal uploadSize );
     void projectLimitReached( int maxProjects, const QString &message );
+    void migrationRequested();
     void notify( const QString &message );
     void authRequested();
     void authChanged();