+
+ 32000m
+
+
+ 128Gi
+
|
+
+ 4000m
+
|
+
+ 15.6Gi
+
|
{
dispatchHeadlampEvent({
- resources: pods,
+ resources: pods ?? [],
resourceKind: 'Pod',
error: error || undefined,
});
diff --git a/frontend/src/components/pod/PodDetails.stories.tsx b/frontend/src/components/pod/PodDetails.stories.tsx
index e5fb2dc58a1..bd408c37591 100644
--- a/frontend/src/components/pod/PodDetails.stories.tsx
+++ b/frontend/src/components/pod/PodDetails.stories.tsx
@@ -6,17 +6,15 @@ import { TestContext } from '../../test';
import PodDetails from './Details';
import { podList } from './storyHelper';
-const usePhonyGet: KubeObjectClass['useGet'] = (name, namespace) => {
- return [
- new Pod(
+const usePhonyQuery: KubeObjectClass['useQuery'] = ({ name, namespace }: any): any => {
+ return {
+ data: new Pod(
podList.find(
pod => pod.metadata.name === name && pod.metadata.namespace === namespace
) as KubePod
),
- null,
- () => {},
- () => {},
- ] as any;
+ error: null,
+ };
};
export default {
@@ -31,21 +29,18 @@ export default {
} as Meta;
interface MockerStory {
- useGet?: KubeObjectClass['useGet'];
- useList?: KubeObjectClass['useList'];
+ usePhonyQuery?: KubeObjectClass['usePhonyQuery'];
objectEventsFunc?: typeof Event.objectEvents;
podName: string;
}
const Template: Story = args => {
- const { useGet, useList, podName, objectEventsFunc } = args;
+ const { usePhonyQuery, podName, objectEventsFunc } = args;
- if (!!useGet) {
- Pod.useGet = args.useGet!;
- }
- if (!!useList) {
- Pod.useList = args.useList!;
+ if (!!usePhonyQuery) {
+ Pod.useQuery = args.usePhonyQuery!;
}
+
if (!!objectEventsFunc) {
Event.objectEvents = objectEventsFunc!;
}
@@ -62,19 +57,19 @@ const Template: Story = args => {
export const PullBackOff = Template.bind({});
PullBackOff.args = {
- useGet: usePhonyGet,
+ usePhonyQuery: usePhonyQuery,
podName: 'imagepullbackoff',
};
export const Running = Template.bind({});
Running.args = {
- useGet: usePhonyGet,
+ usePhonyQuery: usePhonyQuery,
podName: 'running',
};
export const Error = Template.bind({});
Error.args = {
- useGet: usePhonyGet,
+ usePhonyQuery: usePhonyQuery,
podName: 'terminated',
objectEventsFunc: () =>
Promise.resolve([
@@ -114,18 +109,18 @@ Error.args = {
export const LivenessFailed = Template.bind({});
LivenessFailed.args = {
- useGet: usePhonyGet,
+ usePhonyQuery: usePhonyQuery,
podName: 'liveness-http',
};
export const Initializing = Template.bind({});
Initializing.args = {
- useGet: usePhonyGet,
+ usePhonyQuery: usePhonyQuery,
podName: 'initializing',
};
export const Successful = Template.bind({});
Successful.args = {
- useGet: usePhonyGet,
+ usePhonyQuery: usePhonyQuery,
podName: 'successful',
};
diff --git a/frontend/src/components/pod/PodList.stories.tsx b/frontend/src/components/pod/PodList.stories.tsx
index 39723dd93e4..7d0595f93eb 100644
--- a/frontend/src/components/pod/PodList.stories.tsx
+++ b/frontend/src/components/pod/PodList.stories.tsx
@@ -4,11 +4,10 @@ import { TestContext } from '../../test';
import PodList from './List';
import { podList } from './storyHelper';
-Pod.useList = () => {
+Pod.useListQuery = (() => {
const objList = podList.map(data => new Pod(data));
-
- return [objList, null, () => {}, () => {}] as any;
-};
+ return { items: objList, error: null };
+}) as any;
export default {
title: 'Pod/PodListView',
diff --git a/frontend/src/components/pod/PodLogs.stories.tsx b/frontend/src/components/pod/PodLogs.stories.tsx
index 5218c3983a4..8c7340cc6f7 100644
--- a/frontend/src/components/pod/PodLogs.stories.tsx
+++ b/frontend/src/components/pod/PodLogs.stories.tsx
@@ -6,30 +6,26 @@ import { TestContext } from '../../test';
import PodDetails, { PodDetailsProps } from './Details';
import { podList } from './storyHelper';
-const usePhonyGet: KubeObjectClass['useGet'] = (name, namespace) => {
- return [
- new Pod(
+const usePhonyQuery: KubeObjectClass['useQuery'] = ({ name, namespace }: any): any => {
+ return {
+ data: new Pod(
podList.find(
pod => pod.metadata.name === name && pod.metadata.namespace === namespace
) as KubePod
),
- null,
- () => {},
- () => {},
- ] as any;
+ error: null,
+ };
};
-const phonyGetAuthorization: KubeObjectClass['getAuthorization'] = async (
+const phonyGetAuthorization: KubeObjectClass['getAuthorization'] = (
verb: string,
resourceAttrs?: AuthRequestResourceAttrs
) => {
- return new Promise(exec => {
- exec({
- status: {
- allowed: resourceAttrs?.subresource === 'log',
- },
- });
- });
+ return {
+ status: {
+ allowed: resourceAttrs?.subresource === 'log',
+ },
+ };
};
// @todo: There is no "PodLogs" component. Stories should be named after the component.
@@ -102,7 +98,7 @@ function getLogs(container: string, onLogs: StreamResultsCb, logsOptions: LogOpt
export const Logs = Template.bind({});
Logs.args = {
- useGet: usePhonyGet,
+ useQuery: usePhonyQuery,
'prototype.getAuthorization': phonyGetAuthorization,
'prototype.getLogs': getLogs,
podName: 'running',
diff --git a/frontend/src/components/pod/__snapshots__/PodLogs.Logs.stories.storyshot b/frontend/src/components/pod/__snapshots__/PodLogs.Logs.stories.storyshot
index cca6d125393..b2f73be5b86 100644
--- a/frontend/src/components/pod/__snapshots__/PodLogs.Logs.stories.storyshot
+++ b/frontend/src/components/pod/__snapshots__/PodLogs.Logs.stories.storyshot
@@ -61,19 +61,7 @@
>
-
-
+ />
@@ -88,19 +76,7 @@
/>
-
-
+ />
diff --git a/frontend/src/components/podDisruptionBudget/pdbDetails.stories.tsx b/frontend/src/components/podDisruptionBudget/pdbDetails.stories.tsx
index 2a97dd9b781..c6637504670 100644
--- a/frontend/src/components/podDisruptionBudget/pdbDetails.stories.tsx
+++ b/frontend/src/components/podDisruptionBudget/pdbDetails.stories.tsx
@@ -1,4 +1,5 @@
import { Meta, Story } from '@storybook/react';
+import { useMockQuery } from '../../helpers/testHelpers';
import { KubeObjectClass } from '../../lib/k8s/cluster';
import { KubeObject } from '../../lib/k8s/cluster';
import Event from '../../lib/k8s/event';
@@ -6,54 +7,52 @@ import PDB, { KubePDB } from '../../lib/k8s/podDisruptionBudget';
import { TestContext } from '../../test';
import HPADetails from './Details';
-const usePhonyGet: KubeObjectClass['useGet'] = () => {
- return [
- new PDB({
- kind: 'PodDisruptionBudget',
- metadata: {
- annotations: {
- 'kubectl.kubernetes.io/last-applied-configuration':
- '{"apiVersion":"policy/v1beta1","kind":"PodDisruptionBudget","metadata":{"annotations":{},"labels":{"addonmanager.kubernetes.io/mode":"Reconcile"},"name":"coredns-pdb","namespace":"kube-system"},"spec":{"minAvailable":1,"selector":{"matchLabels":{"k8s-app":"kube-dns"}}}}\n',
- },
- selfLink: '',
- creationTimestamp: '2022-10-06T05:17:14Z',
- generation: 1,
- labels: {
- 'addonmanager.kubernetes.io/mode': 'Reconcile',
- },
- name: 'coredns-pdb',
- namespace: 'kube-system',
- resourceVersion: '3679611',
- uid: '80728de7-5d4f-42a2-bc4a-a8eb2a0ddabd',
+const usePhonyQuery = useMockQuery.data(
+ new PDB({
+ kind: 'PodDisruptionBudget',
+ metadata: {
+ annotations: {
+ 'kubectl.kubernetes.io/last-applied-configuration':
+ '{"apiVersion":"policy/v1beta1","kind":"PodDisruptionBudget","metadata":{"annotations":{},"labels":{"addonmanager.kubernetes.io/mode":"Reconcile"},"name":"coredns-pdb","namespace":"kube-system"},"spec":{"minAvailable":1,"selector":{"matchLabels":{"k8s-app":"kube-dns"}}}}\n',
},
- spec: {
- minAvailable: 1,
- selector: {
- matchLabels: {
- 'k8s-app': 'kube-dns',
- },
- },
+ selfLink: '',
+ creationTimestamp: '2022-10-06T05:17:14Z',
+ generation: 1,
+ labels: {
+ 'addonmanager.kubernetes.io/mode': 'Reconcile',
},
- status: {
- conditions: [
- {
- lastTransitionTime: '2022-10-17T21:56:52Z',
- message: '',
- observedGeneration: 1,
- reason: 'SufficientPods',
- status: 'True',
- type: 'DisruptionAllowed',
- },
- ],
- currentHealthy: 2,
- desiredHealthy: 1,
- disruptionsAllowed: 1,
- expectedPods: 2,
- observedGeneration: 1,
+ name: 'coredns-pdb',
+ namespace: 'kube-system',
+ resourceVersion: '3679611',
+ uid: '80728de7-5d4f-42a2-bc4a-a8eb2a0ddabd',
+ },
+ spec: {
+ minAvailable: 1,
+ selector: {
+ matchLabels: {
+ 'k8s-app': 'kube-dns',
+ },
},
- } as KubePDB),
- ] as any;
-};
+ },
+ status: {
+ conditions: [
+ {
+ lastTransitionTime: '2022-10-17T21:56:52Z',
+ message: '',
+ observedGeneration: 1,
+ reason: 'SufficientPods',
+ status: 'True',
+ type: 'DisruptionAllowed',
+ },
+ ],
+ currentHealthy: 2,
+ desiredHealthy: 1,
+ disruptionsAllowed: 1,
+ expectedPods: 2,
+ observedGeneration: 1,
+ },
+ } as KubePDB)
+);
export default {
title: 'pdb/PDBDetailsView',
@@ -71,27 +70,22 @@ export default {
} as Meta;
interface MockerStory {
- useGet?: KubeObjectClass['useGet'];
- useList?: KubeObjectClass['useList'];
+ usePhonyQuery?: KubeObjectClass['usePhonyQuery'];
allowEdit?: boolean;
}
const Template: Story = (args: MockerStory) => {
- if (!!args.useGet) {
- PDB.useGet = args.useGet;
+ if (!!args.usePhonyQuery) {
+ PDB.useQuery = args.usePhonyQuery;
Event.objectEvents = async (obj: KubeObject) => {
console.log('object:', obj);
return [];
};
}
- if (!!args.useList) {
- PDB.useList = args.useList;
- }
+
if (!!args.allowEdit) {
- PDB.getAuthorization = (): Promise<{ status: any }> => {
- return new Promise(resolve => {
- resolve({ status: { allowed: true, reason: '', code: 200 } });
- });
+ PDB.getAuthorization = () => {
+ return { status: { allowed: true, reason: '', code: 200 } };
};
}
@@ -100,16 +94,16 @@ const Template: Story = (args: MockerStory) => {
export const Default = Template.bind({});
Default.args = {
- useGet: usePhonyGet,
+ usePhonyQuery: usePhonyQuery,
allowEdit: true,
};
export const NoItemYet = Template.bind({});
NoItemYet.args = {
- useGet: () => [null, null, () => {}, () => {}] as any,
+ usePhonyQuery: useMockQuery.noData,
};
export const Error = Template.bind({});
Error.args = {
- useGet: () => [null, 'Phony error is phony!', () => {}, () => {}] as any,
+ usePhonyQuery: useMockQuery.error,
};
diff --git a/frontend/src/components/podDisruptionBudget/pdbList.stories.tsx b/frontend/src/components/podDisruptionBudget/pdbList.stories.tsx
index bd01c3b1948..cc9f0002e15 100644
--- a/frontend/src/components/podDisruptionBudget/pdbList.stories.tsx
+++ b/frontend/src/components/podDisruptionBudget/pdbList.stories.tsx
@@ -1,11 +1,12 @@
import { Meta, Story } from '@storybook/react';
+import { useMockListQuery } from '../../helpers/testHelpers';
import PDB, { KubePDB } from '../../lib/k8s/podDisruptionBudget';
import { TestContext } from '../../test';
import { generateK8sResourceList } from '../../test/mocker';
import PDBList from './List';
-PDB.useList = () => {
- const objList = generateK8sResourceList(
+PDB.useListQuery = useMockListQuery.data(
+ generateK8sResourceList(
{
kind: 'PodDisruptionBudget',
metadata: {
@@ -50,9 +51,8 @@ PDB.useList = () => {
},
},
{ instantiateAs: PDB }
- );
- return [objList, null, () => {}, () => {}] as any;
-};
+ )
+);
export default {
title: 'PDB/PDBListView',
diff --git a/frontend/src/components/priorityClass/priorityClassDetails.stories.tsx b/frontend/src/components/priorityClass/priorityClassDetails.stories.tsx
index 7a6e11a0330..c68171c9e5e 100644
--- a/frontend/src/components/priorityClass/priorityClassDetails.stories.tsx
+++ b/frontend/src/components/priorityClass/priorityClassDetails.stories.tsx
@@ -1,32 +1,31 @@
import { Meta, Story } from '@storybook/react';
+import { useMockQuery } from '../../helpers/testHelpers';
import { KubeObject, KubeObjectClass } from '../../lib/k8s/cluster';
import Event from '../../lib/k8s/event';
import PriorityClass, { KubePriorityClass } from '../../lib/k8s/priorityClass';
import { TestContext } from '../../test';
import HPADetails from './Details';
-const usePhonyGet: KubeObjectClass['useGet'] = () => {
- return [
- new PriorityClass({
- description: 'Mission Critical apps.',
- kind: 'PriorityClass',
- metadata: {
- annotations: {
- 'kubectl.kubernetes.io/last-applied-configuration':
- '{"apiVersion":"scheduling.k8s.io/v1","description":"Mission Critical apps.","globalDefault":false,"kind":"PriorityClass","metadata":{"annotations":{},"name":"high-priority-apps"},"preemptionPolicy":"PreemptLowerPriority","value":1000000}\n',
- },
- selfLink: '',
- creationTimestamp: '2022-10-26T13:46:17Z',
- generation: 1,
- name: 'high-priority-apps',
- resourceVersion: '6474045',
- uid: '4cfbe956-a997-4b58-8ea3-18655d0ba8a9',
+const usePhonyGet = useMockQuery.data(
+ new PriorityClass({
+ description: 'Mission Critical apps.',
+ kind: 'PriorityClass',
+ metadata: {
+ annotations: {
+ 'kubectl.kubernetes.io/last-applied-configuration':
+ '{"apiVersion":"scheduling.k8s.io/v1","description":"Mission Critical apps.","globalDefault":false,"kind":"PriorityClass","metadata":{"annotations":{},"name":"high-priority-apps"},"preemptionPolicy":"PreemptLowerPriority","value":1000000}\n',
},
- preemptionPolicy: 'PreemptLowerPriority',
- value: 1000000,
- } as KubePriorityClass),
- ] as any;
-};
+ selfLink: '',
+ creationTimestamp: '2022-10-26T13:46:17Z',
+ generation: 1,
+ name: 'high-priority-apps',
+ resourceVersion: '6474045',
+ uid: '4cfbe956-a997-4b58-8ea3-18655d0ba8a9',
+ },
+ preemptionPolicy: 'PreemptLowerPriority',
+ value: 1000000,
+ } as KubePriorityClass)
+);
export default {
title: 'PriorityClass/PriorityClassDetailsView',
@@ -44,27 +43,21 @@ export default {
} as Meta;
interface MockerStory {
- useGet?: KubeObjectClass['useGet'];
- useList?: KubeObjectClass['useList'];
+ useQuery?: KubeObjectClass['useQuery'];
allowEdit?: boolean;
}
const Template: Story = (args: MockerStory) => {
- if (!!args.useGet) {
- PriorityClass.useGet = args.useGet;
+ if (!!args.useQuery) {
+ PriorityClass.useQuery = args.useQuery;
Event.objectEvents = async (obj: KubeObject) => {
console.log('object:', obj);
return [];
};
}
- if (!!args.useList) {
- PriorityClass.useList = args.useList;
- }
if (!!args.allowEdit) {
- PriorityClass.getAuthorization = (): Promise<{ status: any }> => {
- return new Promise(resolve => {
- resolve({ status: { allowed: true, reason: '', code: 200 } });
- });
+ PriorityClass.getAuthorization = () => {
+ return { status: { allowed: true, reason: '', code: 200 } };
};
}
@@ -73,16 +66,16 @@ const Template: Story = (args: MockerStory) => {
export const Default = Template.bind({});
Default.args = {
- useGet: usePhonyGet,
+ useQuery: usePhonyGet,
allowEdit: true,
};
export const NoItemYet = Template.bind({});
NoItemYet.args = {
- useGet: () => [null, null, () => {}, () => {}] as any,
+ useQuery: useMockQuery.noData,
};
export const Error = Template.bind({});
Error.args = {
- useGet: () => [null, 'Phony error is phony!', () => {}, () => {}] as any,
+ useQuery: useMockQuery.error,
};
diff --git a/frontend/src/components/priorityClass/priorityClassList.stories.tsx b/frontend/src/components/priorityClass/priorityClassList.stories.tsx
index 18ac92d1858..a01095d8c21 100644
--- a/frontend/src/components/priorityClass/priorityClassList.stories.tsx
+++ b/frontend/src/components/priorityClass/priorityClassList.stories.tsx
@@ -1,11 +1,12 @@
import { Meta, Story } from '@storybook/react';
+import { useMockListQuery } from '../../helpers/testHelpers';
import PriorityClass, { KubePriorityClass } from '../../lib/k8s/priorityClass';
import { TestContext } from '../../test';
import { generateK8sResourceList } from '../../test/mocker';
import PriorityClassList from './List';
-PriorityClass.useList = () => {
- const objList = generateK8sResourceList(
+PriorityClass.useListQuery = useMockListQuery.data(
+ generateK8sResourceList(
{
description: 'Mission Critical apps.',
kind: 'PriorityClass',
@@ -24,9 +25,8 @@ PriorityClass.useList = () => {
value: 1000000,
},
{ instantiateAs: PriorityClass }
- );
- return [objList, null, () => {}, () => {}] as any;
-};
+ )
+);
export default {
title: 'PriorityClass/PriorityClassListView',
diff --git a/frontend/src/components/replicaset/List.stories.tsx b/frontend/src/components/replicaset/List.stories.tsx
index 6541a23a30c..8dd33b13fa6 100644
--- a/frontend/src/components/replicaset/List.stories.tsx
+++ b/frontend/src/components/replicaset/List.stories.tsx
@@ -1,11 +1,12 @@
import Container from '@mui/material/Container';
import { Meta, Story } from '@storybook/react';
+import { useMockListQuery } from '../../helpers/testHelpers';
import ReplicaSet from '../../lib/k8s/replicaSet';
import { TestContext } from '../../test';
import List from './List';
-ReplicaSet.useList = () => {
- const objList = [
+ReplicaSet.useListQuery = useMockListQuery.data(
+ [
{
apiVersion: 'apps/v1',
kind: 'ReplicaSet',
@@ -217,9 +218,8 @@ ReplicaSet.useList = () => {
},
},
},
- ].map((data: any) => new ReplicaSet(data));
- return [objList, null, () => {}, () => {}] as any;
-};
+ ].map((data: any) => new ReplicaSet(data))
+);
export default {
title: 'ReplicaSet/List',
diff --git a/frontend/src/components/resourceQuota/List.tsx b/frontend/src/components/resourceQuota/List.tsx
index 50a5bd88a24..4f504280deb 100644
--- a/frontend/src/components/resourceQuota/List.tsx
+++ b/frontend/src/components/resourceQuota/List.tsx
@@ -83,7 +83,7 @@ export function ResourceQuotaRenderer(props: ResourceQuotaProps) {
}
export default function ResourceQuotaList() {
- const [resourceQuotas, error] = ResourceQuota.useList();
+ const { items, error } = ResourceQuota.useListQuery();
- return ;
+ return ;
}
diff --git a/frontend/src/components/resourceQuota/resourceQuotaDetails.stories.tsx b/frontend/src/components/resourceQuota/resourceQuotaDetails.stories.tsx
index 1377682f3a0..5e2a0c98e94 100644
--- a/frontend/src/components/resourceQuota/resourceQuotaDetails.stories.tsx
+++ b/frontend/src/components/resourceQuota/resourceQuotaDetails.stories.tsx
@@ -1,45 +1,44 @@
import { Meta, Story } from '@storybook/react';
+import { useMockQuery } from '../../helpers/testHelpers';
import { KubeObjectClass } from '../../lib/k8s/cluster';
import ResourceQuota, { KubeResourceQuota } from '../../lib/k8s/resourceQuota';
import { TestContext } from '../../test';
import ResourceQuotaDetails from './Details';
-const usePhonyGet: KubeObjectClass['useGet'] = () => {
- return [
- new ResourceQuota({
- apiVersion: 'v1',
- kind: 'ResourceQuota',
- metadata: {
- annotations: {
- 'kubectl.kubernetes.io/last-applied-configuration':
- '{"apiVersion":"v1","kind":"ResourceQuota","metadata":{"annotations":{},"name":"test-cpu-quota","namespace":"test"},"spec":{"hard":{"limits.cpu":"300m","requests.cpu":"200m"}}}\n',
- },
- selfLink: '',
- creationTimestamp: '2022-10-25T11:48:48Z',
- name: 'test-cpu-quota',
- namespace: 'test',
- resourceVersion: '6480949',
- uid: 'ebee95aa-f0a2-43d7-bd27-c7e756d0b163',
+const usePhonyQuery = useMockQuery.data(
+ new ResourceQuota({
+ apiVersion: 'v1',
+ kind: 'ResourceQuota',
+ metadata: {
+ annotations: {
+ 'kubectl.kubernetes.io/last-applied-configuration':
+ '{"apiVersion":"v1","kind":"ResourceQuota","metadata":{"annotations":{},"name":"test-cpu-quota","namespace":"test"},"spec":{"hard":{"limits.cpu":"300m","requests.cpu":"200m"}}}\n',
},
- spec: {
- hard: {
- 'limits.cpu': '300m',
- 'requests.cpu': '200m',
- },
+ selfLink: '',
+ creationTimestamp: '2022-10-25T11:48:48Z',
+ name: 'test-cpu-quota',
+ namespace: 'test',
+ resourceVersion: '6480949',
+ uid: 'ebee95aa-f0a2-43d7-bd27-c7e756d0b163',
+ },
+ spec: {
+ hard: {
+ 'limits.cpu': '300m',
+ 'requests.cpu': '200m',
},
- status: {
- hard: {
- 'limits.cpu': '300m',
- 'requests.cpu': '200m',
- },
- used: {
- 'limits.cpu': '0',
- 'requests.cpu': '500m',
- },
+ },
+ status: {
+ hard: {
+ 'limits.cpu': '300m',
+ 'requests.cpu': '200m',
},
- } as KubeResourceQuota),
- ] as any;
-};
+ used: {
+ 'limits.cpu': '0',
+ 'requests.cpu': '500m',
+ },
+ },
+ } as KubeResourceQuota)
+);
export default {
title: 'ResourceQuota/ResourceQuotaDetailsView',
@@ -57,24 +56,18 @@ export default {
} as Meta;
interface MockerStory {
- useGet?: KubeObjectClass['useGet'];
- useList?: KubeObjectClass['useList'];
+ useQuery?: KubeObjectClass['useQuery'];
allowEdit?: boolean;
}
const Template: Story = (args: MockerStory) => {
- if (!!args.useGet) {
- ResourceQuota.useGet = args.useGet;
- }
- if (!!args.useList) {
- ResourceQuota.useList = args.useList;
+ if (!!args.useQuery) {
+ ResourceQuota.useQuery = args.useQuery;
}
if (!!args.allowEdit) {
- ResourceQuota.getAuthorization = (): Promise<{ status: any }> => {
- return new Promise(resolve => {
- resolve({ status: { allowed: true, reason: '', code: 200 } });
- });
- };
+ ResourceQuota.getAuthorization = () => ({
+ status: { allowed: true, reason: '', code: 200 },
+ });
}
return ;
@@ -82,16 +75,16 @@ const Template: Story = (args: MockerStory) => {
export const Default = Template.bind({});
Default.args = {
- useGet: usePhonyGet,
+ useQuery: usePhonyQuery,
allowEdit: true,
};
export const NoItemYet = Template.bind({});
NoItemYet.args = {
- useGet: () => [null, null, () => {}, () => {}] as any,
+ useQuery: useMockQuery.noData,
};
export const Error = Template.bind({});
Error.args = {
- useGet: () => [null, 'Phony error is phony!', () => {}, () => {}] as any,
+ useQuery: useMockQuery.error,
};
diff --git a/frontend/src/components/resourceQuota/resourceQuotaList.stories.tsx b/frontend/src/components/resourceQuota/resourceQuotaList.stories.tsx
index 067996a6e36..78206839ca0 100644
--- a/frontend/src/components/resourceQuota/resourceQuotaList.stories.tsx
+++ b/frontend/src/components/resourceQuota/resourceQuotaList.stories.tsx
@@ -1,11 +1,12 @@
import { Meta, Story } from '@storybook/react';
+import { useMockListQuery } from '../../helpers/testHelpers';
import ResourceQuota, { KubeResourceQuota } from '../../lib/k8s/resourceQuota';
import { TestContext } from '../../test';
import { generateK8sResourceList } from '../../test/mocker';
import ResourceQuotaList from './List';
-ResourceQuota.useList = () => {
- const objList = generateK8sResourceList(
+ResourceQuota.useListQuery = useMockListQuery.data(
+ generateK8sResourceList(
{
apiVersion: 'v1',
kind: 'ResourceQuota',
@@ -38,9 +39,8 @@ ResourceQuota.useList = () => {
},
},
{ instantiateAs: ResourceQuota }
- );
- return [objList, null, () => {}, () => {}] as any;
-};
+ )
+);
export default {
title: 'ResourceQuota/ResourceQuotaListView',
diff --git a/frontend/src/components/runtimeClass/Details.stories.tsx b/frontend/src/components/runtimeClass/Details.stories.tsx
index 408a3befa52..f31bb84cc8f 100644
--- a/frontend/src/components/runtimeClass/Details.stories.tsx
+++ b/frontend/src/components/runtimeClass/Details.stories.tsx
@@ -1,4 +1,5 @@
import { Meta, StoryFn } from '@storybook/react';
+import { useMockQuery } from '../../helpers/testHelpers';
import { KubeRuntimeClass, RuntimeClass } from '../../lib/k8s/runtime';
import { TestContext } from '../../test';
import { RuntimeClassDetails as Details } from './Details';
@@ -26,7 +27,7 @@ interface MockerStory {
const Template: StoryFn = (args: MockerStory) => {
const { json } = args;
if (!!json) {
- RuntimeClass.useGet = () => [new RuntimeClass(json), null, () => {}, () => {}] as any;
+ RuntimeClass.useQuery = useMockQuery.data(new RuntimeClass(json));
}
return |