From 2eb9ba5142d6a0e7dc49464249b38692e86dccbe Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 9 May 2022 12:49:47 +0300 Subject: [PATCH] Relocate file to directory containing feature Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- ...navigation-using-application-menu.test.tsx | 2 +- .../navigation-using-application-menu.test.ts | 2 +- .../navigation-using-application-menu.test.ts | 2 +- src/main/is-auto-update-enabled.injectable.ts | 19 --------------- .../menu/application-menu-items.injectable.ts | 2 +- src/main/start-update-checking.injectable.ts | 2 +- .../is-auto-update-enabled.injectable.ts | 24 +++++++++++++++++++ 7 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 src/main/is-auto-update-enabled.injectable.ts create mode 100644 src/main/update-app/is-auto-update-enabled.injectable.ts diff --git a/src/behaviours/add-cluster/navigation-using-application-menu.test.tsx b/src/behaviours/add-cluster/navigation-using-application-menu.test.tsx index e982b9de1c..aeb6f89383 100644 --- a/src/behaviours/add-cluster/navigation-using-application-menu.test.tsx +++ b/src/behaviours/add-cluster/navigation-using-application-menu.test.tsx @@ -6,7 +6,7 @@ import type { RenderResult } from "@testing-library/react"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import isAutoUpdateEnabledInjectable from "../../main/is-auto-update-enabled.injectable"; +import isAutoUpdateEnabledInjectable from "../../main/update-app/is-auto-update-enabled.injectable"; import React from "react"; // TODO: Make components free of side effects by making them deterministic diff --git a/src/behaviours/extensions/navigation-using-application-menu.test.ts b/src/behaviours/extensions/navigation-using-application-menu.test.ts index 75ffa0ebef..2ff0b74b91 100644 --- a/src/behaviours/extensions/navigation-using-application-menu.test.ts +++ b/src/behaviours/extensions/navigation-using-application-menu.test.ts @@ -6,7 +6,7 @@ import type { RenderResult } from "@testing-library/react"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import isAutoUpdateEnabledInjectable from "../../main/is-auto-update-enabled.injectable"; +import isAutoUpdateEnabledInjectable from "../../main/update-app/is-auto-update-enabled.injectable"; import extensionsStoreInjectable from "../../extensions/extensions-store/extensions-store.injectable"; import type { ExtensionsStore } from "../../extensions/extensions-store/extensions-store"; import fileSystemProvisionerStoreInjectable from "../../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable"; diff --git a/src/behaviours/welcome/navigation-using-application-menu.test.ts b/src/behaviours/welcome/navigation-using-application-menu.test.ts index e84e5b391f..10eba84d50 100644 --- a/src/behaviours/welcome/navigation-using-application-menu.test.ts +++ b/src/behaviours/welcome/navigation-using-application-menu.test.ts @@ -6,7 +6,7 @@ import type { RenderResult } from "@testing-library/react"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; -import isAutoUpdateEnabledInjectable from "../../main/is-auto-update-enabled.injectable"; +import isAutoUpdateEnabledInjectable from "../../main/update-app/is-auto-update-enabled.injectable"; describe("welcome - navigation using application menu", () => { let applicationBuilder: ApplicationBuilder; diff --git a/src/main/is-auto-update-enabled.injectable.ts b/src/main/is-auto-update-enabled.injectable.ts deleted file mode 100644 index c76bd27e45..0000000000 --- a/src/main/is-auto-update-enabled.injectable.ts +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { isPublishConfigured } from "../common/vars"; -import { autoUpdater } from "electron-updater"; - -const isAutoUpdateEnabledInjectable = getInjectable({ - id: "is-auto-update-enabled", - - instantiate: () => () => { - return autoUpdater.isUpdaterActive() && isPublishConfigured; - }, - - causesSideEffects: true, -}); - -export default isAutoUpdateEnabledInjectable; diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts index 417c40ac2e..2441e5805f 100644 --- a/src/main/menu/application-menu-items.injectable.ts +++ b/src/main/menu/application-menu-items.injectable.ts @@ -12,7 +12,7 @@ import { webContents } from "electron"; import loggerInjectable from "../../common/logger.injectable"; import appNameInjectable from "../app-paths/app-name/app-name.injectable"; import electronMenuItemsInjectable from "./electron-menu-items.injectable"; -import isAutoUpdateEnabledInjectable from "../is-auto-update-enabled.injectable"; +import isAutoUpdateEnabledInjectable from "../update-app/is-auto-update-enabled.injectable"; import navigateToPreferencesInjectable from "../../common/front-end-routing/routes/preferences/navigate-to-preferences.injectable"; import navigateToExtensionsInjectable from "../../common/front-end-routing/routes/extensions/navigate-to-extensions.injectable"; import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable"; diff --git a/src/main/start-update-checking.injectable.ts b/src/main/start-update-checking.injectable.ts index 4571e70df4..c8eeca00b9 100644 --- a/src/main/start-update-checking.injectable.ts +++ b/src/main/start-update-checking.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { startUpdateChecking } from "./app-updater"; -import isAutoUpdateEnabledInjectable from "./is-auto-update-enabled.injectable"; +import isAutoUpdateEnabledInjectable from "./update-app/is-auto-update-enabled.injectable"; const startUpdateCheckingInjectable = getInjectable({ id: "start-update-checking", diff --git a/src/main/update-app/is-auto-update-enabled.injectable.ts b/src/main/update-app/is-auto-update-enabled.injectable.ts new file mode 100644 index 0000000000..b90ca53004 --- /dev/null +++ b/src/main/update-app/is-auto-update-enabled.injectable.ts @@ -0,0 +1,24 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import electronUpdaterInjectable from "../electron-app/features/electron-updater.injectable"; +import packageJsonInjectable from "../../common/vars/package-json.injectable"; + +const isAutoUpdateEnabledInjectable = getInjectable({ + id: "is-auto-update-enabled", + + instantiate: (di) => { + const electronUpdater = di.inject(electronUpdaterInjectable); + const packageJson = di.inject(packageJsonInjectable); + + const isPublishConfigured = Object.keys(packageJson.build).includes("publish"); + + return () => { + return electronUpdater.isUpdaterActive() && isPublishConfigured; + }; + }, +}); + +export default isAutoUpdateEnabledInjectable;