fix workflow and app backup issue

shared.go

@@ -13686,6 +13686,28 @@ func BuildBaseSubscription(org Org, monthlyExecLimit int64) PaymentSubscription
 	}
 }
 
+func (s *SyncConfig) MergeSyncConfigBackup(peerWorkflowBackup, peerAppBackup bool, peerWorkflowBackupUpdated, peerAppBackupUpdated int64) bool {
+	changed := false
+
+	if peerWorkflowBackupUpdated > s.WorkflowBackupUpdated {
+		if s.WorkflowBackup != peerWorkflowBackup {
+			s.WorkflowBackup = peerWorkflowBackup
+			changed = true
+		}
+		s.WorkflowBackupUpdated = peerWorkflowBackupUpdated
+	}
+
+	if peerAppBackupUpdated > s.AppBackupUpdated {
+		if s.AppBackup != peerAppBackup {
+			s.AppBackup = peerAppBackup
+			changed = true
+		}
+		s.AppBackupUpdated = peerAppBackupUpdated
+	}
+
+	return changed
+}
+
 func HandleEditOrg(resp http.ResponseWriter, request *http.Request) {
 	cors := HandleCors(resp, request)
 	if cors {
@@ -13745,6 +13767,7 @@ func HandleEditOrg(resp http.ResponseWriter, request *http.Request) {
 		SubscriptionIndex string              `json:"subscription_index" datastore:"subscription_index"`
 
 		SyncFeatures    SyncFeatures `json:"sync_features" datastore:"sync_features"`
+		SyncConfig      SyncConfig   `json:"sync_config" datastore:"sync_config"`
 		Billing         Billing      `json:"billing" datastore:"billing"`
 		Branding        OrgBranding  `json:"branding" datastore:"branding"`
 		EditingBranding bool         `json:"editing_branding" datastore:"editing_branding"`
@@ -13828,6 +13851,30 @@ func HandleEditOrg(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	if tmpData.Editing == "sync_config" {
+		now := time.Now().Unix()
+		if tmpData.SyncConfig.WorkflowBackup != org.SyncConfig.WorkflowBackup {
+			org.SyncConfig.WorkflowBackup = tmpData.SyncConfig.WorkflowBackup
+			org.SyncConfig.WorkflowBackupUpdated = now
+		}
+		if tmpData.SyncConfig.AppBackup != org.SyncConfig.AppBackup {
+			org.SyncConfig.AppBackup = tmpData.SyncConfig.AppBackup
+			org.SyncConfig.AppBackupUpdated = now
+		}
+
+		err = SetOrg(ctx, *org, org.Id)
+		if err != nil {
+			log.Printf("[ERROR] Failed to update org %s sync config: %s", org.Id, err)
+			resp.WriteHeader(500)
+			resp.Write([]byte(`{"success": false}`))
+			return
+		}
+
+		resp.WriteHeader(200)
+		resp.Write([]byte(`{"success": true}`))
+		return
+	}
+
 	if tmpData.Editing == "subscription_update" && !user.SupportAccess {
 		resp.WriteHeader(403)
 		resp.Write([]byte(`{"success": false, "reason": "Support access required"}`))

structs.go

@@ -171,6 +171,11 @@ type RetStruct struct {
 	Licensed         bool                  `json:"licensed"`
 	CloudSyncUrl     string                `json:"cloud_sync_url,omitempty"`
 	AppRunsHardLimit int64                 `json:"app_runs_hard_limit"`
+	WorkflowBackup   bool                  `json:"workflow_backup"`
+	AppBackup        bool                  `json:"app_backup"`
+
+	WorkflowBackupUpdated int64 `json:"workflow_backup_updated"`
+	AppBackupUpdated      int64 `json:"app_backup_updated"`
 }
 
 type AppMini struct {
@@ -1417,6 +1422,10 @@ type SyncConfig struct {
 
 	WorkflowBackup bool `json:"workflow_backup" datastore:"workflow_backup"`
 	AppBackup      bool `json:"app_backup" datastore:"app_backup"`
+
+	WorkflowBackupUpdated int64 `json:"workflow_backup_updated" datastore:"workflow_backup_updated"`
+	AppBackupUpdated      int64 `json:"app_backup_updated" datastore:"app_backup_updated"`
+}
 }
 
 // RemoteWorkflowInfo holds metadata for a workflow found in a remote git repo.
@@ -4682,6 +4691,11 @@ type BackupJob struct {
 	Stats     ExecutionInfo `json:"stats"`
 	Workflows []Workflow    `json:"workflows"`
 	Apps      []WorkflowApp `json:"apps"`
+
+	WorkflowBackup        bool  `json:"workflow_backup"`
+	AppBackup             bool  `json:"app_backup"`
+	WorkflowBackupUpdated int64 `json:"workflow_backup_updated"`
+	AppBackupUpdated      int64 `json:"app_backup_updated"`
 }
 
 type WorkflowSearch struct {