mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Remove 'Update Now' notification
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
parent
3084b7b8d9
commit
f1f153a152
@ -628,7 +628,7 @@ exports[`installing update using tray when started when user checks for updates
|
|||||||
>
|
>
|
||||||
<i
|
<i
|
||||||
class="Icon close material interactive focusable"
|
class="Icon close material interactive focusable"
|
||||||
data-testid="close-notification-for-notification_371"
|
data-testid="close-notification-for-notification_335"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
@ -668,77 +668,7 @@ exports[`installing update using tray when started when user checks for updates
|
|||||||
>
|
>
|
||||||
<i
|
<i
|
||||||
class="Icon close material interactive focusable"
|
class="Icon close material interactive focusable"
|
||||||
data-testid="close-notification-for-notification_374"
|
data-testid="close-notification-for-notification_338"
|
||||||
tabindex="0"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="icon"
|
|
||||||
data-icon-name="close"
|
|
||||||
>
|
|
||||||
close
|
|
||||||
</span>
|
|
||||||
</i>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="Animate opacity notification flex info enter"
|
|
||||||
style="--enter-duration: 100ms; --leave-duration: 100ms;"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="box"
|
|
||||||
>
|
|
||||||
<i
|
|
||||||
class="Icon material focusable"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="icon"
|
|
||||||
data-icon-name="info_outline"
|
|
||||||
>
|
|
||||||
info_outline
|
|
||||||
</span>
|
|
||||||
</i>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="message box grow"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="flex column gaps"
|
|
||||||
data-testid="ask-boolean-some-irrelevant-random-id"
|
|
||||||
>
|
|
||||||
<b>
|
|
||||||
Update Available
|
|
||||||
</b>
|
|
||||||
<p>
|
|
||||||
Version some-version of Lens IDE is available and ready to be installed. Would you like to update now?
|
|
||||||
|
|
||||||
Lens should restart automatically, if it doesn't please restart manually. Installed extensions might require updating.
|
|
||||||
</p>
|
|
||||||
<div
|
|
||||||
class="flex gaps row align-left box grow"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="Button light"
|
|
||||||
data-testid="ask-boolean-some-irrelevant-random-id-button-yes"
|
|
||||||
type="button"
|
|
||||||
>
|
|
||||||
Yes
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
class="Button active outlined"
|
|
||||||
data-testid="ask-boolean-some-irrelevant-random-id-button-no"
|
|
||||||
type="button"
|
|
||||||
>
|
|
||||||
No
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="box"
|
|
||||||
>
|
|
||||||
<i
|
|
||||||
class="Icon close material interactive focusable"
|
|
||||||
data-testid="close-notification-for-ask-boolean-for-some-irrelevant-random-id"
|
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
|
|||||||
@ -15,8 +15,6 @@ import asyncFn from "@async-fn/jest";
|
|||||||
import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
|
import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable";
|
||||||
import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
|
import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable";
|
||||||
import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable";
|
import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable";
|
||||||
import type { AskBoolean } from "../../main/ask-boolean/ask-boolean.injectable";
|
|
||||||
import askBooleanInjectable from "../../main/ask-boolean/ask-boolean.injectable";
|
|
||||||
import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable";
|
import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable";
|
||||||
import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
|
import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
|
||||||
|
|
||||||
@ -27,7 +25,6 @@ describe("installing update", () => {
|
|||||||
let downloadPlatformUpdateMock: AsyncFnMock<DownloadPlatformUpdate>;
|
let downloadPlatformUpdateMock: AsyncFnMock<DownloadPlatformUpdate>;
|
||||||
let setUpdateOnQuitMock: jest.Mock;
|
let setUpdateOnQuitMock: jest.Mock;
|
||||||
let showInfoNotificationMock: jest.Mock;
|
let showInfoNotificationMock: jest.Mock;
|
||||||
let askBooleanMock: AsyncFnMock<AskBoolean>;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
applicationBuilder = getApplicationBuilder();
|
applicationBuilder = getApplicationBuilder();
|
||||||
@ -38,11 +35,9 @@ describe("installing update", () => {
|
|||||||
downloadPlatformUpdateMock = asyncFn();
|
downloadPlatformUpdateMock = asyncFn();
|
||||||
setUpdateOnQuitMock = jest.fn();
|
setUpdateOnQuitMock = jest.fn();
|
||||||
showInfoNotificationMock = jest.fn(() => () => {});
|
showInfoNotificationMock = jest.fn(() => () => {});
|
||||||
askBooleanMock = asyncFn();
|
|
||||||
|
|
||||||
rendererDi.override(showInfoNotificationInjectable, () => showInfoNotificationMock);
|
rendererDi.override(showInfoNotificationInjectable, () => showInfoNotificationMock);
|
||||||
|
|
||||||
mainDi.override(askBooleanInjectable, () => askBooleanMock);
|
|
||||||
mainDi.override(setUpdateOnQuitInjectable, () => setUpdateOnQuitMock);
|
mainDi.override(setUpdateOnQuitInjectable, () => setUpdateOnQuitMock);
|
||||||
|
|
||||||
mainDi.override(
|
mainDi.override(
|
||||||
@ -160,10 +155,6 @@ describe("installing update", () => {
|
|||||||
expect(showInfoNotificationMock).toHaveBeenCalledWith("Download of update failed");
|
expect(showInfoNotificationMock).toHaveBeenCalledWith("Download of update failed");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("does not ask user to install update", () => {
|
|
||||||
expect(askBooleanMock).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("renders", () => {
|
it("renders", () => {
|
||||||
expect(rendered.baseElement).toMatchSnapshot();
|
expect(rendered.baseElement).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
@ -181,43 +172,6 @@ describe("installing update", () => {
|
|||||||
it("renders", () => {
|
it("renders", () => {
|
||||||
expect(rendered.baseElement).toMatchSnapshot();
|
expect(rendered.baseElement).toMatchSnapshot();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("asks user to install update immediately", () => {
|
|
||||||
expect(askBooleanMock).toHaveBeenCalledWith({
|
|
||||||
title: "Update Available",
|
|
||||||
question:
|
|
||||||
"Version some-version of Lens IDE is available and ready to be installed. Would you like to update now?\n\n" +
|
|
||||||
"Lens should restart automatically, if it doesn't please restart manually. Installed extensions might require updating.",
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when user answers to install the update", () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
await askBooleanMock.resolve(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("renders", () => {
|
|
||||||
expect(rendered.baseElement).toMatchSnapshot();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("quits application and installs the update", () => {
|
|
||||||
expect(quitAndInstallUpdateMock).toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("when user answers not to install the update", () => {
|
|
||||||
beforeEach(async () => {
|
|
||||||
await askBooleanMock.resolve(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("renders", () => {
|
|
||||||
expect(rendered.baseElement).toMatchSnapshot();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not quit application and install the update", () => {
|
|
||||||
expect(quitAndInstallUpdateMock).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@ -19,8 +19,6 @@ import downloadPlatformUpdateInjectable from "../../main/application-update/down
|
|||||||
import selectedUpdateChannelInjectable from "../../common/application-update/selected-update-channel/selected-update-channel.injectable";
|
import selectedUpdateChannelInjectable from "../../common/application-update/selected-update-channel/selected-update-channel.injectable";
|
||||||
import type { IComputedValue } from "mobx";
|
import type { IComputedValue } from "mobx";
|
||||||
import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable";
|
import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable";
|
||||||
import type { AskBoolean } from "../../main/ask-boolean/ask-boolean.injectable";
|
|
||||||
import askBooleanInjectable from "../../main/ask-boolean/ask-boolean.injectable";
|
|
||||||
import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable";
|
import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable";
|
||||||
import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
|
import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
|
||||||
import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable";
|
import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable";
|
||||||
@ -32,7 +30,6 @@ describe("selection of update stability", () => {
|
|||||||
let downloadPlatformUpdateMock: AsyncFnMock<DownloadPlatformUpdate>;
|
let downloadPlatformUpdateMock: AsyncFnMock<DownloadPlatformUpdate>;
|
||||||
let setUpdateOnQuitMock: jest.Mock;
|
let setUpdateOnQuitMock: jest.Mock;
|
||||||
let showInfoNotificationMock: jest.Mock;
|
let showInfoNotificationMock: jest.Mock;
|
||||||
let askBooleanMock: AsyncFnMock<AskBoolean>;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
applicationBuilder = getApplicationBuilder();
|
applicationBuilder = getApplicationBuilder();
|
||||||
@ -43,11 +40,9 @@ describe("selection of update stability", () => {
|
|||||||
downloadPlatformUpdateMock = asyncFn();
|
downloadPlatformUpdateMock = asyncFn();
|
||||||
setUpdateOnQuitMock = jest.fn();
|
setUpdateOnQuitMock = jest.fn();
|
||||||
showInfoNotificationMock = jest.fn(() => () => {});
|
showInfoNotificationMock = jest.fn(() => () => {});
|
||||||
askBooleanMock = asyncFn();
|
|
||||||
|
|
||||||
rendererDi.override(showInfoNotificationInjectable, () => showInfoNotificationMock);
|
rendererDi.override(showInfoNotificationInjectable, () => showInfoNotificationMock);
|
||||||
|
|
||||||
mainDi.override(askBooleanInjectable, () => askBooleanMock);
|
|
||||||
mainDi.override(setUpdateOnQuitInjectable, () => setUpdateOnQuitMock);
|
mainDi.override(setUpdateOnQuitInjectable, () => setUpdateOnQuitMock);
|
||||||
|
|
||||||
mainDi.override(
|
mainDi.override(
|
||||||
|
|||||||
@ -7,21 +7,17 @@ import selectedUpdateChannelInjectable from "../../../common/application-update/
|
|||||||
import updatesAreBeingDiscoveredInjectable from "../../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.injectable";
|
import updatesAreBeingDiscoveredInjectable from "../../../common/application-update/updates-are-being-discovered/updates-are-being-discovered.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 { runInAction } from "mobx";
|
import { runInAction } from "mobx";
|
||||||
import askBooleanInjectable from "../../ask-boolean/ask-boolean.injectable";
|
|
||||||
import downloadUpdateInjectable from "../download-update/download-update.injectable";
|
import downloadUpdateInjectable from "../download-update/download-update.injectable";
|
||||||
import broadcastChangeInUpdatingStatusInjectable from "./broadcast-change-in-updating-status.injectable";
|
import broadcastChangeInUpdatingStatusInjectable from "./broadcast-change-in-updating-status.injectable";
|
||||||
import checkForUpdatesStartingFromChannelInjectable from "./check-for-updates-starting-from-channel.injectable";
|
import checkForUpdatesStartingFromChannelInjectable from "./check-for-updates-starting-from-channel.injectable";
|
||||||
import withOrphanPromiseInjectable from "../../../common/utils/with-orphan-promise/with-orphan-promise.injectable";
|
import withOrphanPromiseInjectable from "../../../common/utils/with-orphan-promise/with-orphan-promise.injectable";
|
||||||
import emitEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
|
import emitEventInjectable from "../../../common/app-event-bus/emit-event.injectable";
|
||||||
import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time";
|
import { getCurrentDateTime } from "../../../common/utils/date/get-current-date-time";
|
||||||
import quitAndInstallUpdateInjectable from "../quit-and-install-update.injectable";
|
|
||||||
|
|
||||||
const processCheckingForUpdatesInjectable = getInjectable({
|
const processCheckingForUpdatesInjectable = getInjectable({
|
||||||
id: "process-checking-for-updates",
|
id: "process-checking-for-updates",
|
||||||
|
|
||||||
instantiate: (di) => {
|
instantiate: (di) => {
|
||||||
const askBoolean = di.inject(askBooleanInjectable);
|
|
||||||
const quitAndInstallUpdate = di.inject(quitAndInstallUpdateInjectable);
|
|
||||||
const downloadUpdate = di.inject(downloadUpdateInjectable);
|
const downloadUpdate = di.inject(downloadUpdateInjectable);
|
||||||
const selectedUpdateChannel = di.inject(selectedUpdateChannelInjectable);
|
const selectedUpdateChannel = di.inject(selectedUpdateChannelInjectable);
|
||||||
const broadcastChangeInUpdatingStatus = di.inject(broadcastChangeInUpdatingStatusInjectable);
|
const broadcastChangeInUpdatingStatus = di.inject(broadcastChangeInUpdatingStatusInjectable);
|
||||||
@ -86,19 +82,6 @@ const processCheckingForUpdatesInjectable = getInjectable({
|
|||||||
broadcastChangeInUpdatingStatus({
|
broadcastChangeInUpdatingStatus({
|
||||||
eventId: "download-for-update-failed",
|
eventId: "download-for-update-failed",
|
||||||
});
|
});
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const userWantsToInstallUpdate = await askBoolean({
|
|
||||||
title: "Update Available",
|
|
||||||
|
|
||||||
question: `Version ${version} of Lens IDE is available and ready to be installed. Would you like to update now?\n\n` +
|
|
||||||
`Lens should restart automatically, if it doesn't please restart manually. Installed extensions might require updating.`,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (userWantsToInstallUpdate) {
|
|
||||||
quitAndInstallUpdate();
|
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user