From 82a262026f71ec7ec187cba460f9037c7fb0f286 Mon Sep 17 00:00:00 2001 From: Clem Date: Fri, 7 Jul 2023 15:06:47 +0200 Subject: [PATCH] fix Eugeny/tabby#8534 : skip yaml unacceptable kind of object to dump --- tabby-core/src/services/config.service.ts | 4 ++-- tabby-settings/src/services/configSync.service.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tabby-core/src/services/config.service.ts b/tabby-core/src/services/config.service.ts index 8b5f7629..cee3fb9e 100644 --- a/tabby-core/src/services/config.service.ts +++ b/tabby-core/src/services/config.service.ts @@ -205,7 +205,7 @@ export class ConfigService { // Scrub undefined values let cleanStore = JSON.parse(JSON.stringify(this._store)) cleanStore = await this.maybeEncryptConfig(cleanStore) - await this.platform.saveConfig(yaml.dump(cleanStore)) + await this.platform.saveConfig(yaml.dump(cleanStore, {skipInvalid: true})) this.emitChange() } @@ -213,7 +213,7 @@ export class ConfigService { * Reads config YAML as string */ readRaw (): string { - return yaml.dump(this._store) + return yaml.dump(this._store, {skipInvalid: true}) } /** diff --git a/tabby-settings/src/services/configSync.service.ts b/tabby-settings/src/services/configSync.service.ts index fdd5efec..e1717925 100644 --- a/tabby-settings/src/services/configSync.service.ts +++ b/tabby-settings/src/services/configSync.service.ts @@ -97,7 +97,7 @@ export class ConfigSyncService { data[part] = remoteData[part] } } - const content = yaml.dump(data) + const content = yaml.dump(data, {skipInvalid: true}) const result = await this.updateConfig(this.config.store.configSync.configID, { content, last_used_with_version: this.platform.getAppVersion(), @@ -154,7 +154,7 @@ export class ConfigSyncService { } private async writeConfigDataFromSync (data: any) { - await this.platform.saveConfig(yaml.dump(data)) + await this.platform.saveConfig(yaml.dump(data, {skipInvalid: true})) await this.config.load() await this.config.save() }