TimerUtils update

weibaohui · Nov 12, 2023 · baa11ae · baa11ae
1 parent 793920e
commit baa11ae
Show file tree

Hide file tree

Showing 34 changed files with 77 additions and 70 deletions.
diff --git a/src/backend/utils/TimerUtils.ts b/src/backend/utils/TimerUtils.ts
@@ -23,6 +23,11 @@ export class TimerUtils {
     return setTimeout(handler, 2000)
   }
 
+  static runOnceThenDelayTwoSeconds(run: () => void, handler: TimerHandler) {
+    run()
+    return setTimeout(handler, 2000)
+  }
+
   static delay(handler: TimerHandler, timeout: number) {
     return setTimeout(handler, timeout)
   }

diff --git a/src/frontend/components/ClusterRole/ClusterRoleListView.vue b/src/frontend/components/ClusterRole/ClusterRoleListView.vue
@@ -90,8 +90,9 @@ function onTextChanged(text: string) {
     itemList.value = itemList.value.filter(r => r.metadata.name.includes(searchText.value))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.ClusterRole))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.ClusterRole),
+  )
 })
 </script>
 

diff --git a/src/frontend/components/ClusterRoleBinding/ClusterRoleBindingListView.vue b/src/frontend/components/ClusterRoleBinding/ClusterRoleBindingListView.vue
@@ -95,8 +95,9 @@ function onTextChanged(text: string) {
     itemList.value = itemList.value.filter(r => r.metadata.name.includes(searchText.value))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.ClusterRoleBinding))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.ClusterRoleBinding),
+  )
 })
 </script>
 

diff --git a/src/frontend/components/EndpointSlice/EndpointSliceListView.vue b/src/frontend/components/EndpointSlice/EndpointSliceListView.vue
@@ -129,8 +129,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.EndpointSlice, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.EndpointSlice, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/HorizontalPodAutoscaler/HpaListView.vue b/src/frontend/components/HorizontalPodAutoscaler/HpaListView.vue
@@ -149,8 +149,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.HorizontalPodAutoscaler, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.HorizontalPodAutoscaler, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/IngressClass/IngressClassListView.vue b/src/frontend/components/IngressClass/IngressClassListView.vue
@@ -129,8 +129,8 @@ function onTextChanged(text: string) {
   itemList.value = itemList.value.filter(r => r.metadata.name.includes(text))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.IngressClass))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.IngressClass))
 })
 </script>
 

diff --git a/src/frontend/components/MutatingWebhook/MutatingWebhookListView.vue b/src/frontend/components/MutatingWebhook/MutatingWebhookListView.vue
@@ -90,8 +90,8 @@ function onTextChanged(text: string) {
     itemList.value = itemList.value.filter(r => r.metadata.name.includes(searchText.value))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.MutatingWebhookConfiguration))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.MutatingWebhookConfiguration))
 })
 </script>
 

diff --git a/src/frontend/components/NetworkPolicy/NetpolListView.vue b/src/frontend/components/NetworkPolicy/NetpolListView.vue
@@ -137,8 +137,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.NetworkPolicy, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.NetworkPolicy, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/PersistentVolume/PersistentVolumeListView.vue b/src/frontend/components/PersistentVolume/PersistentVolumeListView.vue
@@ -111,8 +111,8 @@ function onTextChanged(text: string) {
   itemList.value = itemList.value.filter(r => r.metadata.name.includes(text))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.PersistentVolume))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.PersistentVolume))
 })
 </script>
 

diff --git a/src/frontend/components/PersistentVolumeClaim/PvcListView.vue b/src/frontend/components/PersistentVolumeClaim/PvcListView.vue
@@ -145,8 +145,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.PersistentVolumeClaim, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.PersistentVolumeClaim, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/PodDisruptionBudget/PdbListView.vue b/src/frontend/components/PodDisruptionBudget/PdbListView.vue
@@ -117,8 +117,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.PodDisruptionBudget, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.PodDisruptionBudget, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/Role/RoleListView.vue b/src/frontend/components/Role/RoleListView.vue
@@ -117,8 +117,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Role, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Role, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/RoleBinding/RoleBindingListView.vue b/src/frontend/components/RoleBinding/RoleBindingListView.vue
@@ -117,8 +117,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.RoleBinding, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.RoleBinding, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/ServiceAccount/SaListView.vue b/src/frontend/components/ServiceAccount/SaListView.vue
@@ -117,8 +117,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.ServiceAccount, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.ServiceAccount, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/StorageClass/StorageClassListView.vue b/src/frontend/components/StorageClass/StorageClassListView.vue
@@ -115,8 +115,8 @@ function onTextChanged(text: string) {
   itemList.value = itemList.value.filter(r => r.metadata.name.includes(text))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.StorageClass))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.StorageClass))
 })
 </script>
 

diff --git a/src/frontend/components/ValidatingWebhook/ValidatingWebhookListView.vue b/src/frontend/components/ValidatingWebhook/ValidatingWebhookListView.vue
@@ -90,8 +90,8 @@ function onTextChanged(text: string) {
     itemList.value = itemList.value.filter(r => r.metadata.name.includes(searchText.value))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.ValidatingWebhookConfiguration))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.ValidatingWebhookConfiguration))
 })
 </script>
 

diff --git a/src/frontend/components/configmap/CmListView.vue b/src/frontend/components/configmap/CmListView.vue
@@ -128,9 +128,7 @@ function onTextChanged(text: string) {
 onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
-
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.ConfigMap, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList, () => K8sService.watchService.watchChange(itemList, ResType.ConfigMap, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/cronjob/CronJobListView.vue b/src/frontend/components/cronjob/CronJobListView.vue
@@ -139,12 +139,13 @@ function onTextChanged(text: string) {
   if (!_.isEmpty(searchText.value))
     itemList.value = itemList.value.filter(r => r.metadata.name.includes(searchText.value))
 }
+
 onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.CronJob, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.CronJob, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/daemonset/DsListView.vue b/src/frontend/components/daemonset/DsListView.vue
@@ -142,8 +142,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.DaemonSet, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.DaemonSet, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/deployment/DeployListView.vue b/src/frontend/components/deployment/DeployListView.vue
@@ -144,8 +144,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Deployment, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Deployment, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/endpoint/EpListView.vue b/src/frontend/components/endpoint/EpListView.vue
@@ -128,9 +128,8 @@ function onTextChanged(text: string) {
 onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
-
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Endpoint, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Endpoint, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/event/EventListView.vue b/src/frontend/components/event/EventListView.vue
@@ -152,8 +152,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Event, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Event, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/ingress/IngListView.vue b/src/frontend/components/ingress/IngListView.vue
@@ -129,8 +129,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Ingress, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Ingress, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/job/JobListView.vue b/src/frontend/components/job/JobListView.vue
@@ -136,8 +136,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Job, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Job, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/limitrange/LimitsListView.vue b/src/frontend/components/limitrange/LimitsListView.vue
@@ -117,8 +117,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.LimitRange, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.LimitRange, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/node/NodeListView.vue b/src/frontend/components/node/NodeListView.vue
@@ -4,7 +4,7 @@ import { DialogHelper } from '@frontend/service/page/DialogHelper'
 import _ from 'lodash'
 import type { DataTableColumns } from 'naive-ui'
 import { NButton, NSpace, useDialog } from 'naive-ui'
-import { h, ref } from 'vue'
+import { h, onMounted, ref } from 'vue'
 import { TimerUtils } from '@backend/utils/TimerUtils'
 import ResourceAgeView from '@frontend/components/common/ResourceAgeView.vue'
 import WorkloadListView from '@frontend/components/common/ResourceListView.vue'
@@ -133,8 +133,10 @@ function onTextChanged(text: string) {
   itemList.value = itemList.value.filter(r => r.metadata.name.includes(text))
 }
 
-getItemList()
-TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Node))
+onMounted(() => {
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Node))
+})
 </script>
 
 <template>

diff --git a/src/frontend/components/ns/NsListView.vue b/src/frontend/components/ns/NsListView.vue
@@ -103,8 +103,8 @@ function onTextChanged(text: string) {
   itemList.value = itemList.value.filter(r => r.metadata.name.includes(text))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Namespace))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Namespace))
 })
 </script>
 

diff --git a/src/frontend/components/pod/PodListView.vue b/src/frontend/components/pod/PodListView.vue
@@ -28,6 +28,7 @@ const dialog = useDialog()
 const itemList = ref<V1Pod[]>()
 const selectedNs = ref('default')
 const workloadListViewRef = ref<InstanceType<typeof WorkloadListView>>()
+
 function createColumns(): DataTableColumns<V1Pod> {
   return [
     {
@@ -209,6 +210,7 @@ function onNsChanged(ns: string) {
   selectedNs.value = ns
   getItemList()
 }
+
 function onTextChanged(text: string) {
   if (_.isEmpty(text)) {
     getItemList()
@@ -221,8 +223,7 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Pod, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList, () => K8sService.watchService.watchChange(itemList, ResType.Pod, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/priorityclass/PcListView.vue b/src/frontend/components/priorityclass/PcListView.vue
@@ -107,8 +107,8 @@ function onTextChanged(text: string) {
     itemList.value = itemList.value.filter(r => r.metadata.name.includes(searchText.value))
 }
 onMounted(() => {
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.PriorityClass))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.PriorityClass))
 })
 </script>
 

diff --git a/src/frontend/components/replicacontroller/RcListView.vue b/src/frontend/components/replicacontroller/RcListView.vue
@@ -136,8 +136,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.ReplicationController, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.ReplicationController, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/resourcequota/QuotaListView.vue b/src/frontend/components/resourcequota/QuotaListView.vue
@@ -117,8 +117,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.ResourceQuota, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.ResourceQuota, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/secret/SecretListView.vue b/src/frontend/components/secret/SecretListView.vue
@@ -136,8 +136,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Secret, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Secret, selectedNs))
 })
 </script>
 

diff --git a/src/frontend/components/service/SvcListView.vue b/src/frontend/components/service/SvcListView.vue
@@ -154,8 +154,8 @@ onMounted(() => {
   if (localStorage.selectedNs)
     selectedNs.value = localStorage.selectedNs
 
-  getItemList()
-  TimerUtils.delayTwoSeconds(() => K8sService.watchService.watchChange(itemList, ResType.Service, selectedNs))
+  TimerUtils.runOnceThenDelayTwoSeconds(getItemList,
+    () => K8sService.watchService.watchChange(itemList, ResType.Service, selectedNs))
 })
 </script>