From 82336d7a1297d2538240dab577e820d3a5c28dbf Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 4 May 2022 13:44:56 +0300 Subject: [PATCH] Remove code-style changes that are not welcome Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- .../extension-loader.injectable.ts | 4 +--- src/main/__test__/cluster.test.ts | 7 ++----- src/main/__test__/kube-auth-proxy.test.ts | 6 ++---- src/main/__test__/kubeconfig-manager.test.ts | 8 +------- .../menu/application-menu-items.injectable.ts | 3 +-- .../protocol-handler/__test__/router.test.ts | 4 +--- src/main/router/router.test.ts | 4 +--- .../start-main-application.injectable.ts | 1 - .../__tests__/delete-cluster-dialog.test.tsx | 17 ++++------------- .../test-utils/get-application-builder.tsx | 4 +--- 10 files changed, 14 insertions(+), 44 deletions(-) diff --git a/src/extensions/extension-loader/extension-loader.injectable.ts b/src/extensions/extension-loader/extension-loader.injectable.ts index d5dd69bc63..87f53cd686 100644 --- a/src/extensions/extension-loader/extension-loader.injectable.ts +++ b/src/extensions/extension-loader/extension-loader.injectable.ts @@ -17,9 +17,7 @@ const extensionLoaderInjectable = getInjectable({ updateExtensionsState: di.inject(updateExtensionsStateInjectable), createExtensionInstance: di.inject(createExtensionInstanceInjectable), extensionRegistrators: di.injectMany(extensionRegistratorInjectionToken), - extensionInstallationCounter: di.inject( - extensionInstallationCounterInjectable, - ), + extensionInstallationCounter: di.inject(extensionInstallationCounterInjectable), }), }); diff --git a/src/main/__test__/cluster.test.ts b/src/main/__test__/cluster.test.ts index 7d9655168e..ef15a5a5a3 100644 --- a/src/main/__test__/cluster.test.ts +++ b/src/main/__test__/cluster.test.ts @@ -2,9 +2,6 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import directoryForTempInjectable - from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; - const logger = { silly: jest.fn(), debug: jest.fn(), @@ -45,8 +42,8 @@ import { createClusterInjectionToken } from "../../common/cluster/create-cluster import authorizationReviewInjectable from "../../common/cluster/authorization-review.injectable"; import listNamespacesInjectable from "../../common/cluster/list-namespaces.injectable"; import createContextHandlerInjectable from "../context-handler/create-context-handler.injectable"; -import directoryForUserDataInjectable - from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; console = new Console(process.stdout, process.stderr); // fix mockFS diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts index 739cf9ebf6..fba7dd9773 100644 --- a/src/main/__test__/kube-auth-proxy.test.ts +++ b/src/main/__test__/kube-auth-proxy.test.ts @@ -57,10 +57,8 @@ import path from "path"; import spawnInjectable from "../child-process/spawn.injectable"; import getConfigurationFileModelInjectable from "../../common/get-configuration-file-model/get-configuration-file-model.injectable"; import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; -import directoryForUserDataInjectable - from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; -import directoryForTempInjectable - from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; +import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; console = new Console(stdout, stderr); diff --git a/src/main/__test__/kubeconfig-manager.test.ts b/src/main/__test__/kubeconfig-manager.test.ts index 514de3d890..b331b1a7a7 100644 --- a/src/main/__test__/kubeconfig-manager.test.ts +++ b/src/main/__test__/kubeconfig-manager.test.ts @@ -1,10 +1,3 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import directoryForUserDataInjectable - from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; - /** * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. @@ -50,6 +43,7 @@ import { createClusterInjectionToken } from "../../common/cluster/create-cluster import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; import createContextHandlerInjectable from "../context-handler/create-context-handler.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; +import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; console = new Console(process.stdout, process.stderr); // fix mockFS diff --git a/src/main/menu/application-menu-items.injectable.ts b/src/main/menu/application-menu-items.injectable.ts index 7e90c716c4..d3a8fc7feb 100644 --- a/src/main/menu/application-menu-items.injectable.ts +++ b/src/main/menu/application-menu-items.injectable.ts @@ -24,8 +24,7 @@ import { computed } from "mobx"; import showAboutInjectable from "./show-about.injectable"; import applicationWindowInjectable from "../start-main-application/lens-window/application-window/application-window.injectable"; import reloadWindowInjectable from "../start-main-application/lens-window/reload-window.injectable"; -import showApplicationWindowInjectable - from "../start-main-application/lens-window/show-application-window.injectable"; +import showApplicationWindowInjectable from "../start-main-application/lens-window/show-application-window.injectable"; function ignoreIf(check: boolean, menuItems: MenuItemConstructorOptions[]) { return check ? [] : menuItems; diff --git a/src/main/protocol-handler/__test__/router.test.ts b/src/main/protocol-handler/__test__/router.test.ts index 129d55e016..5ec3bf5518 100644 --- a/src/main/protocol-handler/__test__/router.test.ts +++ b/src/main/protocol-handler/__test__/router.test.ts @@ -18,9 +18,7 @@ import lensProtocolRouterMainInjectable from "../lens-protocol-router-main/lens- import extensionsStoreInjectable from "../../../extensions/extensions-store/extensions-store.injectable"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; -import directoryForUserDataInjectable - from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; - +import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; jest.mock("../../../common/ipc"); diff --git a/src/main/router/router.test.ts b/src/main/router/router.test.ts index 1edaa55cfd..a8c42985e9 100644 --- a/src/main/router/router.test.ts +++ b/src/main/router/router.test.ts @@ -14,9 +14,7 @@ import asyncFn from "@async-fn/jest"; import parseRequestInjectable from "./parse-request.injectable"; import { contentTypes } from "./router-content-types"; import mockFs from "mock-fs"; -import directoryForUserDataInjectable - from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; - +import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; describe("router", () => { let router: Router; diff --git a/src/main/start-main-application/start-main-application.injectable.ts b/src/main/start-main-application/start-main-application.injectable.ts index dc92d5b4fe..b363ab3e9f 100644 --- a/src/main/start-main-application/start-main-application.injectable.ts +++ b/src/main/start-main-application/start-main-application.injectable.ts @@ -73,5 +73,4 @@ const startMainApplicationInjectable = getInjectable({ const getDeepLinkUrl = (commandLineArguments: string[]) => pipeline(commandLineArguments, map(toLower), find(startsWith("lens://"))); - export default startMainApplicationInjectable; diff --git a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx index bd564ab574..69a5fe0cea 100644 --- a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx +++ b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx @@ -9,30 +9,21 @@ import { fireEvent } from "@testing-library/react"; import mockFs from "mock-fs"; import React from "react"; import * as selectEvent from "react-select-event"; - import type { Cluster } from "../../../../common/cluster/cluster"; import { DeleteClusterDialog } from "../delete-cluster-dialog"; - import type { ClusterModel } from "../../../../common/cluster-types"; import { createClusterInjectionToken } from "../../../../common/cluster/create-cluster-injection-token"; import createContextHandlerInjectable from "../../../../main/context-handler/create-context-handler.injectable"; import deleteClusterDialogModelInjectable from "../delete-cluster-dialog-model/delete-cluster-dialog-model.injectable"; import type { DeleteClusterDialogModel } from "../delete-cluster-dialog-model/delete-cluster-dialog-model"; import hotbarStoreInjectable from "../../../../common/hotbar-store.injectable"; -import type { - ApplicationBuilder } from "../../test-utils/get-application-builder"; -import { - getApplicationBuilder, -} from "../../test-utils/get-application-builder"; +import type { ApplicationBuilder } from "../../test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../test-utils/get-application-builder"; import { routeInjectionToken } from "../../../../common/front-end-routing/route-injection-token"; import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { - routeSpecificComponentInjectionToken, -} from "../../../routes/route-specific-component-injection-token"; -import { - navigateToRouteInjectionToken, -} from "../../../../common/front-end-routing/navigate-to-route-injection-token"; +import { routeSpecificComponentInjectionToken } from "../../../routes/route-specific-component-injection-token"; +import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token"; jest.mock("electron", () => ({ app: { diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 8501da729a..7056a86e8e 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -49,9 +49,7 @@ type Callback = (dis: DiContainers) => void | Promise; export interface ApplicationBuilder { dis: DiContainers; setEnvironmentToClusterFrame: () => ApplicationBuilder; - addExtensions: ( - ...extensions: LensRendererExtension[] - ) => Promise; + addExtensions: (...extensions: LensRendererExtension[]) => Promise; allowKubeResource: (resourceName: KubeResource) => ApplicationBuilder; beforeSetups: (callback: Callback) => ApplicationBuilder; beforeRender: (callback: Callback) => ApplicationBuilder;