Fix autosync for related features

Author: Withalion

app/autosynccontroller.cpp

@@ -33,25 +33,7 @@ AutosyncController::AutosyncController(
     return;
   }
 
-  // Register for data change of project's vector layers
-  const QMap<QString, QgsMapLayer *> layers = mQgsProject->mapLayers( true );
-  for ( const QgsMapLayer *layer : layers )
-  {
-    const QgsVectorLayer *vecLayer = qobject_cast<const QgsVectorLayer *>( layer );
-    if ( vecLayer )
-    {
-      if ( !vecLayer->readOnly() )
-      {
-        connect( vecLayer, &QgsVectorLayer::afterCommitChanges, this, [&]
-        {
-          mLastUpdateTime = QDateTime::currentDateTime();
-          emit projectSyncRequested( SyncOptions::RequestOrigin::AutomaticRequest );
-        } );
-      }
-    }
-  }
-
-  //every 10 seconds check if last sync was a 60 seconds or more ago and sync if it's true
+  //every 10 seconds check if last sync was 60 seconds or more ago and sync if it's true
   mTimer = std::make_unique<QTimer>( this );
   connect( mTimer.get(), &QTimer::timeout, this, [&]
   {
@@ -69,6 +51,12 @@ void AutosyncController::updateLastUpdateTime()
   mLastUpdateTime = QDateTime::currentDateTime();
 }
 
+void AutosyncController::syncLayerChange()
+{
+  mLastUpdateTime = QDateTime::currentDateTime();
+  emit projectSyncRequested( SyncOptions::RequestOrigin::AutomaticRequest );
+}
+
 void AutosyncController::checkSyncRequiredAfterAppStateChange( const Qt::ApplicationState state )
 {
   if ( state != Qt::ApplicationState::ApplicationActive )

app/autosynccontroller.h

@@ -29,6 +29,9 @@ class AutosyncController : public QObject
     // Set mLastUpdateTime to "now", triggered by manual sync
     void updateLastUpdateTime();
 
+    // This triggers sync after a change has been saved to layer via attributeController
+    Q_INVOKABLE void syncLayerChange();
+
   signals:
     void projectSyncRequested( SyncOptions::RequestOrigin origin );
 

app/qml/form/MMFormController.qml

@@ -31,7 +31,7 @@ Item {
   property var relationToApply
   property var controllerToApply
 
-  property alias formState: featureForm.state // add, edit, readOnly or multiEdit
+  property alias formState: featureForm.state // add, addChild, edit, readOnly or multiEdit
   property alias panelState: statesManager.state
 
   property bool layerIsReadOnly: featureLayerPair?.layer?.readOnly ?? false

app/qml/form/MMFormPage.qml

@@ -71,6 +71,9 @@ Page {
     },
     State {
       name: "add"
+    },
+    State {
+      name: "addChild"
     }
   ]
 
@@ -106,7 +109,7 @@ Page {
 
 
     title: {
-      if ( root.state === "add" ) return qsTr( "New feature" )
+      if ( root.state === "add" || root.state === "addChild" ) return qsTr( "New feature" )
       else if ( root.state === "edit" ) return qsTr( "Edit feature" )
       else if ( root.state === "multiEdit" ) return qsTr( "Edit selected features" )
       return __inputUtils.featureTitle( root.controller.featureLayerPair, __activeProject.qgsProject )
@@ -116,7 +119,7 @@ Page {
 
       anchors.verticalCenter: parent.verticalCenter
 
-      visible: root.state === "add" || root.state === "edit" || root.state === "multiEdit"
+      visible: root.state === "add" || root.state === "edit" || root.state === "multiEdit" || root.state === "addChild"
 
       iconSource: __style.checkmarkIcon
       iconColor: controller.hasValidationErrors ? __style.grapeColor : __style.forestColor
@@ -316,7 +319,7 @@ Page {
         property var fieldFeatureLayerPair: root.controller.featureLayerPair
         property string fieldHomePath: root.project ? root.project.homePath : "" // for photo editor
 
-        property bool fieldRememberValueSupported: root.controller.rememberAttributesController.rememberValuesAllowed && root.state === "add" && model.EditorWidget !== "Hidden" && Type === MM.FormItem.Field
+        property bool fieldRememberValueSupported: root.controller.rememberAttributesController.rememberValuesAllowed && ( root.state === "add" || root.state === "addChild" ) && model.EditorWidget !== "Hidden" && Type === MM.FormItem.Field
         property bool fieldRememberValueState: model.RememberValue ? true : false
 
         active: fieldWidget !== 'Hidden'
@@ -433,6 +436,9 @@ Page {
 
     function onChangesCommited() {
       root.saved()
+      if ( root.state !== "addChild" ) {
+        __activeProject.autosyncController?.syncLayerChange()
+      }
     }
 
     function onCommitFailed() {
@@ -458,10 +464,10 @@ Page {
   }
 
   function rollbackAndClose() {
-    // remove feature if we are in "add" mode and it already has valid ID
+    // remove feature if we are in "add" or "addChild" mode and it already has valid ID
     // it was saved to prefill relation reference field in child layer
     let featureId = root.controller.featureLayerPair.feature.id
-    let shouldRemoveFeature = root.state === "add" && __inputUtils.isFeatureIdValid( featureId )
+    let shouldRemoveFeature = ( root.state === "add" || root.state === "addChild" ) && __inputUtils.isFeatureIdValid( featureId )
 
     if ( shouldRemoveFeature ) {
       root.controller.deleteFeature()

app/qml/form/MMFormStackController.qml

@@ -167,7 +167,7 @@ Item {
   function addLinkedFeature( newPair, parentController, relation ) {
     let props = {
       featureLayerPair: newPair,
-      formState: "add",
+      formState: "addChild",
       panelState: "form",
       parentController: parentController,
       linkedRelation: relation