Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(core): Banner dismissal should also work for users migrating to v1 (no-changelog) #6700

Merged
merged 1 commit into from
Jul 19, 2023
Merged

fix(core): Banner dismissal should also work for users migrating to v1 (no-changelog) #6700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 16 additions & 23 deletions packages/cli/src/databases/repositories/settings.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Service } from 'typedi';
import { DataSource, Repository } from 'typeorm';
import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
import { Settings } from '../entities/Settings';
import config from '@/config';

Expand All @@ -10,32 +11,24 @@ export class SettingsRepository extends Repository<Settings> {
}

async dismissBanner({ bannerName }: { bannerName: string }): Promise<{ success: boolean }> {
const dismissedBannersSetting = await this.findOneBy({ key: 'ui.banners.dismissed' });

if (dismissedBannersSetting) {
try {
const key = 'ui.banners.dismissed';
const dismissedBannersSetting = await this.findOneBy({ key });
try {
let value: string;
if (dismissedBannersSetting) {
const dismissedBanners = JSON.parse(dismissedBannersSetting.value) as string[];
await this.saveSetting(
'ui.banners.dismissed',
JSON.stringify([...dismissedBanners, bannerName]),
);
return { success: true };
} catch (error) {
return { success: false };
const updatedValue = [...new Set([...dismissedBanners, bannerName].sort())];
value = JSON.stringify(updatedValue);
await this.update({ key }, { value, loadOnStartup: true });
} else {
value = JSON.stringify([bannerName]);
await this.save({ key, value, loadOnStartup: true });
}
config.set(key, value);
return { success: true };
} catch (error) {
ErrorReporter.error(error);
}
return { success: false };
}

async saveSetting(key: string, value: string, loadOnStartup = true) {
const setting = await this.findOneBy({ key });

if (setting) {
await this.update({ key }, { value, loadOnStartup });
} else {
await this.save({ key, value, loadOnStartup });
}

if (loadOnStartup) config.set('ui.banners.dismissed', value);
}
}
Loading