Merge pull request #4990 from rawagner/watch_k8s_type

Extract and export object type of watch k8s resources result
openshift · Apr 10, 2020 · f4c4050 · f4c4050
2 parents e57639c + 56d1f8e
commit f4c4050
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/frontend/public/components/utils/k8s-watch-hook.ts b/frontend/public/components/utils/k8s-watch-hook.ts
@@ -227,8 +227,14 @@ export type ResourcesObject = { [key: string]: K8sResourceCommon | K8sResourceCo
 
 type WatchK8sResult<R extends K8sResourceCommon | K8sResourceCommon[]> = [R, boolean, any];
 
+export type WatchK8sResultsObject<R extends K8sResourceCommon | K8sResourceCommon[]> = {
+  data: R;
+  loaded: boolean;
+  loadError: any;
+};
+
 export type WatchK8sResults<R extends ResourcesObject> = {
-  [k in keyof R]: { data: R[k]; loaded: boolean; loadError: any };
+  [k in keyof R]: WatchK8sResultsObject<R[k]>;
 };
 
 export type WatchK8sResources<R extends ResourcesObject> = {