diff --git a/packages/core/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap b/packages/core/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap index 266fef88c4..be7ad3680d 100644 --- a/packages/core/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap +++ b/packages/core/src/features/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap @@ -2099,9 +2099,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeChanged: some-changed-value someAddedProperty: some-new-value + selfLink: /apis/some-api-version/namespaces/some-uid @@ -4435,9 +4435,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeRemoved: some-value somePropertyToBeChanged: some-old-value + selfLink: /apis/some-api-version/namespaces/some-uid @@ -5962,9 +5962,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeRemoved: some-value somePropertyToBeChanged: some-old-value + selfLink: /apis/some-api-version/namespaces/some-uid @@ -5976,7 +5976,7 @@ metadata: `; -exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given no changes in the configuration, when selecting to save when saving resolves with failure renders 1`] = ` +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace given no changes in the configuration, when selecting to save when saving fails renders 1`] = `
@@ -7466,9 +7466,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeRemoved: some-value somePropertyToBeChanged: some-old-value + selfLink: /apis/some-api-version/namespaces/some-uid labels: k8slens-edit-resource-version: some-api-version @@ -8220,9 +8220,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeRemoved: some-value somePropertyToBeChanged: some-old-value + selfLink: /apis/some-api-version/namespaces/some-uid
@@ -9568,9 +9568,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeRemoved: some-value somePropertyToBeChanged: some-old-value + selfLink: /apis/some-api-version/namespaces/some-uid @@ -9582,7 +9582,7 @@ metadata: `; -exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace when selecting to save and close when saving resolves with failure renders 1`] = ` +exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves with namespace when selecting to save and close when saving failings renders 1`] = `
@@ -10920,686 +10920,3 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
`; - -exports[`cluster/namespaces - edit namespace from new tab when navigating to namespaces when namespaces resolve when clicking the context menu for a namespace when clicking to edit namespace when call for namespace resolves without namespace renders 1`] = ` - -
-
-
-
-
- -
- - - close - - -
- Close -
-
-
-
-
-
-
-
-
-
-
-
- ?? -
-
-
-
-
- - - - - - Workloads - - - - keyboard_arrow_down - - - -
-
- - - - list - - - - Config - - -
-
- - - - device_hub - - - - Network - - - - keyboard_arrow_down - - - -
-
- - - - storage - - - - Storage - - -
-
- - - - layers - - - - Namespaces - - -
-
- - - - - - Helm - - - - keyboard_arrow_down - - - -
-
- - - - security - - - - Access Control - - -
-
- - - - extension - - - - Custom Resources - - - - keyboard_arrow_down - - - -
-
-
-
-
-
-
-
-
-
-
- Namespaces -
-
- 0 items -
-
- -
-
-
-
-
-
-
- -
-
-
- Name -
- - - arrow_drop_down - - -
-
-
-
-
-
- Labels -
- - - arrow_drop_down - - -
-
-
- Age -
- - - arrow_drop_down - - -
-
-
- Status -
- - - arrow_drop_down - - -
-
-
- - - more_vert - - -
-
-
-
-
- Item list is empty -
-
-
-
- -
- Add Namespace -
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- - - add - - -
- New tab -
-
- - - fullscreen - - -
- Fit to window -
- - - keyboard_arrow_down - - -
- Minimize -
-
-
-
-
-
- Resource not found -
-
-
-
-
-
-
- -`; diff --git a/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx b/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx index a94ad05a23..f11fbe87de 100644 --- a/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx +++ b/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx @@ -12,8 +12,6 @@ import createEditResourceTabInjectable from "../../../renderer/components/dock/e import getRandomIdForEditResourceTabInjectable from "../../../renderer/components/dock/edit-resource/get-random-id-for-edit-resource-tab.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { RequestPatchKubeResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable"; -import requestPatchKubeResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable"; import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable"; import { Namespace } from "../../../common/k8s-api/endpoints"; import showSuccessNotificationInjectable from "../../../renderer/components/notifications/show-success-notification.injectable"; @@ -21,13 +19,17 @@ import showErrorNotificationInjectable from "../../../renderer/components/notifi import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable"; import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable"; -import type { RequestKubeResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable"; -import requestKubeResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable"; +import type { ApiKubePatch } from "../../../renderer/k8s/api-kube-patch.injectable"; +import type { ApiKubeGet } from "../../../renderer/k8s/api-kube-get.injectable"; +import apiKubePatchInjectable from "../../../renderer/k8s/api-kube-patch.injectable"; +import apiKubeGetInjectable from "../../../renderer/k8s/api-kube-get.injectable"; +import type { KubeJsonApiData } from "../../../common/k8s-api/kube-json-api"; +import type { BaseKubeJsonApiObjectMetadata, KubeObjectScope } from "../../../common/k8s-api/kube-object"; describe("cluster/namespaces - edit namespace from new tab", () => { let builder: ApplicationBuilder; - let requestKubeResourceMock: AsyncFnMock; - let requestPatchKubeResourceMock: AsyncFnMock; + let apiKubePatchMock: AsyncFnMock; + let apiKubeGetMock: AsyncFnMock; let showSuccessNotificationMock: jest.Mock; let showErrorNotificationMock: jest.Mock; @@ -57,11 +59,11 @@ describe("cluster/namespaces - edit namespace from new tab", () => { .mockReturnValueOnce("some-second-tab-id"), ); - requestKubeResourceMock = asyncFn(); - windowDi.override(requestKubeResourceInjectable, () => requestKubeResourceMock); + apiKubePatchMock = asyncFn(); + windowDi.override(apiKubePatchInjectable, () => apiKubePatchMock); - requestPatchKubeResourceMock = asyncFn(); - windowDi.override(requestPatchKubeResourceInjectable, () => requestPatchKubeResourceMock); + apiKubeGetMock = asyncFn(); + windowDi.override(apiKubeGetInjectable, () => apiKubeGetMock); }); builder.afterWindowStart(() => { @@ -156,16 +158,16 @@ describe("cluster/namespaces - edit namespace from new tab", () => { }); it("calls for namespace", () => { - expect(requestKubeResourceMock).toHaveBeenCalledWith( + expect(apiKubeGetMock).toHaveBeenCalledWith( "/apis/some-api-version/namespaces/some-uid", ); }); describe("when call for namespace resolves with namespace", () => { - let someNamespace: Namespace; + let someNamespaceData: KubeJsonApiData, unknown, unknown>; beforeEach(async () => { - someNamespace = new Namespace({ + someNamespaceData = ({ apiVersion: "some-api-version", kind: "Namespace", @@ -173,16 +175,12 @@ describe("cluster/namespaces - edit namespace from new tab", () => { uid: "some-uid", name: "some-name", resourceVersion: "some-resource-version", - selfLink: "/apis/some-api-version/namespaces/some-uid", somePropertyToBeRemoved: "some-value", somePropertyToBeChanged: "some-old-value", }, }); - await requestKubeResourceMock.resolve({ - callWasSuccessful: true, - response: someNamespace, - }); + await apiKubeGetMock.resolve(someNamespaceData); }); it("renders", () => { @@ -206,9 +204,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeRemoved: some-value somePropertyToBeChanged: some-old-value + selfLink: /apis/some-api-version/namespaces/some-uid `); }); @@ -226,15 +224,22 @@ metadata: }); it("calls for save with just the adding version label", () => { - expect(requestPatchKubeResourceMock).toHaveBeenCalledWith( + expect(apiKubePatchMock).toHaveBeenCalledWith( "/apis/some-api-version/namespaces/some-uid", - [{ - op: "add", - path: "/metadata/labels", - value: { - "k8slens-edit-resource-version": "some-api-version", + { + data: [{ + op: "add", + path: "/metadata/labels", + value: { + "k8slens-edit-resource-version": "some-api-version", + }, + }], + }, + { + headers: { + "content-type": "application/json-patch+json", }, - }], + }, ); }); @@ -262,9 +267,11 @@ metadata: describe("when saving resolves with success", () => { beforeEach(async () => { - await requestPatchKubeResourceMock.resolve({ - callWasSuccessful: true, - response: { name: "some-name", kind: "Namespace" }, + await apiKubePatchMock.resolve({ + kind: "Namespace", + metadata: { + name: "some-name", + }, }); }); @@ -309,12 +316,9 @@ metadata: }); }); - describe("when saving resolves with failure", () => { + describe("when saving fails", () => { beforeEach(async () => { - await requestPatchKubeResourceMock.resolve({ - callWasSuccessful: false, - error: "some-error", - }); + await apiKubePatchMock.reject(new Error("some-error")); }); it("renders", () => { @@ -380,9 +384,11 @@ metadata: describe("when saving resolves with success", () => { beforeEach(async () => { - await requestPatchKubeResourceMock.resolve({ - callWasSuccessful: true, - response: { name: "some-name", kind: "Namespace" }, + await apiKubePatchMock.resolve({ + kind: "Namespace", + metadata: { + name: "some-name", + }, }); }); @@ -397,12 +403,9 @@ metadata: }); }); - describe("when saving resolves with failure", () => { + describe("when saving failings", () => { beforeEach(async () => { - await requestPatchKubeResourceMock.resolve({ - callWasSuccessful: false, - error: "Some error", - }); + await apiKubePatchMock.reject(new Error("some-error")); }); it("renders", () => { @@ -451,9 +454,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeChanged: some-changed-value someAddedProperty: some-new-value + selfLink: /apis/some-api-version/namespaces/some-uid `, }, }); @@ -474,9 +477,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeChanged: some-changed-value someAddedProperty: some-new-value + selfLink: /apis/some-api-version/namespaces/some-uid `); }); @@ -499,9 +502,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeRemoved: some-value somePropertyToBeChanged: some-old-value + selfLink: /apis/some-api-version/namespaces/some-uid `, draft: `apiVersion: some-api-version kind: Namespace @@ -509,9 +512,9 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeChanged: some-changed-value someAddedProperty: some-new-value + selfLink: /apis/some-api-version/namespaces/some-uid `, }); }); @@ -526,41 +529,46 @@ metadata: }); it("calls for save with changed configuration", () => { - expect(requestPatchKubeResourceMock).toHaveBeenCalledWith( + expect(apiKubePatchMock).toHaveBeenCalledWith( "/apis/some-api-version/namespaces/some-uid", - [ - { - op: "remove", - path: "/metadata/somePropertyToBeRemoved", - }, - { - op: "add", - path: "/metadata/someAddedProperty", - value: "some-new-value", - }, - { - op: "add", - path: "/metadata/labels", - value: { - "k8slens-edit-resource-version": "some-api-version", + { + data: [ + { + op: "remove", + path: "/metadata/somePropertyToBeRemoved", }, + { + op: "add", + path: "/metadata/someAddedProperty", + value: "some-new-value", + }, + { + op: "add", + path: "/metadata/labels", + value: { + "k8slens-edit-resource-version": "some-api-version", + }, + }, + { + op: "replace", + path: "/metadata/somePropertyToBeChanged", + value: "some-changed-value", + }, + ], + }, + { + headers: { + "content-type": "application/json-patch+json", }, - { - op: "replace", - path: "/metadata/somePropertyToBeChanged", - value: "some-changed-value", - }, - ], + }, ); }); it("given save resolves and another change in configuration, when saving, calls for save with changed configuration", async () => { - await requestPatchKubeResourceMock.resolve({ - callWasSuccessful: true, - - response: { + await apiKubePatchMock.resolve({ + kind: "Namespace", + metadata: { name: "some-name", - kind: "Namespace", }, }); @@ -585,7 +593,7 @@ metadata: }); - requestPatchKubeResourceMock.mockClear(); + apiKubePatchMock.mockClear(); const saveButton = rendered.getByTestId( "save-edit-resource-from-tab-for-some-first-tab-id", @@ -593,15 +601,22 @@ metadata: fireEvent.click(saveButton); - expect(requestPatchKubeResourceMock).toHaveBeenCalledWith( + expect(apiKubePatchMock).toHaveBeenCalledWith( "/apis/some-api-version/namespaces/some-uid", - [ - { - op: "add", - path: "/metadata/someOtherAddedProperty", - value: "some-other-new-value", + { + data: [ + { + op: "add", + path: "/metadata/someOtherAddedProperty", + value: "some-other-new-value", + }, + ], + }, + { + headers: { + "content-type": "application/json-patch+json", }, - ], + }, ); }); }); @@ -692,7 +707,7 @@ metadata: describe("given clicking the context menu for second namespace, when clicking to edit namespace", () => { beforeEach(() => { - requestKubeResourceMock.mockClear(); + apiKubeGetMock.mockClear(); // TODO: Make implementation match the description const namespaceStub = new Namespace(someOtherNamespaceDataStub); @@ -725,7 +740,7 @@ metadata: }); it("calls for second namespace", () => { - expect(requestKubeResourceMock).toHaveBeenCalledWith( + expect(apiKubeGetMock).toHaveBeenCalledWith( "/apis/some-api-version/namespaces/some-other-uid", ); }); @@ -747,10 +762,7 @@ metadata: }, }); - await requestKubeResourceMock.resolve({ - callWasSuccessful: true, - response: someOtherNamespace, - }); + await apiKubeGetMock.resolve(someOtherNamespace); }); it("renders", () => { @@ -773,7 +785,7 @@ metadata: }); it("when selecting to save, calls for save of second namespace with just the add edit version label", () => { - requestPatchKubeResourceMock.mockClear(); + apiKubePatchMock.mockClear(); const saveButton = rendered.getByTestId( "save-edit-resource-from-tab-for-some-second-tab-id", @@ -781,21 +793,28 @@ metadata: fireEvent.click(saveButton); - expect(requestPatchKubeResourceMock).toHaveBeenCalledWith( + expect(apiKubePatchMock).toHaveBeenCalledWith( "/apis/some-api-version/namespaces/some-other-uid", - [{ - op: "add", - path: "/metadata/labels", - value: { - "k8slens-edit-resource-version": "some-api-version", + { + data: [{ + op: "add", + path: "/metadata/labels", + value: { + "k8slens-edit-resource-version": "some-api-version", + }, + }], + }, + { + headers: { + "content-type": "application/json-patch+json", }, - }], + }, ); }); describe("when clicking dock tab for the first namespace", () => { beforeEach(() => { - requestKubeResourceMock.mockClear(); + apiKubeGetMock.mockClear(); const tab = rendered.getByTestId("dock-tab-for-some-first-tab-id"); @@ -825,7 +844,7 @@ metadata: }); it("does not call for namespace", () => { - expect(requestKubeResourceMock).not.toHaveBeenCalledWith("/apis/some-api-version/namespaces/some-uid"); + expect(apiKubeGetMock).not.toHaveBeenCalledWith("/apis/some-api-version/namespaces/some-uid"); }); it("has configuration in the editor", () => { @@ -839,14 +858,14 @@ metadata: uid: some-uid name: some-name resourceVersion: some-resource-version - selfLink: /apis/some-api-version/namespaces/some-uid somePropertyToBeRemoved: some-value somePropertyToBeChanged: some-old-value + selfLink: /apis/some-api-version/namespaces/some-uid `); }); it("when selecting to save, calls for save of first namespace with just the new edit version label", () => { - requestPatchKubeResourceMock.mockClear(); + apiKubePatchMock.mockClear(); const saveButton = rendered.getByTestId( "save-edit-resource-from-tab-for-some-first-tab-id", @@ -854,15 +873,22 @@ metadata: fireEvent.click(saveButton); - expect(requestPatchKubeResourceMock).toHaveBeenCalledWith( + expect(apiKubePatchMock).toHaveBeenCalledWith( "/apis/some-api-version/namespaces/some-uid", - [ { - op: "add", - path: "/metadata/labels", - value: { - "k8slens-edit-resource-version": "some-api-version", + { + data: [{ + op: "add", + path: "/metadata/labels", + value: { + "k8slens-edit-resource-version": "some-api-version", + }, + }], + }, + { + headers: { + "content-type": "application/json-patch+json", }, - }], + }, ); }); }); @@ -870,41 +896,9 @@ metadata: }); }); - describe("when call for namespace resolves without namespace", () => { - beforeEach(async () => { - await requestKubeResourceMock.resolve({ - callWasSuccessful: true, - response: undefined, - }); - }); - - it("renders", () => { - expect(rendered.baseElement).toMatchSnapshot(); - }); - - it("still shows the dock tab for editing namespace", () => { - expect( - rendered.getByTestId("dock-tab-for-some-first-tab-id"), - ).toBeInTheDocument(); - }); - - it("shows error message", () => { - expect( - rendered.getByTestId("dock-tab-content-for-some-first-tab-id"), - ).toHaveTextContent("Resource not found"); - }); - - it("does not show error notification", () => { - expect(showErrorNotificationMock).not.toHaveBeenCalled(); - }); - }); - describe("when call for namespace resolves with failure", () => { beforeEach(async () => { - await requestKubeResourceMock.resolve({ - callWasSuccessful: false, - error: "some-error", - }); + await apiKubeGetMock.reject(new Error("some-error-missing-namespace")); }); it("renders", () => { diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx index 30ceae1f6a..4278189b35 100644 --- a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx +++ b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx @@ -28,8 +28,8 @@ const editResourceModelInjectable = getInjectable({ const store = di.inject(editResourceTabStoreInjectable); const model = new EditResourceModel({ - callForResource: di.inject(requestKubeResourceInjectable), - callForPatchResource: di.inject(requestPatchKubeResourceInjectable), + requestKubeResource: di.inject(requestKubeResourceInjectable), + requestPatchKubeResource: di.inject(requestPatchKubeResourceInjectable), showSuccessNotification: di.inject(showSuccessNotificationInjectable), showErrorNotification: di.inject(showErrorNotificationInjectable), store, @@ -50,8 +50,8 @@ const editResourceModelInjectable = getInjectable({ export default editResourceModelInjectable; interface Dependencies { - callForResource: RequestKubeResource; - callForPatchResource: RequestPatchKubeResource; + requestKubeResource: RequestKubeResource; + requestPatchKubeResource: RequestPatchKubeResource; waitForEditingResource: () => Promise; showSuccessNotification: ShowNotification; showErrorNotification: ShowNotification; @@ -134,7 +134,7 @@ export class EditResourceModel { load = async (): Promise => { await this.dependencies.waitForEditingResource(); - let result = await this.dependencies.callForResource(this.selfLink); + let result = await this.dependencies.requestKubeResource(this.selfLink); if (!result.callWasSuccessful) { return void this.dependencies.showErrorNotification(`Loading resource failed: ${result.error}`); @@ -149,7 +149,7 @@ export class EditResourceModel { parsed.apiVersion = result.response.metadata.labels[EditResourceLabelName]; - result = await this.dependencies.callForResource(createKubeApiURL(parsed)); + result = await this.dependencies.requestKubeResource(createKubeApiURL(parsed)); } if (!result.callWasSuccessful) { @@ -205,7 +205,7 @@ export class EditResourceModel { return null; } - const result = await this.dependencies.callForPatchResource(selfLink, patches); + const result = await this.dependencies.requestPatchKubeResource(selfLink, patches); if (!result.callWasSuccessful) { this.dependencies.showErrorNotification(( diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.global-override-for-injectable.ts b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.global-override-for-injectable.ts deleted file mode 100644 index a06b750848..0000000000 --- a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.global-override-for-injectable.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; -import requestKubeResourceInjectable from "./request-kube-resource.injectable"; - -export default getGlobalOverrideForFunction(requestKubeResourceInjectable); diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable.ts b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable.ts index ea0581c6d4..54ad3e52bf 100644 --- a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable.ts +++ b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-kube-resource.injectable.ts @@ -7,10 +7,10 @@ import type { KubeObjectMetadata, KubeObjectScope } from "../../../../../common/ import { KubeObject } from "../../../../../common/k8s-api/kube-object"; import type { AsyncResult } from "@k8slens/utilities"; import { getErrorMessage } from "../../../../../common/utils/get-error-message"; -import apiKubeInjectable from "../../../../k8s/api-kube.injectable"; import type { Writable } from "type-fest"; import type { KubeJsonApiData } from "../../../../../common/k8s-api/kube-json-api"; import { parseKubeApi } from "../../../../../common/k8s-api/kube-api-parse"; +import apiKubeGetInjectable from "../../../../k8s/api-kube-get.injectable"; export type RequestKubeResource = (selfLink: string) => AsyncResult; @@ -18,7 +18,7 @@ const requestKubeResourceInjectable = getInjectable({ id: "request-kube-resource", instantiate: (di): RequestKubeResource => { - const apiKube = di.inject(apiKubeInjectable); + const apiKubeGet = di.inject(apiKubeGetInjectable); return async (selfLink) => { const parsed = parseKubeApi(selfLink); @@ -28,7 +28,7 @@ const requestKubeResourceInjectable = getInjectable({ } try { - const rawData = await apiKube.get(selfLink) as KubeJsonApiData, unknown, unknown>; + const rawData = await apiKubeGet(selfLink) as KubeJsonApiData, unknown, unknown>; (rawData.metadata as Writable).selfLink = selfLink; @@ -41,8 +41,6 @@ const requestKubeResourceInjectable = getInjectable({ } }; }, - - causesSideEffects: true, }); export default requestKubeResourceInjectable; diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.global-override-for-injectable.ts b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.global-override-for-injectable.ts deleted file mode 100644 index 840f04360d..0000000000 --- a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.global-override-for-injectable.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; -import requestPatchKubeResourceInjectable from "./request-patch-kube-resource.injectable"; - -export default getGlobalOverrideForFunction(requestPatchKubeResourceInjectable); diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable.ts b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable.ts index 0eac05a43f..880d63e785 100644 --- a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable.ts +++ b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/request-patch-kube-resource.injectable.ts @@ -6,19 +6,19 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { AsyncResult } from "@k8slens/utilities"; import type { JsonPatch } from "../../../../../common/k8s-api/kube-object.store"; import { getErrorMessage } from "../../../../../common/utils/get-error-message"; -import apiKubeInjectable from "../../../../k8s/api-kube.injectable"; import { patchTypeHeaders } from "../../../../../common/k8s-api/kube-api"; +import apiKubePatchInjectable from "../../../../k8s/api-kube-patch.injectable"; export type RequestPatchKubeResource = (selfLink: string, patch: JsonPatch) => AsyncResult<{ name: string; kind: string }>; const requestPatchKubeResourceInjectable = getInjectable({ id: "request-patch-kube-resource", instantiate: (di): RequestPatchKubeResource => { - const apiKube = di.inject(apiKubeInjectable); + const apiKubePatch = di.inject(apiKubePatchInjectable); return async (selfLink, patch) => { try { - const kubeObject = await apiKube.patch(selfLink, { data: patch }, { + const { metadata, kind } = await apiKubePatch(selfLink, { data: patch }, { headers: { "content-type": patchTypeHeaders.json, }, @@ -26,7 +26,7 @@ const requestPatchKubeResourceInjectable = getInjectable({ return { callWasSuccessful: true, - response: { name: kubeObject.metadata.name, kind: kubeObject.kind }, + response: { name: metadata.name, kind }, }; } catch (e) { return { @@ -36,8 +36,6 @@ const requestPatchKubeResourceInjectable = getInjectable({ } }; }, - - causesSideEffects: true, }); export default requestPatchKubeResourceInjectable; diff --git a/packages/core/src/renderer/k8s/api-kube-get.injectable.ts b/packages/core/src/renderer/k8s/api-kube-get.injectable.ts new file mode 100644 index 0000000000..7adc182a0f --- /dev/null +++ b/packages/core/src/renderer/k8s/api-kube-get.injectable.ts @@ -0,0 +1,20 @@ +/** + * 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 type { KubeJsonApi } from "../../common/k8s-api/kube-json-api"; +import apiKubeInjectable from "./api-kube.injectable"; + +export type ApiKubeGet = KubeJsonApi["get"]; + +const apiKubeGetInjectable = getInjectable({ + id: "api-kube-get", + instantiate: (di): ApiKubeGet => { + const apiKube = di.inject(apiKubeInjectable); + + return (...params) => apiKube.get(...params); + }, +}); + +export default apiKubeGetInjectable; diff --git a/packages/core/src/renderer/k8s/api-kube-patch.injectable.ts b/packages/core/src/renderer/k8s/api-kube-patch.injectable.ts new file mode 100644 index 0000000000..3f649b10d8 --- /dev/null +++ b/packages/core/src/renderer/k8s/api-kube-patch.injectable.ts @@ -0,0 +1,20 @@ +/** + * 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 type { KubeJsonApi } from "../../common/k8s-api/kube-json-api"; +import apiKubeInjectable from "./api-kube.injectable"; + +export type ApiKubePatch = KubeJsonApi["patch"]; + +const apiKubePatchInjectable = getInjectable({ + id: "api-kube-patch", + instantiate: (di): ApiKubePatch => { + const apiKube = di.inject(apiKubeInjectable); + + return (...params) => apiKube.patch(...params); + }, +}); + +export default apiKubePatchInjectable;