Open sync failed dialog when "willRetry" notification is clicked (#3469)

* creating action for when willRetry notification occurs during synchronization * notification type added to error
MerginMaps · May 28, 2024 · dab887c · dab887c
1 parent dd6047b
commit dab887c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/app/notificationmodel.cpp b/app/notificationmodel.cpp
@@ -150,6 +150,12 @@ void NotificationModel::onNotificationClicked( uint id )
           emit showSwitchWorkspaceActionClicked();
           break;
         }
+        case NotificationType::ActionType::ShowSyncFailedDialog:
+        {
+          remove( id );
+          emit showSyncFailedDialogClicked();
+          break;
+        }
         default: break;
       }
     }

diff --git a/app/notificationmodel.h b/app/notificationmodel.h
@@ -41,7 +41,8 @@ class NotificationType
     {
       NoAction,
       ShowProjectIssuesAction,
-      ShowSwitchWorkspaceAction
+      ShowSwitchWorkspaceAction,
+      ShowSyncFailedDialog
     };
     Q_ENUM( ActionType )
 
@@ -109,6 +110,7 @@ class NotificationModel : public QAbstractListModel
     void rowCountChanged();
     void showProjectIssuesActionClicked();
     void showSwitchWorkspaceActionClicked();
+    void showSyncFailedDialogClicked();
 
   private:
     void add( const QString &message, uint interval, NotificationType::MessageType type = NotificationType::Information, NotificationType::IconType icon = NotificationType::NoneIcon, NotificationType::ActionType action = NotificationType::ActionType::NoAction );

diff --git a/app/qml/main.qml b/app/qml/main.qml
@@ -837,8 +837,8 @@ ApplicationWindow {
           syncFailedDialog.detailedText = qsTr( "Details" ) + ": " + errorMessage
           if ( willRetry )
           {
-            // TODO: open sync failed dialogue when clicked on the notification
-            __notificationModel.addError( qsTr( "There was an issue during synchronisation, we will try again. Click to learn more" ) )
+            __notificationModel.addError( qsTr( "There was an issue during synchronisation, we will try again. Click to learn more" ),
+            MM.NotificationType.ShowSyncFailedDialog )
           }
           else
           {
@@ -925,6 +925,9 @@ ApplicationWindow {
       stateManager.state = "projects"
       projectController.showSelectWorkspacePage()
     }
+    function onShowSyncFailedDialogClicked() {
+      syncFailedDialog.open()
+    }
   }
 
   Connections {