fix merge from master

src/renderer/api/kube-api.ts

@@ -7,7 +7,7 @@ import { IKubeObjectRef, KubeJsonApi, KubeJsonApiData, KubeJsonApiDataList } fro
 import { apiKube } from "./index";
 import { kubeWatchApi } from "./kube-watch-api";
 import { apiManager } from "./api-manager";
-import { split } from "../utils/arrays";
+import { splitArray } from "../../common/utils";
 
 export interface IKubeApiOptions<T extends KubeObject> {
   kind: string; // resource type within api-group, e.g. "Namespace"
@@ -45,7 +45,7 @@ export class KubeApi<T extends KubeObject = any> {
     const [, prefix, ...parts] = apiPath.split("/");
     const apiPrefix = `/${prefix}`;
 
-    const [left, right, found] = split(parts, "namespaces");
+    const [left, right, found] = splitArray(parts, "namespaces");
     let apiGroup, apiVersion, namespace, resource, name;
 
     if (found) {

src/renderer/components/chart/chart.tsx

@@ -1,6 +1,6 @@
 import "./chart.scss";
 import React from "react";
-import ChartJS, {ChartData, ChartOptions} from "chart.js";
+import ChartJS from "chart.js";
 import { isEqual, remove } from "lodash";
 import { cssNames } from "../../utils";
 import { StatusBrick } from "../status-brick";
@@ -17,7 +17,7 @@ export interface ChartDataSets extends ChartJS.ChartDataSets {
 
 export interface ChartProps {
   data: ChartData;
-  options?: ChartOptions;  // Passed to ChartJS instance
+  options?: ChartJS.ChartOptions;  // Passed to ChartJS instance
   width?: number | string;
   height?: number | string;
   type?: ChartKind;
@@ -126,8 +126,7 @@ export class Chart extends React.Component<ChartProps> {
           ...datasets[index],
           ...props
         }
-      }
-      else {
+      } else {
         datasets[datasetIndex] = next
       }
     })