From b5c5e4f8f798ffe52b13825098c4de5508314987 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 25 May 2022 14:41:14 +0300 Subject: [PATCH] Add setter for downloadedUpdateDate Signed-off-by: Alex Andreev --- .../app-update-warning/app-update-warning.ts | 25 ++++++++++++++----- .../update-button/update-button.tsx | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/renderer/app-update-warning/app-update-warning.ts b/src/renderer/app-update-warning/app-update-warning.ts index 5bae44c929..01b97e9fd5 100644 --- a/src/renderer/app-update-warning/app-update-warning.ts +++ b/src/renderer/app-update-warning/app-update-warning.ts @@ -4,12 +4,14 @@ */ import { computed, makeObservable, observable } from "mobx"; import type { UpdateAvailableFromMain } from "../../common/ipc"; -import { ipcRendererOn, UpdateAvailableChannel } from "../../common/ipc"; +import { UpdateAvailableChannel } from "../../common/ipc"; import { Singleton } from "../utils"; import moment from "moment"; +import type { IpcRenderer } from "electron"; interface Dependencies { - releaseDate: string; + readonly releaseDate: string; + readonly ipcRenderer: IpcRenderer; } export class AppUpdateWarning extends Singleton { @@ -19,15 +21,26 @@ export class AppUpdateWarning extends Singleton { super(); makeObservable(this); - ipcRendererOn(UpdateAvailableChannel, (event, ...[, updateInfo]: UpdateAvailableFromMain) => { - this.updateReleaseDate = updateInfo.releaseDate; + dependencies.ipcRenderer.on(UpdateAvailableChannel, (event, ...[, updateInfo]: UpdateAvailableFromMain) => { + this.downloadedUpdateDate = updateInfo?.releaseDate; }); } + set downloadedUpdateDate(date: string) { + this.updateReleaseDate = date; + } + @computed get warningLevel(): "high" | "medium" | "light" | "" { - const update = moment(this.updateReleaseDate); - const release = moment(this.dependencies.releaseDate); + const { updateReleaseDate, dependencies } = this; + const { releaseDate } = dependencies; + + if (!updateReleaseDate || !releaseDate) { + return ""; + } + + const update = moment(updateReleaseDate); + const release = moment(releaseDate); const duration = moment.duration(update.diff(release)); const days = duration.asDays(); diff --git a/src/renderer/components/update-button/update-button.tsx b/src/renderer/components/update-button/update-button.tsx index 723c75aef7..600efaa04e 100644 --- a/src/renderer/components/update-button/update-button.tsx +++ b/src/renderer/components/update-button/update-button.tsx @@ -12,7 +12,7 @@ import { cssNames } from "../../utils"; import type { IconProps } from "../icon"; import { Icon } from "../icon"; import { withInjectables } from "@ogre-tools/injectable-react"; -import appUpdateWarningInjectable from "../../app-freshness/app-update-warning.injectable"; +import appUpdateWarningInjectable from "../../app-update-warning/app-update-warning.injectable"; interface UpdateButtonProps extends HTMLAttributes { update: () => void;