mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Relocate file to directory containing feature
Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com> Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
parent
3ae4c67647
commit
2eb9ba5142
@ -6,7 +6,7 @@
|
|||||||
import type { RenderResult } from "@testing-library/react";
|
import type { RenderResult } from "@testing-library/react";
|
||||||
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
||||||
import { getApplicationBuilder } 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";
|
import React from "react";
|
||||||
|
|
||||||
// TODO: Make components free of side effects by making them deterministic
|
// TODO: Make components free of side effects by making them deterministic
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
import type { RenderResult } from "@testing-library/react";
|
import type { RenderResult } from "@testing-library/react";
|
||||||
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
||||||
import { getApplicationBuilder } 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 extensionsStoreInjectable from "../../extensions/extensions-store/extensions-store.injectable";
|
||||||
import type { ExtensionsStore } from "../../extensions/extensions-store/extensions-store";
|
import type { ExtensionsStore } from "../../extensions/extensions-store/extensions-store";
|
||||||
import fileSystemProvisionerStoreInjectable from "../../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable";
|
import fileSystemProvisionerStoreInjectable from "../../extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable";
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
import type { RenderResult } from "@testing-library/react";
|
import type { RenderResult } from "@testing-library/react";
|
||||||
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
|
||||||
import { getApplicationBuilder } 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", () => {
|
describe("welcome - navigation using application menu", () => {
|
||||||
let applicationBuilder: ApplicationBuilder;
|
let applicationBuilder: ApplicationBuilder;
|
||||||
|
|||||||
@ -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;
|
|
||||||
@ -12,7 +12,7 @@ import { webContents } from "electron";
|
|||||||
import loggerInjectable from "../../common/logger.injectable";
|
import loggerInjectable from "../../common/logger.injectable";
|
||||||
import appNameInjectable from "../app-paths/app-name/app-name.injectable";
|
import appNameInjectable from "../app-paths/app-name/app-name.injectable";
|
||||||
import electronMenuItemsInjectable from "./electron-menu-items.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 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 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";
|
import navigateToCatalogInjectable from "../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
import { getInjectable } from "@ogre-tools/injectable";
|
import { getInjectable } from "@ogre-tools/injectable";
|
||||||
import { startUpdateChecking } from "./app-updater";
|
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({
|
const startUpdateCheckingInjectable = getInjectable({
|
||||||
id: "start-update-checking",
|
id: "start-update-checking",
|
||||||
|
|||||||
24
src/main/update-app/is-auto-update-enabled.injectable.ts
Normal file
24
src/main/update-app/is-auto-update-enabled.injectable.ts
Normal file
@ -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;
|
||||||
Loading…
Reference in New Issue
Block a user