fix Instance::client_traffic_policy updates

Author: j-chmielewski

src-tauri/src/commands.rs

@@ -559,6 +559,11 @@ pub(crate) async fn locations_changed(
         .map(|config| config.clone().into_location(instance.id))
         .collect();
 
+    error!(
+        "Instance {} locations changed: {}",
+        instance.name,
+        db_locations != core_locations
+    );
     Ok(db_locations != core_locations)
 }
 
@@ -577,15 +582,22 @@ pub(crate) async fn do_update_instance(
     instance.url = instance_info.url;
     instance.proxy_url = instance_info.proxy_url;
     instance.username = instance_info.username;
-    // TODO
-    // // Make sure to update the locations too if we are disabling all traffic
-    // if instance.disable_all_traffic != instance_info.disable_all_traffic
-    //     && instance_info.disable_all_traffic
-    // {
-    //     debug!("Disabling all traffic for all locations of instance {instance}");
-    //     Location::disable_all_traffic_for_all(transaction.as_mut(), instance.id).await?;
-    //     debug!("Disabled all traffic for all locations of instance {instance}");
-    // }
+    // Make sure to update the locations too if we are disabling all traffic
+    let policy = instance_info.client_traffic_policy.into();
+    if instance.client_traffic_policy != policy && policy == ClientTrafficPolicy::DisableAllTraffic
+    {
+        debug!("Disabling all traffic for all locations of instance {instance}");
+        Location::disable_all_traffic_for_all(transaction.as_mut(), instance.id).await?;
+        debug!("Disabled all traffic for all locations of instance {instance}");
+    }
+    error!(
+        "## Updating instance {}({:?}) : {:?} -> {:?}({:?})",
+        instance.name,
+        instance.client_traffic_policy,
+        instance.client_traffic_policy,
+        instance_info.client_traffic_policy,
+        ClientTrafficPolicy::from(instance_info.client_traffic_policy),
+    );
     instance.client_traffic_policy = instance_info.client_traffic_policy.into();
     instance.openid_display_name = instance_info.openid_display_name;
     instance.uuid = instance_info.id;

src-tauri/src/database/models/instance.rs

@@ -69,11 +69,12 @@ impl Instance<Id> {
     where
         E: SqliteExecutor<'e>,
     {
+        error!("### Executing query: {:?}", self.client_traffic_policy);
         query!(
             "UPDATE instance SET name = $1, uuid = $2, url = $3, proxy_url = $4, username = $5, \
             client_traffic_policy = $6, enterprise_enabled = $7, token = $8, \
             openid_display_name = $9 \
-            WHERE id = $11;",
+            WHERE id = $10;",
             self.name,
             self.uuid,
             self.url,