From 7623dc7badaa87f7826f267866038bdfe7c1677a Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 19 May 2022 11:28:42 +0300 Subject: [PATCH] Tweak code style Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- .../electron-tray/electron-tray.injectable.ts | 2 +- .../tray-menu-item-registrator.injectable.ts | 16 +++++++++------- src/main/tray/tray.ts | 2 +- ...ll-application-update-tray-item.injectable.ts | 4 ++-- ...if-update-should-happen-on-quit.injectable.ts | 6 +++++- src/test-utils/override-ipc-bridge.ts | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/tray/electron-tray/electron-tray.injectable.ts b/src/main/tray/electron-tray/electron-tray.injectable.ts index 47572d59f8..409e7abf3f 100644 --- a/src/main/tray/electron-tray/electron-tray.injectable.ts +++ b/src/main/tray/electron-tray/electron-tray.injectable.ts @@ -82,7 +82,7 @@ const convertToElectronMenuTemplate = (trayMenuItems: TrayMenuItem[]) => { return { id: trayMenuItem.id, - label: trayMenuItem.label.get(), + label: trayMenuItem.label?.get(), enabled: trayMenuItem.enabled.get(), toolTip: trayMenuItem.tooltip, diff --git a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts b/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts index 47c0df29d5..c6b0b5b270 100644 --- a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts +++ b/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts @@ -16,11 +16,13 @@ import type { TrayMenuRegistration } from "../tray-menu-registration"; const trayMenuItemRegistratorInjectable = getInjectable({ id: "tray-menu-item-registrator", - instantiate: (di) => (extension: LensMainExtension, installationCounter) => { - pipeline( - extension.trayMenus, + instantiate: (di) => (extension, installationCounter) => { + const mainExtension = extension as LensMainExtension; - flatMap(toItemInjectablesFor(extension, installationCounter)), + pipeline( + mainExtension.trayMenus, + + flatMap(toItemInjectablesFor(mainExtension, installationCounter)), (injectables) => di.register(...injectables), ); @@ -34,7 +36,7 @@ export default trayMenuItemRegistratorInjectable; const toItemInjectablesFor = (extension: LensMainExtension, installationCounter: number) => { const _toItemInjectables = (parentId: string | null) => (registration: TrayMenuRegistration): Injectable[] => { - const trayItemId = registration.id || kebabCase(registration.label); + const trayItemId = registration.id || kebabCase(registration.label || ""); const id = `${trayItemId}-tray-menu-item-for-extension-${extension.sanitizedExtensionId}-instance-${installationCounter}`; const parentInjectable = getInjectable({ @@ -47,14 +49,14 @@ const toItemInjectablesFor = (extension: LensMainExtension, installationCounter: separator: registration.type === "separator", - label: computed(() => registration.label), + label: computed(() => registration.label || ""), tooltip: registration.toolTip, click: () => { registration.click?.(registration); }, - enabled: computed(() => registration.enabled), + enabled: computed(() => !!registration.enabled), visible: computed(() => true), }), diff --git a/src/main/tray/tray.ts b/src/main/tray/tray.ts index 8bb7768583..561f8adebd 100644 --- a/src/main/tray/tray.ts +++ b/src/main/tray/tray.ts @@ -72,7 +72,7 @@ const toTrayMenuOptions = (trayMenuItems: TrayMenuItem[]) => { return { id: trayMenuItem.id, - label: trayMenuItem.label.get(), + label: trayMenuItem.label?.get(), enabled: trayMenuItem.enabled.get(), toolTip: trayMenuItem.tooltip, diff --git a/src/main/update-app/install-application-update-tray-item.injectable.ts b/src/main/update-app/install-application-update-tray-item.injectable.ts index 3a3e9002e3..6b1cb9fec7 100644 --- a/src/main/update-app/install-application-update-tray-item.injectable.ts +++ b/src/main/update-app/install-application-update-tray-item.injectable.ts @@ -23,7 +23,7 @@ const installApplicationUpdateTrayItemInjectable = getInjectable({ orderNumber: 50, label: computed(() => { - const versionToBeInstalled = discoveredVersionState.value.get().version; + const versionToBeInstalled = discoveredVersionState.value.get()?.version; return `Install update ${versionToBeInstalled}`; }), @@ -31,7 +31,7 @@ const installApplicationUpdateTrayItemInjectable = getInjectable({ enabled: computed(() => true), visible: computed( - () => discoveredVersionState.value.get() && !downloadingUpdateState.value.get(), + () => !!discoveredVersionState.value.get() && !downloadingUpdateState.value.get(), ), click: () => { diff --git a/src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts b/src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts index d9e4c56f38..4996212490 100644 --- a/src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts +++ b/src/main/update-app/watch-if-update-should-happen-on-quit/watch-if-update-should-happen-on-quit.injectable.ts @@ -27,7 +27,11 @@ const watchIfUpdateShouldHappenOnQuitInjectable = getInjectable({ const updateIsDiscoveredFromChannel = discoveredVersion?.updateChannel; - const updateOnQuit = sufficientlyStableUpdateChannels.includes(updateIsDiscoveredFromChannel); + const updateOnQuit = updateIsDiscoveredFromChannel + ? sufficientlyStableUpdateChannels.includes( + updateIsDiscoveredFromChannel, + ) + : false; setUpdateOnQuit(updateOnQuit); }), diff --git a/src/test-utils/override-ipc-bridge.ts b/src/test-utils/override-ipc-bridge.ts index 61858b3b0a..fba4d837fd 100644 --- a/src/test-utils/override-ipc-bridge.ts +++ b/src/test-utils/override-ipc-bridge.ts @@ -123,7 +123,7 @@ export const overrideIpcBridge = ({ ); rendererDi.override(sendToMainInjectable, () => (channelId, message) => { - const handles = mainIpcFakeHandles.get(channelId); + const handles = mainIpcFakeHandles.get(channelId) || []; if (isEmpty(handles)) { throw new Error(