Use PartialDeep for patch type (#4420)

* Use PartialDeep for patch type.

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>

* Add test. Fix typing.

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>

* Fix lint.

Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>

src/common/k8s-api/__tests__/kube-api.test.ts

@@ -241,6 +241,24 @@ describe("KubeApi", () => {
         { op: "replace", path: "/spec/replicas", value: 2 },
       ], "json");
     });
+
+    it("allows deep partial patch", async () => {
+      expect.hasAssertions();
+
+      (fetch as any).mockResponse(async (request: Request) => {
+        expect(request.method).toEqual("PATCH");
+        expect(request.headers.get("content-type")).toMatch("merge-patch");
+        expect(request.body.toString()).toEqual(JSON.stringify({ metadata: { annotations: { provisioned: "true" }}}));
+
+        return {};
+      });
+
+      await api.patch(
+        { name: "test", namespace: "default" },
+        { metadata: { annotations: { provisioned: "true" }}},
+        "merge",
+      );
+    });
   });
 
   describe("delete", () => {

src/common/k8s-api/kube-api.ts

@@ -526,7 +526,7 @@ export class KubeApi<T extends KubeObject> {
     return parsed;
   }
 
-  async patch(desc: ResourceDescriptor, data?: Partial<T> | Patch, strategy: KubeApiPatchType = "strategic"): Promise<T | null> {
+  async patch(desc: ResourceDescriptor, data?: PartialKubeObject<T> | Patch, strategy: KubeApiPatchType = "strategic") {
     await this.checkPreferredVersion();
     const apiUrl = this.getUrl(desc);
 
@@ -541,7 +541,7 @@ export class KubeApi<T extends KubeObject> {
       throw new Error(`PATCH request to ${apiUrl} returned an array: ${JSON.stringify(parsed)}`);
     }
 
-    return parsed;
+    return parsed as T | null;
   }
 
   async delete({ propagationPolicy = "Background", ...desc }: DeleteResourceDescriptor) {

src/renderer/components/+namespaces/namespaces.tsx

@@ -49,7 +49,8 @@ export class Namespaces extends React.Component<Props> {
         <KubeObjectListLayout
           isConfigurable
           tableId="namespaces"
-          className="Namespaces" store={namespaceStore}
+          className="Namespaces"
+          store={namespaceStore}
           sortingCallbacks={{
             [columnId.name]: ns => ns.getName(),
             [columnId.labels]: ns => ns.getLabels(),

src/renderer/components/+workloads-pods/pods.tsx

@@ -92,7 +92,8 @@ export class Pods extends React.Component<Props> {
   render() {
     return (
       <KubeObjectListLayout
-        className="Pods" store={podsStore}
+        className="Pods"
+        store={podsStore}
         dependentStores={[eventStore]} // status icon component uses event store
         tableId = "workloads_pods"
         isConfigurable