hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Make a primitive argument an object for readability

Browse Source 
Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>

Signed-off-by: Iku-turso <mikko.aspiala@gmail.com>
This commit is contained in:
Iku-turso 2022-05-30 14:44:29 +03:00
parent ac4642ec04
commit 6411b225c0
6 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/behaviours/application-update/installing-update-using-tray.test.ts
View File

@ -159,7 +159,7 @@ describe("installing update using tray", () => {
progressOfUpdateDownloadInjectable, progressOfUpdateDownloadInjectable,
); );
progressOfUpdateDownload.set(42); progressOfUpdateDownload.set({ percentage: 42 });
expect( expect(
applicationBuilder.tray.get("check-for-updates")?.label?.get(), applicationBuilder.tray.get("check-for-updates")?.label?.get(),

6
src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts
View File

@ -6,13 +6,17 @@ import { getInjectable } from "@ogre-tools/injectable";
import createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable"; import createSyncBoxInjectable from "../../sync-box/create-sync-box.injectable";
import { syncBoxInjectionToken } from "../../sync-box/sync-box-injection-token"; import { syncBoxInjectionToken } from "../../sync-box/sync-box-injection-token";
export interface ProgressOfDownload {
percentage: number;
}
const progressOfUpdateDownloadInjectable = getInjectable({ const progressOfUpdateDownloadInjectable = getInjectable({
id: "progress-of-update-download-state", id: "progress-of-update-download-state",
instantiate: (di) => { instantiate: (di) => {
const createSyncBox = di.inject(createSyncBoxInjectable); const createSyncBox = di.inject(createSyncBoxInjectable);
return createSyncBox("progress-of-update-download", 0); return createSyncBox<ProgressOfDownload>("progress-of-update-download", { percentage: 0 });
}, },
injectionToken: syncBoxInjectionToken, injectionToken: syncBoxInjectionToken,

2
src/main/application-update/check-for-updates-tray-item.injectable.ts
View File

@ -41,7 +41,7 @@ const checkForUpdatesTrayItemInjectable = getInjectable({
assert(discoveredVersion); assert(discoveredVersion);
return `Downloading update ${discoveredVersion.version} (${progressOfUpdateDownload.value.get()}%)...`; return `Downloading update ${discoveredVersion.version} (${progressOfUpdateDownload.value.get().percentage}%)...`;
} }
if (checkingForUpdatesState.value.get()) { if (checkingForUpdatesState.value.get()) {

8
src/main/application-update/download-platform-update/download-platform-update.injectable.ts
View File

@ -6,9 +6,10 @@ import { getInjectable } from "@ogre-tools/injectable";
import electronUpdaterInjectable from "../../electron-app/features/electron-updater.injectable"; import electronUpdaterInjectable from "../../electron-app/features/electron-updater.injectable";
import loggerInjectable from "../../../common/logger.injectable"; import loggerInjectable from "../../../common/logger.injectable";
import type { ProgressInfo } from "electron-updater"; import type { ProgressInfo } from "electron-updater";
import type { ProgressOfDownload } from "../../../common/application-update/progress-of-update-download/progress-of-update-download.injectable";
export type DownloadPlatformUpdate = ( export type DownloadPlatformUpdate = (
onDownloadProgress: (percentage: number) => void onDownloadProgress: (arg: ProgressOfDownload) => void
) => Promise<{ downloadWasSuccessful: boolean }>; ) => Promise<{ downloadWasSuccessful: boolean }>;
const downloadPlatformUpdateInjectable = getInjectable({ const downloadPlatformUpdateInjectable = getInjectable({
@ -19,9 +20,10 @@ const downloadPlatformUpdateInjectable = getInjectable({
const logger = di.inject(loggerInjectable); const logger = di.inject(loggerInjectable);
return async (onDownloadProgress) => { return async (onDownloadProgress) => {
onDownloadProgress(0); onDownloadProgress({ percentage: 0 });
const updateDownloadProgress = ({ percent }: ProgressInfo) => onDownloadProgress(percent); const updateDownloadProgress = ({ percent: percentage }: ProgressInfo) =>
onDownloadProgress({ percentage });
electronUpdater.on("download-progress", updateDownloadProgress); electronUpdater.on("download-progress", updateDownloadProgress);

9
src/main/application-update/download-platform-update/download-platform-update.test.ts
View File

@ -4,6 +4,7 @@
*/ */
import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import { getDiForUnitTesting } from "../../getDiForUnitTesting";
import electronUpdaterInjectable from "../../electron-app/features/electron-updater.injectable"; import electronUpdaterInjectable from "../../electron-app/features/electron-updater.injectable";
import type { DownloadPlatformUpdate } from "./download-platform-update.injectable";
import downloadPlatformUpdateInjectable from "./download-platform-update.injectable"; import downloadPlatformUpdateInjectable from "./download-platform-update.injectable";
import type { AppUpdater } from "electron-updater"; import type { AppUpdater } from "electron-updater";
import type { AsyncFnMock } from "@async-fn/jest"; import type { AsyncFnMock } from "@async-fn/jest";
@ -14,7 +15,7 @@ import loggerInjectable from "../../../common/logger.injectable";
import type { Logger } from "../../../common/logger"; import type { Logger } from "../../../common/logger";
describe("download-platform-update", () => { describe("download-platform-update", () => {
let downloadPlatformUpdate: (onDownloadProgress: (percentage: number) => void) => Promise<{ downloadWasSuccessful: boolean }>; let downloadPlatformUpdate: DownloadPlatformUpdate;
let downloadUpdateMock: AsyncFnMock<() => void>; let downloadUpdateMock: AsyncFnMock<() => void>;
let electronUpdaterFake: AppUpdater; let electronUpdaterFake: AppUpdater;
let electronUpdaterOnMock: jest.Mock; let electronUpdaterOnMock: jest.Mock;
@ -68,7 +69,7 @@ describe("download-platform-update", () => {
}); });
it("starts progress of download from 0", () => { it("starts progress of download from 0", () => {
expect(onDownloadProgressMock).toHaveBeenCalledWith(0); expect(onDownloadProgressMock).toHaveBeenCalledWith({ percentage: 0 });
}); });
describe("when downloading progresses", () => { describe("when downloading progresses", () => {
@ -89,7 +90,7 @@ describe("download-platform-update", () => {
}); });
it("updates progress of the download", () => { it("updates progress of the download", () => {
expect(onDownloadProgressMock).toHaveBeenCalledWith(42); expect(onDownloadProgressMock).toHaveBeenCalledWith({ percentage: 42 });
}); });
describe("when downloading resolves", () => { describe("when downloading resolves", () => {
@ -119,7 +120,7 @@ describe("download-platform-update", () => {
it("when starting download again, resets progress of download", () => { it("when starting download again, resets progress of download", () => {
downloadPlatformUpdate(onDownloadProgressMock); downloadPlatformUpdate(onDownloadProgressMock);
expect(onDownloadProgressMock).toHaveBeenCalledWith(0); expect(onDownloadProgressMock).toHaveBeenCalledWith({ percentage: 0 });
}); });
}); });

7
src/main/application-update/download-update/download-update.injectable.ts
View File

@ -7,6 +7,7 @@ import downloadPlatformUpdateInjectable from "../download-platform-update/downlo
import updateIsBeingDownloadedInjectable from "../../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable"; import updateIsBeingDownloadedInjectable from "../../../common/application-update/update-is-being-downloaded/update-is-being-downloaded.injectable";
import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable"; import discoveredUpdateVersionInjectable from "../../../common/application-update/discovered-update-version/discovered-update-version.injectable";
import { action, runInAction } from "mobx"; import { action, runInAction } from "mobx";
import type { ProgressOfDownload } from "../../../common/application-update/progress-of-update-download/progress-of-update-download.injectable";
import progressOfUpdateDownloadInjectable from "../../../common/application-update/progress-of-update-download/progress-of-update-download.injectable"; import progressOfUpdateDownloadInjectable from "../../../common/application-update/progress-of-update-download/progress-of-update-download.injectable";
const downloadUpdateInjectable = getInjectable({ const downloadUpdateInjectable = getInjectable({
@ -18,13 +19,13 @@ const downloadUpdateInjectable = getInjectable({
const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable); const discoveredVersionState = di.inject(discoveredUpdateVersionInjectable);
const progressOfUpdateDownload = di.inject(progressOfUpdateDownloadInjectable); const progressOfUpdateDownload = di.inject(progressOfUpdateDownloadInjectable);
const updateDownloadProgress = action((percentage: number) => { const updateDownloadProgress = action((progressOfDownload: ProgressOfDownload) => {
progressOfUpdateDownload.set(percentage); progressOfUpdateDownload.set(progressOfDownload);
}); });
return async () => { return async () => {
runInAction(() => { runInAction(() => {
progressOfUpdateDownload.set(0); progressOfUpdateDownload.set({ percentage: 0 });
downloadingUpdateState.set(true); downloadingUpdateState.set(true);
}); });