Improving metric queries (#3424)

src/renderer/components/+workloads-daemonsets/daemonset-details.tsx

@@ -31,31 +31,42 @@ import { PodDetailsAffinities } from "../+workloads-pods/pod-details-affinities"
 import { daemonSetStore } from "./daemonsets.store";
 import { podsStore } from "../+workloads-pods/pods.store";
 import type { KubeObjectDetailsProps } from "../kube-object";
-import type { DaemonSet } from "../../api/endpoints";
+import { DaemonSet, getMetricsForDaemonSets, IPodMetrics } from "../../api/endpoints";
 import { ResourceMetrics, ResourceMetricsText } from "../resource-metrics";
 import { PodCharts, podMetricTabs } from "../+workloads-pods/pod-charts";
-import { reaction } from "mobx";
+import { makeObservable, observable, reaction } from "mobx";
 import { PodDetailsList } from "../+workloads-pods/pod-details-list";
 import { KubeObjectMeta } from "../kube-object/kube-object-meta";
 import { getActiveClusterEntity } from "../../api/catalog-entity-registry";
 import { ClusterMetricsResourceType } from "../../../main/cluster";
+import { boundMethod } from "../../utils";
 
 interface Props extends KubeObjectDetailsProps<DaemonSet> {
 }
 
 @observer
 export class DaemonSetDetails extends React.Component<Props> {
+  @observable metrics: IPodMetrics = null;
+
+  constructor(props: Props) {
+    super(props);
+    makeObservable(this);
+  }
+
   @disposeOnUnmount
   clean = reaction(() => this.props.object, () => {
-    daemonSetStore.reset();
+    this.metrics = null;
   });
 
   componentDidMount() {
     podsStore.reloadAll();
   }
 
-  componentWillUnmount() {
-    daemonSetStore.reset();
+  @boundMethod
+  async loadMetrics() {
+    const { object: daemonSet } = this.props;
+
+    this.metrics = await getMetricsForDaemonSets([daemonSet], daemonSet.getNs(), "");
   }
 
   render() {
@@ -67,15 +78,14 @@ export class DaemonSetDetails extends React.Component<Props> {
     const images = daemonSet.getImages();
     const nodeSelector = daemonSet.getNodeSelectors();
     const childPods = daemonSetStore.getChildPods(daemonSet);
-    const metrics = daemonSetStore.metrics;
     const isMetricHidden = getActiveClusterEntity()?.isMetricHidden(ClusterMetricsResourceType.DaemonSet);
 
     return (
       <div className="DaemonSetDetails">
         {!isMetricHidden && podsStore.isLoaded && (
           <ResourceMetrics
-            loader={() => daemonSetStore.loadMetrics(daemonSet)}
-            tabs={podMetricTabs} object={daemonSet} params={{ metrics }}
+            loader={this.loadMetrics}
+            tabs={podMetricTabs} object={daemonSet} params={{ metrics: this.metrics }}
           >
             <PodCharts/>
           </ResourceMetrics>
@@ -110,7 +120,7 @@ export class DaemonSetDetails extends React.Component<Props> {
         <DrawerItem name="Pod Status" className="pod-status">
           <PodDetailsStatuses pods={childPods}/>
         </DrawerItem>
-        <ResourceMetricsText metrics={metrics}/>
+        <ResourceMetricsText metrics={this.metrics}/>
         <PodDetailsList pods={childPods} owner={daemonSet}/>
       </div>
     );

src/renderer/components/+workloads-daemonsets/daemonsets.store.ts

@@ -18,19 +18,17 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+import { makeObservable } from "mobx";
 
-import { observable, makeObservable } from "mobx";
-import { KubeObjectStore } from "../../kube-object.store";
-import { autoBind } from "../../utils";
-import { DaemonSet, daemonSetApi, IPodMetrics, Pod, podsApi, PodStatus } from "../../api/endpoints";
 import { podsStore } from "../+workloads-pods/pods.store";
 import { apiManager } from "../../api/api-manager";
+import { DaemonSet, daemonSetApi, Pod, PodStatus } from "../../api/endpoints";
+import { KubeObjectStore } from "../../kube-object.store";
+import { autoBind } from "../../utils";
 
 export class DaemonSetStore extends KubeObjectStore<DaemonSet> {
   api = daemonSetApi;
 
-  @observable metrics: IPodMetrics = null;
-
   constructor() {
     super();
 
@@ -38,12 +36,6 @@ export class DaemonSetStore extends KubeObjectStore<DaemonSet> {
     autoBind(this);
   }
 
-  async loadMetrics(daemonSet: DaemonSet) {
-    const pods = this.getChildPods(daemonSet);
-
-    this.metrics = await podsApi.getMetrics(pods, daemonSet.getNs(), "");
-  }
-
   getChildPods(daemonSet: DaemonSet): Pod[] {
     return podsStore.getPodsByOwnerId(daemonSet.getId());
   }
@@ -67,10 +59,6 @@ export class DaemonSetStore extends KubeObjectStore<DaemonSet> {
 
     return status;
   }
-
-  reset() {
-    this.metrics = null;
-  }
 }
 
 export const daemonSetStore = new DaemonSetStore();