From 8217ad4ba8a0b697a4a87c92cf5a08451982ba82 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 1 Dec 2022 08:16:22 -0500 Subject: [PATCH] More consistent use of BaseStore.displayName Signed-off-by: Sebastian Malton --- src/common/base-store/base-store.ts | 14 ++++++-------- src/common/cluster-store/cluster-store.ts | 1 - src/common/hotbars/store.ts | 1 - src/common/user-store/user-store.ts | 2 -- src/common/weblinks-store/weblink-store.ts | 1 - .../file-system-provisioner-store.ts | 1 - src/extensions/extension-store.ts | 1 - .../extensions-store/extensions-store.ts | 1 - 8 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/common/base-store/base-store.ts b/src/common/base-store/base-store.ts index ff6358ae86..1144c5192c 100644 --- a/src/common/base-store/base-store.ts +++ b/src/common/base-store/base-store.ts @@ -40,22 +40,20 @@ export abstract class BaseStore { protected storeConfig?: Config; protected syncDisposers: Disposer[] = []; - readonly displayName = this.params.configName; + readonly displayName = kebabCase(this.params.configName).toUpperCase(); protected constructor( protected readonly dependencies: BaseStoreDependencies, protected readonly params: BaseStoreParams, ) { makeObservable(this); - - this.displayName = this.params.configName; } /** * This must be called after the last child's constructor is finished (or just before it finishes) */ load() { - this.dependencies.logger.info(`[${kebabCase(this.displayName).toUpperCase()}]: LOADING ...`); + this.dependencies.logger.info(`[${this.displayName}]: LOADING ...`); this.storeConfig = this.dependencies.getConfigurationFileModel({ projectName: "lens", projectVersion: this.dependencies.storeMigrationVersion, @@ -71,7 +69,7 @@ export abstract class BaseStore { } this.enableSync(); - this.dependencies.logger.info(`[${kebabCase(this.displayName).toUpperCase()}]: LOADED from ${this.path}`); + this.dependencies.logger.info(`[${this.displayName}]: LOADED from ${this.path}`); } get name() { @@ -95,7 +93,7 @@ export abstract class BaseStore { } protected saveToFile(model: T) { - this.dependencies.logger.info(`[STORE]: SAVING ${this.path}`); + this.dependencies.logger.info(`[${this.displayName}]: SAVING ${this.path}`); // todo: update when fixed https://github.com/sindresorhus/conf/issues/114 if (this.storeConfig) { @@ -116,14 +114,14 @@ export abstract class BaseStore { if (ipcMain) { this.syncDisposers.push(ipcMainOn(this.syncMainChannel, (event, model: T) => { - this.dependencies.logger.silly(`[STORE]: SYNC ${this.name} from renderer`, { model }); + this.dependencies.logger.silly(`[${this.displayName}]: SYNC ${this.name} from renderer`, { model }); this.onSync(model); })); } if (ipcRenderer) { this.syncDisposers.push(ipcRendererOn(this.syncRendererChannel, (event, model: T) => { - this.dependencies.logger.silly(`[STORE]: SYNC ${this.name} from main`, { model }); + this.dependencies.logger.silly(`[${this.displayName}]: SYNC ${this.name} from main`, { model }); this.onSyncFromMain(model); })); } diff --git a/src/common/cluster-store/cluster-store.ts b/src/common/cluster-store/cluster-store.ts index 825db40b31..c0730f9675 100644 --- a/src/common/cluster-store/cluster-store.ts +++ b/src/common/cluster-store/cluster-store.ts @@ -27,7 +27,6 @@ interface Dependencies extends BaseStoreDependencies { } export class ClusterStore extends BaseStore { - readonly displayName = "ClusterStore"; readonly clusters = observable.map(); protected readonly disposer = disposer(); diff --git a/src/common/hotbars/store.ts b/src/common/hotbars/store.ts index 9c39c71285..427a764650 100644 --- a/src/common/hotbars/store.ts +++ b/src/common/hotbars/store.ts @@ -27,7 +27,6 @@ interface Dependencies extends BaseStoreDependencies { } export class HotbarStore extends BaseStore { - readonly displayName = "HotbarStore"; @observable hotbars: Hotbar[] = []; @observable private _activeHotbarId!: string; diff --git a/src/common/user-store/user-store.ts b/src/common/user-store/user-store.ts index d781cf457a..b19ddadb53 100644 --- a/src/common/user-store/user-store.ts +++ b/src/common/user-store/user-store.ts @@ -26,8 +26,6 @@ interface Dependencies extends BaseStoreDependencies { } export class UserStore extends BaseStore /* implements UserStoreFlatModel (when strict null is enabled) */ { - readonly displayName = "UserStore"; - constructor(protected readonly dependencies: Dependencies) { super(dependencies, { configName: "lens-user-store", diff --git a/src/common/weblinks-store/weblink-store.ts b/src/common/weblinks-store/weblink-store.ts index 91bf578e84..2044ca08c1 100644 --- a/src/common/weblinks-store/weblink-store.ts +++ b/src/common/weblinks-store/weblink-store.ts @@ -27,7 +27,6 @@ export interface WeblinkStoreModel { } export class WeblinkStore extends BaseStore { - readonly displayName = "WeblinkStore"; @observable weblinks: WeblinkData[] = []; constructor(deps: BaseStoreDependencies) { diff --git a/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.ts b/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.ts index 85e1a8bef9..df1b9af4c0 100644 --- a/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.ts +++ b/src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.ts @@ -25,7 +25,6 @@ interface Dependencies extends BaseStoreDependencies { } export class FileSystemProvisionerStore extends BaseStore { - readonly displayName = "FilesystemProvisionerStore"; readonly registeredExtensions = observable.map(); constructor(protected readonly dependencies: Dependencies) { diff --git a/src/extensions/extension-store.ts b/src/extensions/extension-store.ts index 896d6e0f0b..844ee51d72 100644 --- a/src/extensions/extension-store.ts +++ b/src/extensions/extension-store.ts @@ -63,7 +63,6 @@ export abstract class ExtensionStore extends BaseStore { ExtensionStore.instances.delete(this); } - readonly displayName = "ExtensionStore"; protected extension?: LensExtension; loadExtension(extension: LensExtension) { diff --git a/src/extensions/extensions-store/extensions-store.ts b/src/extensions/extensions-store/extensions-store.ts index 07451dc27a..3b2dc80eb1 100644 --- a/src/extensions/extensions-store/extensions-store.ts +++ b/src/extensions/extensions-store/extensions-store.ts @@ -24,7 +24,6 @@ export interface IsEnabledExtensionDescriptor { } export class ExtensionsStore extends BaseStore { - readonly displayName = "ExtensionsStore"; constructor(deps: BaseStoreDependencies) { super(deps, { configName: "lens-extensions",