Skip to content

Commit 59485ab

Browse files
committed
refactor
1 parent 9f15f70 commit 59485ab

File tree

2 files changed

+5
-25
lines changed

2 files changed

+5
-25
lines changed

src/hooks/useCustomResourceDefinitionQuery.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { useMemo } from 'react';
22
import { useApiResource } from '../lib/api/useApiResource.ts';
33
import { CustomResourceDefinition } from '../types/customResourceDefinition.ts';
4-
import { getCustomResourceDefinitionPluralName } from '../utils/getPluralName.ts';
4+
55
import openapiSchemaToJsonSchema from '@openapi-contrib/openapi-schema-to-json-schema';
66
import { APIError } from '../lib/api/error.ts';
7+
import { useResourcePluralNames } from './useResourcePluralNames.ts';
78

89
export interface UseCustomResourceDefinitionQueryParams {
910
kind?: string;
@@ -23,7 +24,8 @@ export function useCustomResourceDefinitionQuery({
2324
apiGroupName,
2425
apiVersion,
2526
}: UseCustomResourceDefinitionQueryParams): UseCustomResourceDefinitionQueryResult {
26-
const customResourceDefinitionName = getCustomResourceDefinitionPluralName(kind);
27+
const { getPluralKind, isLoading: isGetPluralNameLoading } = useResourcePluralNames();
28+
const customResourceDefinitionName = getPluralKind(kind ?? '');
2729

2830
const {
2931
data: crdData,
@@ -55,7 +57,7 @@ export function useCustomResourceDefinitionQuery({
5557
return {
5658
schema,
5759
crdData,
58-
isLoading,
60+
isLoading: isLoading || isGetPluralNameLoading,
5961
error,
6062
};
6163
}

src/utils/getPluralName.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)