diff --git a/core/src/browser/extension.ts b/core/src/browser/extension.ts index fa6d06f3c..01d16c988 100644 --- a/core/src/browser/extension.ts +++ b/core/src/browser/extension.ts @@ -118,9 +118,10 @@ export abstract class BaseExtension implements ExtensionType { setting.extensionName = this.name }) try { - const oldSettings = localStorage.getItem(this.name) + const oldSettingsJson = localStorage.getItem(this.name) // Persists new settings - if (oldSettings) { + if (oldSettingsJson) { + const oldSettings = JSON.parse(oldSettingsJson) settings.forEach((setting) => { // Keep setting value if (setting.controllerProps && Array.isArray(oldSettings)) @@ -169,13 +170,13 @@ export abstract class BaseExtension implements ExtensionType { if (!this.name) return [] try { - const settingsString = localStorage.getItem(this.name); - if (!settingsString) return []; - const settings: SettingComponentProps[] = JSON.parse(settingsString); - return settings; + const settingsString = localStorage.getItem(this.name) + if (!settingsString) return [] + const settings: SettingComponentProps[] = JSON.parse(settingsString) + return settings } catch (err) { - console.warn(err); - return []; + console.warn(err) + return [] } } @@ -201,8 +202,8 @@ export abstract class BaseExtension implements ExtensionType { if (!updatedSettings.length) updatedSettings = componentProps as SettingComponentProps[] - localStorage.setItem(this.name, JSON.stringify(updatedSettings)); - + localStorage.setItem(this.name, JSON.stringify(updatedSettings)) + updatedSettings.forEach((setting) => { this.onSettingUpdate( setting.key, diff --git a/src-tauri/src/core/setup.rs b/src-tauri/src/core/setup.rs index 9d1993124..017b8a0bb 100644 --- a/src-tauri/src/core/setup.rs +++ b/src-tauri/src/core/setup.rs @@ -49,6 +49,12 @@ pub fn install_extensions(app: tauri::AppHandle, force: bool) -> Result<(), Stri if std::env::var("CLEAN").is_ok() { clean_up = true; } + log::info!( + "Installing extensions. Clean up: {}, Stored version: {}, App version: {}", + clean_up, + stored_version, + app_version + ); if !clean_up && stored_version == app_version && extensions_path.exists() { return Ok(()); } diff --git a/web-app/src/containers/ProvidersMenu.tsx b/web-app/src/containers/ProvidersMenu.tsx index 64c0c62c2..141810a81 100644 --- a/web-app/src/containers/ProvidersMenu.tsx +++ b/web-app/src/containers/ProvidersMenu.tsx @@ -97,10 +97,7 @@ const ProvidersMenu = ({ -
{}} - > +
Add Provider