From 03322e69d93ebeee4886f85c32e0989aa803af79 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 14 Nov 2022 13:37:54 -0500 Subject: [PATCH] Fix type errors from new asyncComputed Signed-off-by: Sebastian Malton --- src/renderer/components/+namespaces/metrics.injectable.ts | 8 +++++--- .../components/+network-ingresses/metrics.injectable.ts | 8 +++++--- src/renderer/components/+nodes/metrics.injectable.ts | 8 +++++--- .../+storage-volume-claims/metrics.injectable.ts | 8 +++++--- .../+workloads-daemonsets/metrics.injectable.ts | 8 +++++--- .../+workloads-deployments/metrics.injectable.ts | 8 +++++--- .../components/+workloads-jobs/metrics.injectable.ts | 8 +++++--- .../+workloads-pods/container-metrics.injectable.ts | 8 +++++--- .../components/+workloads-pods/metrics.injectable.ts | 8 +++++--- .../+workloads-replicasets/metrics.injectable.ts | 8 +++++--- .../+workloads-statefulsets/metrics.injectable.ts | 8 +++++--- 11 files changed, 55 insertions(+), 33 deletions(-) diff --git a/src/renderer/components/+namespaces/metrics.injectable.ts b/src/renderer/components/+namespaces/metrics.injectable.ts index 0b137ee4b8..98bf94883f 100644 --- a/src/renderer/components/+namespaces/metrics.injectable.ts +++ b/src/renderer/components/+namespaces/metrics.injectable.ts @@ -13,10 +13,12 @@ const namespaceMetricsInjectable = getInjectable({ instantiate: (di, namespace) => { const requestPodMetricsInNamespace = di.inject(requestPodMetricsInNamespaceInjectable); - return asyncComputed(async () => { - now(60 * 1000); // Update every minute + return asyncComputed({ + getValueFromObservedPromise: async () => { + now(60 * 1000); // Update every minute - return requestPodMetricsInNamespace(namespace.getName()); + return requestPodMetricsInNamespace(namespace.getName()); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+network-ingresses/metrics.injectable.ts b/src/renderer/components/+network-ingresses/metrics.injectable.ts index 340905b28c..602f5088b4 100644 --- a/src/renderer/components/+network-ingresses/metrics.injectable.ts +++ b/src/renderer/components/+network-ingresses/metrics.injectable.ts @@ -13,10 +13,12 @@ const ingressMetricsInjectable = getInjectable({ instantiate: (di, ingress) => { const requestIngressMetrics = di.inject(requestIngressMetricsInjectable); - return asyncComputed(async () => { - now(60 * 1000); // Update every minute + return asyncComputed({ + getValueFromObservedPromise: async () => { + now(60 * 1000); // Update every minute - return requestIngressMetrics(ingress.getName(), ingress.getNs()); + return requestIngressMetrics(ingress.getName(), ingress.getNs()); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+nodes/metrics.injectable.ts b/src/renderer/components/+nodes/metrics.injectable.ts index c97630027e..988ca84e9e 100644 --- a/src/renderer/components/+nodes/metrics.injectable.ts +++ b/src/renderer/components/+nodes/metrics.injectable.ts @@ -13,10 +13,12 @@ const nodeMetricsInjectable = getInjectable({ instantiate: (di, node) => { const requestClusterMetricsByNodeNames = di.inject(requestClusterMetricsByNodeNamesInjectable); - return asyncComputed(() => { - now(60 * 1000); + return asyncComputed({ + getValueFromObservedPromise: () => { + now(60 * 1000); - return requestClusterMetricsByNodeNames([node.getName()]); + return requestClusterMetricsByNodeNames([node.getName()]); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+storage-volume-claims/metrics.injectable.ts b/src/renderer/components/+storage-volume-claims/metrics.injectable.ts index edd74b50e6..a39e13ce00 100644 --- a/src/renderer/components/+storage-volume-claims/metrics.injectable.ts +++ b/src/renderer/components/+storage-volume-claims/metrics.injectable.ts @@ -13,10 +13,12 @@ const persistentVolumeClaimMetricsInjectable = getInjectable({ instantiate: (di, persistentVolumeClaim) => { const requestPersistentVolumeClaimMetrics = di.inject(requestPersistentVolumeClaimMetricsInjectable); - return asyncComputed(() => { - now(60 * 1000); // update every minute + return asyncComputed({ + getValueFromObservedPromise: () => { + now(60 * 1000); // update every minute - return requestPersistentVolumeClaimMetrics(persistentVolumeClaim); + return requestPersistentVolumeClaimMetrics(persistentVolumeClaim); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+workloads-daemonsets/metrics.injectable.ts b/src/renderer/components/+workloads-daemonsets/metrics.injectable.ts index 1b04daf976..71f4f54ee9 100644 --- a/src/renderer/components/+workloads-daemonsets/metrics.injectable.ts +++ b/src/renderer/components/+workloads-daemonsets/metrics.injectable.ts @@ -13,10 +13,12 @@ const daemonSetMetricsInjectable = getInjectable({ instantiate: (di, daemonSet) => { const requestPodMetricsForDaemonSets = di.inject(requestPodMetricsForDaemonSetsInjectable); - return asyncComputed(() => { - now(60 * 1000); // update every minute + return asyncComputed({ + getValueFromObservedPromise: () => { + now(60 * 1000); // update every minute - return requestPodMetricsForDaemonSets([daemonSet], daemonSet.getNs()); + return requestPodMetricsForDaemonSets([daemonSet], daemonSet.getNs()); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+workloads-deployments/metrics.injectable.ts b/src/renderer/components/+workloads-deployments/metrics.injectable.ts index ec25327d8f..fecd67c5db 100644 --- a/src/renderer/components/+workloads-deployments/metrics.injectable.ts +++ b/src/renderer/components/+workloads-deployments/metrics.injectable.ts @@ -13,10 +13,12 @@ const deploymentMetricsInjectable = getInjectable({ instantiate: (di, deployment) => { const requestPodMetricsForDeployments = di.inject(requestPodMetricsForDeploymentsInjectable); - return asyncComputed(() => { - now(60 * 1000); + return asyncComputed({ + getValueFromObservedPromise: () => { + now(60 * 1000); - return requestPodMetricsForDeployments([deployment], deployment.getNs()); + return requestPodMetricsForDeployments([deployment], deployment.getNs()); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+workloads-jobs/metrics.injectable.ts b/src/renderer/components/+workloads-jobs/metrics.injectable.ts index dd0799de90..9922dc6ad1 100644 --- a/src/renderer/components/+workloads-jobs/metrics.injectable.ts +++ b/src/renderer/components/+workloads-jobs/metrics.injectable.ts @@ -13,10 +13,12 @@ const jobMetricsInjectable = getInjectable({ instantiate: (di, job) => { const requestPodMetricsForJobs = di.inject(requestPodMetricsForJobsInjectable); - return asyncComputed(() => { - now(60 * 1000); + return asyncComputed({ + getValueFromObservedPromise: () => { + now(60 * 1000); - return requestPodMetricsForJobs([job], job.getNs()); + return requestPodMetricsForJobs([job], job.getNs()); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+workloads-pods/container-metrics.injectable.ts b/src/renderer/components/+workloads-pods/container-metrics.injectable.ts index 2b25bafb7a..dccd1668ef 100644 --- a/src/renderer/components/+workloads-pods/container-metrics.injectable.ts +++ b/src/renderer/components/+workloads-pods/container-metrics.injectable.ts @@ -13,10 +13,12 @@ const podContainerMetricsInjectable = getInjectable({ instantiate: (di, pod) => { const requestPodMetrics = di.inject(requestPodMetricsInjectable); - return asyncComputed(() => { - now(60 * 1000); + return asyncComputed({ + getValueFromObservedPromise: () => { + now(60 * 1000); - return requestPodMetrics([pod], pod.getNs(), "container, namespace"); + return requestPodMetrics([pod], pod.getNs(), "container, namespace"); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+workloads-pods/metrics.injectable.ts b/src/renderer/components/+workloads-pods/metrics.injectable.ts index b7d1b4225e..a06bc9e7e9 100644 --- a/src/renderer/components/+workloads-pods/metrics.injectable.ts +++ b/src/renderer/components/+workloads-pods/metrics.injectable.ts @@ -13,10 +13,12 @@ const podMetricsInjectable = getInjectable({ instantiate: (di, pod) => { const requestPodMetrics = di.inject(requestPodMetricsInjectable); - return asyncComputed(() => { - now(60 * 1000); + return asyncComputed({ + getValueFromObservedPromise: () => { + now(60 * 1000); - return requestPodMetrics([pod], pod.getNs()); + return requestPodMetrics([pod], pod.getNs()); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+workloads-replicasets/metrics.injectable.ts b/src/renderer/components/+workloads-replicasets/metrics.injectable.ts index c71b187ddf..47a41bd253 100644 --- a/src/renderer/components/+workloads-replicasets/metrics.injectable.ts +++ b/src/renderer/components/+workloads-replicasets/metrics.injectable.ts @@ -13,10 +13,12 @@ const replicaSetMetricsInjectable = getInjectable({ instantiate: (di, replicaSet) => { const requestPodMetricsForReplicaSets = di.inject(requestPodMetricsForReplicaSetsInjectable); - return asyncComputed(() => { - now(60 * 1000); // update every minute + return asyncComputed({ + getValueFromObservedPromise: async () => { + now(60 * 1000); // update every minute - return requestPodMetricsForReplicaSets([replicaSet], replicaSet.getNs()); + return requestPodMetricsForReplicaSets([replicaSet], replicaSet.getNs()); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({ diff --git a/src/renderer/components/+workloads-statefulsets/metrics.injectable.ts b/src/renderer/components/+workloads-statefulsets/metrics.injectable.ts index c6bd8049bd..b12cd152e9 100644 --- a/src/renderer/components/+workloads-statefulsets/metrics.injectable.ts +++ b/src/renderer/components/+workloads-statefulsets/metrics.injectable.ts @@ -13,10 +13,12 @@ const statefulSetMetricsInjectable = getInjectable({ instantiate: (di, statefulSet) => { const requestPodMetricsForStatefulSets = di.inject(requestPodMetricsForStatefulSetsInjectable); - return asyncComputed(() => { - now(60 * 1000); + return asyncComputed({ + getValueFromObservedPromise: async () => { + now(60 * 1000); - return requestPodMetricsForStatefulSets([statefulSet], statefulSet.getNs()); + return requestPodMetricsForStatefulSets([statefulSet], statefulSet.getNs()); + }, }); }, lifecycle: lifecycleEnum.keyedSingleton({