fix: Jahro project settings saving process bugfix

alex-bulat · alex-bulat · commit 7b229ede089c · 2025-07-24T16:23:02.000+02:00
diff --git a/Editor/View/JahroEditorView.cs b/Editor/View/JahroEditorView.cs
@@ -62,11 +62,28 @@ public void CreateGUI()
 
             _projectSettings = JahroProjectSettings.LoadOrCreate();
 
+            _projectSettings.OnSettingsChanged += SaveProjectSettings;
+
             SetWindowMode(WindowMode.LOADING);
 
             CheckVersion();
         }
 
+        private void OnDestroy()
+        {
+            _projectSettings.OnSettingsChanged -= SaveProjectSettings;
+        }
+
+        private void SaveProjectSettings()
+        {
+            if (_projectSettings != null)
+            {
+                EditorUtility.SetDirty(_projectSettings);
+                AssetDatabase.SaveAssets();
+                AssetDatabase.Refresh();
+            }
+        }
+
         private async void CheckVersion()
         {
             try
diff --git a/Editor/View/SettingsView.cs b/Editor/View/SettingsView.cs
@@ -26,18 +26,15 @@ public class SettingsView
         private Button _projectOverviewButton;
         private Button _teamOverviewButton;
         private Button _accountSettingsButton;
-
         private Toggle _jahroEnableToggle;
         private Toggle _autoDisableToggle;
         private EnumField _launchKeyField;
         private Toggle _keyboardShortcutsToggle;
         private Toggle _mobileTapAreaToggle;
         private Toggle _dublicateLogsToggle;
         private MaskField _assembliesField;
-
         private List<string> _assembliesNames = new List<string>();
         private int _assembliesFlag;
-
         public event Action OnResetApiKey;
 
         public SettingsView(VisualElement root)
@@ -168,8 +165,7 @@ public void Initialize(KeyValidator.ValidateKeyResponse validation, JahroProject
 
             if (_projectSettings.ActiveAssemblies.Count == 0 && _assembliesNames != null && _assembliesNames.Count > 0)
             {
-                _projectSettings.ActiveAssemblies.AddRange(_assembliesNames);
-                EditorUtility.SetDirty(_projectSettings);
+                _projectSettings.ActiveAssemblies = new List<string>(_assembliesNames);
             }
 
             UpdateAssemblySelection();
@@ -184,11 +180,11 @@ private void SetupDataBinding()
             _container.ClearBindings();
             _container.dataSource = _projectSettings;
 
-            BindToggle(_jahroEnableToggle, "_jahroEnabled");
-            BindToggle(_autoDisableToggle, "_autoDisableInRelease");
-            BindToggle(_keyboardShortcutsToggle, "_useLaunchKeyboardShortcut");
-            BindToggle(_mobileTapAreaToggle, "_useLaunchTapArea");
-            BindToggle(_dublicateLogsToggle, "_duplicateToUnityConsole");
+            BindToggleWithCallback(_jahroEnableToggle, "_jahroEnabled", (value) => _projectSettings.JahroEnabled = value);
+            BindToggleWithCallback(_autoDisableToggle, "_autoDisableInRelease", (value) => _projectSettings.AutoDisableInRelease = value);
+            BindToggleWithCallback(_keyboardShortcutsToggle, "_useLaunchKeyboardShortcut", (value) => _projectSettings.UseLaunchKeyboardShortcut = value);
+            BindToggleWithCallback(_mobileTapAreaToggle, "_useLaunchTapArea", (value) => _projectSettings.UseLaunchTapArea = value);
+            BindToggleWithCallback(_dublicateLogsToggle, "_duplicateToUnityConsole", (value) => _projectSettings.DuplicateToUnityConsole = value);
 
             if (_launchKeyField != null)
             {
@@ -202,7 +198,6 @@ private void SetupDataBinding()
                     if (_projectSettings != null)
                     {
                         _projectSettings.LaunchKey = (KeyCode)evt.newValue;
-                        SaveProjectSettings();
                     }
                 });
             }
@@ -215,43 +210,47 @@ private void SetupDataBinding()
                     {
                         _assembliesFlag = (int)evt.newValue;
 
-                        bool listChanged = false;
+                        // Create a new list to trigger the property setter
+                        var newActiveAssemblies = new List<string>(_projectSettings.ActiveAssemblies);
 
                         for (int i = 0; i < _assembliesNames.Count; i++)
                         {
                             string name = _assembliesNames[i];
-                            bool active = _projectSettings.ActiveAssemblies.Contains(name);
+                            bool active = newActiveAssemblies.Contains(name);
                             int layer = 1 << i;
                             bool selected = (_assembliesFlag & layer) != 0;
 
                             if (!active && selected)
                             {
-                                _projectSettings.ActiveAssemblies.Add(name);
-                                listChanged = true;
+                                newActiveAssemblies.Add(name);
                             }
                             else if (active && !selected)
                             {
-                                _projectSettings.ActiveAssemblies.Remove(name);
-                                listChanged = true;
+                                newActiveAssemblies.Remove(name);
                             }
                         }
 
-                        if (listChanged)
-                        {
-                            SaveProjectSettings();
-                        }
+                        _projectSettings.ActiveAssemblies = newActiveAssemblies;
                     }
                 });
             }
         }
 
-        private void BindToggle(Toggle toggle, string propertyPath)
+        private void BindToggleWithCallback(Toggle toggle, string fieldPath, System.Action<bool> onValueChanged)
         {
             if (toggle == null) return;
 
             toggle.SetBinding("value", new DataBinding
             {
-                dataSourcePath = new PropertyPath(propertyPath)
+                dataSourcePath = new PropertyPath(fieldPath)
+            });
+
+            toggle.RegisterValueChangedCallback(evt =>
+            {
+                if (_projectSettings != null)
+                {
+                    onValueChanged?.Invoke(evt.newValue);
+                }
             });
         }
 
@@ -288,13 +287,6 @@ public void Hide()
             _container.style.display = DisplayStyle.None;
         }
 
-        private void SaveProjectSettings()
-        {
-            if (_projectSettings != null)
-            {
-                EditorUtility.SetDirty(_projectSettings);
-                AssetDatabase.SaveAssets();
-            }
-        }
+
     }
 }
diff --git a/Runtime/Core/Context/JahroConfig.cs b/Runtime/Core/Context/JahroConfig.cs
@@ -10,17 +10,17 @@ public enum Environment
 
         internal const Environment ENV = Environment.PROD;
 
-        public static readonly string CurrentVersion = "0.1.0-alpha.7";
+        public static readonly string CurrentVersion = "0.1.0-alpha.8";
 
         internal static readonly string RegisterUrl = "https://console.jahro.io";
 
         public static readonly string ChangelogUrl = "https://jahro.io/changelog";
 
         internal static readonly string DocumentationRoot = "https://docs.jahro.io/";
 
-        internal static readonly string DocumentationWatcherOverview = "https://docs.jahro.io/start-here/watcher";
+        internal static readonly string DocumentationWatcherOverview = "https://jahro.io/docs/watcher";
 
-        internal static readonly string DocumentationCommandsOverview = "https://docs.jahro.io/start-here/commands";
+        internal static readonly string DocumentationCommandsOverview = "https://jahro.io/docs/unity-commands";
 
         internal static readonly string HostUrl = ENV == Environment.PROD ? "https://api.jahro.io/jahro-api" : "http://localhost:3000";
     }
diff --git a/Runtime/Core/Data/JahroProjectSettings.cs b/Runtime/Core/Data/JahroProjectSettings.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using UnityEngine;
 using System.Linq;
+using System;
 
 namespace JahroConsole.Core.Data
 {
-
     public class JahroProjectSettings : ScriptableObject, IProjectSettings
     {
         [SerializeField]
@@ -31,21 +31,116 @@ public class JahroProjectSettings : ScriptableObject, IProjectSettings
         [SerializeField]
         private bool _autoDisableInRelease;
 
-        public bool JahroEnabled { get => _jahroEnabled; set => _jahroEnabled = value; }
+        public event Action OnSettingsChanged;
 
-        public bool UseLaunchKeyboardShortcut { get => _useLaunchKeyboardShortcut; set => _useLaunchKeyboardShortcut = value; }
+        public bool JahroEnabled
+        {
+            get => _jahroEnabled;
+            set
+            {
+                if (_jahroEnabled != value)
+                {
+                    _jahroEnabled = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public bool UseLaunchTapArea { get => _useLaunchTapArea; set => _useLaunchTapArea = value; }
+        public bool UseLaunchKeyboardShortcut
+        {
+            get => _useLaunchKeyboardShortcut;
+            set
+            {
+                if (_useLaunchKeyboardShortcut != value)
+                {
+                    _useLaunchKeyboardShortcut = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public KeyCode LaunchKey { get => _launchKey; set => _launchKey = value; }
+        public bool UseLaunchTapArea
+        {
+            get => _useLaunchTapArea;
+            set
+            {
+                if (_useLaunchTapArea != value)
+                {
+                    _useLaunchTapArea = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public List<string> ActiveAssemblies { get => _activeAssemblies; set => _activeAssemblies = value; }
+        public KeyCode LaunchKey
+        {
+            get => _launchKey;
+            set
+            {
+                if (_launchKey != value)
+                {
+                    _launchKey = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public bool DuplicateToUnityConsole { get => _duplicateToUnityConsole; set => _duplicateToUnityConsole = value; }
+        public List<string> ActiveAssemblies
+        {
+            get => _activeAssemblies;
+            set
+            {
+                if (_activeAssemblies != value)
+                {
+                    _activeAssemblies = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public string APIKey { get => _APIKey; set => _APIKey = value; }
+        public bool DuplicateToUnityConsole
+        {
+            get => _duplicateToUnityConsole;
+            set
+            {
+                if (_duplicateToUnityConsole != value)
+                {
+                    _duplicateToUnityConsole = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
 
-        public bool AutoDisableInRelease { get => _autoDisableInRelease; set => _autoDisableInRelease = value; }
+        public string APIKey
+        {
+            get => _APIKey;
+            set
+            {
+                if (_APIKey != value)
+                {
+                    _APIKey = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
+        public bool AutoDisableInRelease
+        {
+            get => _autoDisableInRelease;
+            set
+            {
+                if (_autoDisableInRelease != value)
+                {
+                    _autoDisableInRelease = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
+        private void NotifySettingsChanged()
+        {
+            OnSettingsChanged?.Invoke();
+        }
 
         public static bool isSettingsFileExists()
         {
@@ -67,15 +162,14 @@ public static JahroProjectSettings CreateDefault()
         {
             var settings = ScriptableObject.CreateInstance<JahroProjectSettings>();
             settings._APIKey = "";
-            settings.JahroEnabled = true;
+            settings._jahroEnabled = true;
             settings._useLaunchKeyboardShortcut = true;
             settings._useLaunchTapArea = true;
             settings._activeAssemblies = new List<string>();
             settings._duplicateToUnityConsole = false;
             settings._launchKey = KeyCode.BackQuote;
             settings._autoDisableInRelease = false;
 
-
 #if UNITY_EDITOR
             var assemblies = UnityEditor.Compilation.CompilationPipeline.GetAssemblies(UnityEditor.Compilation.AssembliesType.Player)
                 .Where(assembly =>
@@ -92,6 +186,5 @@ public static JahroProjectSettings CreateDefault()
 #endif
             return settings;
         }
-
     }
 }
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "io.jahro.console",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-alpha.8",
   "displayName": "Jahro",
   "description": "Jahro is a powerful and easy-to-use Unity debugging console and runtime tool. Effortlessly execute commands, monitor variables in real-time, capture logs, and sync snapshots to analyze your game like never before. Perfect for developers who want a smarter way to debug, test, and optimize their Unity projects!",
-  "unity": "2019.1",
+  "unity": "2021.1",
   "unityRelease": "0b5",
   "dependencies": {},
   "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -26,18 +26,15 @@ public class SettingsView`
`26`	`26`	`private Button _projectOverviewButton;`
`27`	`27`	`private Button _teamOverviewButton;`
`28`	`28`	`private Button _accountSettingsButton;`
`29`		`-`
`30`	`29`	`private Toggle _jahroEnableToggle;`
`31`	`30`	`private Toggle _autoDisableToggle;`
`32`	`31`	`private EnumField _launchKeyField;`
`33`	`32`	`private Toggle _keyboardShortcutsToggle;`
`34`	`33`	`private Toggle _mobileTapAreaToggle;`
`35`	`34`	`private Toggle _dublicateLogsToggle;`
`36`	`35`	`private MaskField _assembliesField;`
`37`		`-`
`38`	`36`	`private List<string> _assembliesNames = new List<string>();`
`39`	`37`	`private int _assembliesFlag;`
`40`		`-`
`41`	`38`	`public event Action OnResetApiKey;`
`42`	`39`
`43`	`40`	`public SettingsView(VisualElement root)`
`@@ -168,8 +165,7 @@ public void Initialize(KeyValidator.ValidateKeyResponse validation, JahroProject`
`168`	`165`
`169`	`166`	`if (_projectSettings.ActiveAssemblies.Count == 0 && _assembliesNames != null && _assembliesNames.Count > 0)`
`170`	`167`	`{`
`171`		`- _projectSettings.ActiveAssemblies.AddRange(_assembliesNames);`
`172`		`- EditorUtility.SetDirty(_projectSettings);`
	`168`	`+ _projectSettings.ActiveAssemblies = new List<string>(_assembliesNames);`
`173`	`169`	`}`
`174`	`170`
`175`	`171`	`UpdateAssemblySelection();`
`@@ -184,11 +180,11 @@ private void SetupDataBinding()`
`184`	`180`	`_container.ClearBindings();`
`185`	`181`	`_container.dataSource = _projectSettings;`
`186`	`182`
`187`		`- BindToggle(_jahroEnableToggle, "_jahroEnabled");`
`188`		`- BindToggle(_autoDisableToggle, "_autoDisableInRelease");`
`189`		`- BindToggle(_keyboardShortcutsToggle, "_useLaunchKeyboardShortcut");`
`190`		`- BindToggle(_mobileTapAreaToggle, "_useLaunchTapArea");`
`191`		`- BindToggle(_dublicateLogsToggle, "_duplicateToUnityConsole");`
	`183`	`+ BindToggleWithCallback(_jahroEnableToggle, "_jahroEnabled", (value) => _projectSettings.JahroEnabled = value);`
	`184`	`+ BindToggleWithCallback(_autoDisableToggle, "_autoDisableInRelease", (value) => _projectSettings.AutoDisableInRelease = value);`
	`185`	`+ BindToggleWithCallback(_keyboardShortcutsToggle, "_useLaunchKeyboardShortcut", (value) => _projectSettings.UseLaunchKeyboardShortcut = value);`
	`186`	`+ BindToggleWithCallback(_mobileTapAreaToggle, "_useLaunchTapArea", (value) => _projectSettings.UseLaunchTapArea = value);`
	`187`	`+ BindToggleWithCallback(_dublicateLogsToggle, "_duplicateToUnityConsole", (value) => _projectSettings.DuplicateToUnityConsole = value);`
`192`	`188`
`193`	`189`	`if (_launchKeyField != null)`
`194`	`190`	`{`
`@@ -202,7 +198,6 @@ private void SetupDataBinding()`
`202`	`198`	`if (_projectSettings != null)`
`203`	`199`	`{`
`204`	`200`	`_projectSettings.LaunchKey = (KeyCode)evt.newValue;`
`205`		`- SaveProjectSettings();`
`206`	`201`	`}`
`207`	`202`	`});`
`208`	`203`	`}`
`@@ -215,43 +210,47 @@ private void SetupDataBinding()`
`215`	`210`	`{`
`216`	`211`	`_assembliesFlag = (int)evt.newValue;`
`217`	`212`
`218`		`- bool listChanged = false;`
	`213`	`+ // Create a new list to trigger the property setter`
	`214`	`+ var newActiveAssemblies = new List<string>(_projectSettings.ActiveAssemblies);`
`219`	`215`
`220`	`216`	`for (int i = 0; i < _assembliesNames.Count; i++)`
`221`	`217`	`{`
`222`	`218`	`string name = _assembliesNames[i];`
`223`		`- bool active = _projectSettings.ActiveAssemblies.Contains(name);`
	`219`	`+ bool active = newActiveAssemblies.Contains(name);`
`224`	`220`	`int layer = 1 << i;`
`225`	`221`	`bool selected = (_assembliesFlag & layer) != 0;`
`226`	`222`
`227`	`223`	`if (!active && selected)`
`228`	`224`	`{`
`229`		`- _projectSettings.ActiveAssemblies.Add(name);`
`230`		`- listChanged = true;`
	`225`	`+ newActiveAssemblies.Add(name);`
`231`	`226`	`}`
`232`	`227`	`else if (active && !selected)`
`233`	`228`	`{`
`234`		`- _projectSettings.ActiveAssemblies.Remove(name);`
`235`		`- listChanged = true;`
	`229`	`+ newActiveAssemblies.Remove(name);`
`236`	`230`	`}`
`237`	`231`	`}`
`238`	`232`
`239`		`- if (listChanged)`
`240`		`- {`
`241`		`- SaveProjectSettings();`
`242`		`- }`
	`233`	`+ _projectSettings.ActiveAssemblies = newActiveAssemblies;`
`243`	`234`	`}`
`244`	`235`	`});`
`245`	`236`	`}`
`246`	`237`	`}`
`247`	`238`
`248`		`- private void BindToggle(Toggle toggle, string propertyPath)`
	`239`	`+ private void BindToggleWithCallback(Toggle toggle, string fieldPath, System.Action<bool> onValueChanged)`
`249`	`240`	`{`
`250`	`241`	`if (toggle == null) return;`
`251`	`242`
`252`	`243`	`toggle.SetBinding("value", new DataBinding`
`253`	`244`	`{`
`254`		`- dataSourcePath = new PropertyPath(propertyPath)`
	`245`	`+ dataSourcePath = new PropertyPath(fieldPath)`
	`246`	`+ });`
	`247`	`+`
	`248`	`+ toggle.RegisterValueChangedCallback(evt =>`
	`249`	`+ {`
	`250`	`+ if (_projectSettings != null)`
	`251`	`+ {`
	`252`	`+ onValueChanged?.Invoke(evt.newValue);`
	`253`	`+ }`
`255`	`254`	`});`
`256`	`255`	`}`
`257`	`256`
`@@ -288,13 +287,6 @@ public void Hide()`
`288`	`287`	`_container.style.display = DisplayStyle.None;`
`289`	`288`	`}`
`290`	`289`
`291`		`- private void SaveProjectSettings()`
`292`		`- {`
`293`		`- if (_projectSettings != null)`
`294`		`- {`
`295`		`- EditorUtility.SetDirty(_projectSettings);`
`296`		`- AssetDatabase.SaveAssets();`
`297`		`- }`
`298`		`- }`
	`290`	`+`
`299`	`291`	`}`
`300`	`292`	`}`