@prorobotech/openapi-k8s-toolkit 1.1.0-alpha.12 → 1.1.0-alpha.14

package/dist/openapi-k8s-toolkit.es.js

@@ -7892,6 +7892,13 @@ const patchEntryWithReplaceOp = async ({
       "Content-Type": "application/json-patch+json"
     }
   };
+  const addOp = [
+    {
+      op: "add",
+      path: pathToValue,
+      value: body
+    }
+  ];
   const replaceOp = [
     {
       op: "replace",
@@ -7900,24 +7907,11 @@ const patchEntryWithReplaceOp = async ({
     }
   ];
   try {
-    return await axios.patch(endpoint, replaceOp, config);
+    await axios.patch(endpoint, addOp, config);
   } catch (error) {
-    if (!isAxiosError(error)) {
-      throw error;
-    }
-    const status = error.response?.status;
-    if (status !== 422) {
-      throw error;
-    }
-    const addOp = [
-      {
-        op: "add",
-        path: pathToValue,
-        value: body
-      }
-    ];
-    return axios.patch(endpoint, addOp, config);
+    console.error(`Error trying to add: ${error}`);
   }
+  return axios.patch(endpoint, replaceOp, config);
 };
 const patchEntryWithDeleteOp = async ({
   endpoint,
@@ -9183,23 +9177,23 @@ const useListWatch = ({
   };
 };
 
-const buildApiPrefix = (group, version) => {
-  const g = (group ?? "").trim();
-  const v = (version ?? "").trim();
+const buildApiPrefix = (apiGroup, apiVersion) => {
+  const g = (apiGroup ?? "").trim();
+  const v = (apiVersion ?? "").trim();
   const isCore = !g || g === "core" || g === "v1";
   return isCore ? `/api/${v}` : `/apis/${g}/${v}`;
 };
 const buildListUri = ({
   cluster,
-  group,
-  version,
+  apiGroup,
+  apiVersion,
   plural,
   namespace,
   fieldSelector,
   labelSelector,
   limit
 }) => {
-  const prefix = buildApiPrefix(group, version);
+  const prefix = buildApiPrefix(apiGroup, apiVersion);
   const ns = namespace ? `/namespaces/${namespace}` : "";
   const base = `/api/clusters/${cluster}/k8s${prefix}${ns}/${plural}/`;
   const params = new URLSearchParams();
@@ -9210,8 +9204,8 @@ const buildListUri = ({
 };
 const useK8sSmartResource = ({
   cluster,
-  group,
-  version,
+  apiGroup,
+  apiVersion,
   plural,
   namespace,
   fieldSelector,
@@ -9229,15 +9223,15 @@ const useK8sSmartResource = ({
     error: verbsErrorObj
   } = useK8sVerbs({
     cluster,
-    group,
-    version,
+    group: apiGroup,
+    version: apiVersion,
     plural,
     isEnabled: Boolean(isEnabled && cluster && cluster.length > 0)
   });
   const listUri = buildListUri({
     cluster,
-    group,
-    version,
+    apiGroup,
+    apiVersion,
     plural,
     namespace,
     fieldSelector,
@@ -9257,8 +9251,8 @@ const useK8sSmartResource = ({
     queryKey: [
       "k8s-list",
       cluster,
-      group || "",
-      version,
+      apiGroup || "",
+      apiVersion,
       namespace || "",
       plural,
       fieldSelector || "",
@@ -9279,8 +9273,8 @@ const useK8sSmartResource = ({
     isEnabled: watchEnabled,
     pageSize: limit,
     query: {
-      apiGroup: group,
-      apiVersion: version,
+      apiGroup,
+      apiVersion,
       plural,
       namespace,
       fieldSelector,
@@ -9379,9 +9373,9 @@ const ManageableBreadcrumbsProvider = ({
     isError: rawDataError,
     isLoading: rawDataLoading
   } = useK8sSmartResource({
-    cluster: cluster || "",
-    group: apiGroup,
-    version: apiVersion,
+    cluster,
+    apiGroup,
+    apiVersion,
     plural,
     isEnabled
   });
@@ -9591,8 +9585,8 @@ const ManageableSidebarProvider = ({
     isLoading: rawDataLoading
   } = useK8sSmartResource({
     cluster,
-    group: apiGroup,
-    version: apiVersion,
+    apiGroup,
+    apiVersion,
     plural,
     isEnabled
   });
@@ -34219,21 +34213,15 @@ const ProjectInfoCard$1 = ({
   data,
   children
 }) => {
-  const { id, clusterNamePartOfUrl, namespacePartOfUrl, accessGroups, ...props } = data;
+  const { id, cluster, namespace, accessGroups, ...props } = data;
   const { data: multiQueryData, isError, errors } = useMultiQuery();
   const partsOfUrl = usePartsOfUrl();
   const replaceValues = partsOfUrl.partsOfUrl.reduce((acc, value, index) => {
     acc[index.toString()] = value;
     return acc;
   }, {});
-  const clusterName = prepareTemplate({
-    template: clusterNamePartOfUrl,
-    replaceValues
-  });
-  const namespace = prepareTemplate({
-    template: namespacePartOfUrl,
-    replaceValues
-  });
+  const clusterPrepared = parseAll({ text: cluster, replaceValues, multiQueryData });
+  const namespacePrepared = parseAll({ text: namespace, replaceValues, multiQueryData });
   const parsedAccessGroups = accessGroups.map(
     (accessGroup) => parseAll({ text: accessGroup, replaceValues, multiQueryData })
   );
@@ -34243,7 +34231,7 @@ const ProjectInfoCard$1 = ({
       /* @__PURE__ */ jsxRuntimeExports.jsx("ul", { children: errors.map((e, i) => e && /* @__PURE__ */ jsxRuntimeExports.jsx("li", { children: typeof e === "string" ? e : e.message }, i)) })
     ] });
   }
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(ProjectInfoCard, { clusterName, namespace, accessGroups: parsedAccessGroups, ...props, children });
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(ProjectInfoCard, { cluster: clusterPrepared, namespace: namespacePrepared, accessGroups: parsedAccessGroups, ...props, children });
 };
 
 const MarketplaceCard$1 = ({
@@ -34251,21 +34239,22 @@ const MarketplaceCard$1 = ({
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   children
 }) => {
-  const { id, clusterNamePartOfUrl, namespacePartOfUrl, ...props } = data;
+  const { id, cluster, namespace, ...props } = data;
+  const { data: multiQueryData, isError, errors } = useMultiQuery();
   const partsOfUrl = usePartsOfUrl();
   const replaceValues = partsOfUrl.partsOfUrl.reduce((acc, value, index) => {
     acc[index.toString()] = value;
     return acc;
   }, {});
-  const clusterName = prepareTemplate({
-    template: clusterNamePartOfUrl,
-    replaceValues
-  });
-  const namespace = prepareTemplate({
-    template: namespacePartOfUrl,
-    replaceValues
-  });
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(MarketPlace, { clusterName, namespace, ...props });
+  const clusterPrepared = parseAll({ text: cluster, replaceValues, multiQueryData });
+  const namespacePrepared = parseAll({ text: namespace, replaceValues, multiQueryData });
+  if (isError) {
+    return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("h4", { children: "Errors:" }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx("ul", { children: errors.map((e, i) => e && /* @__PURE__ */ jsxRuntimeExports.jsx("li", { children: typeof e === "string" ? e : e.message }, i)) })
+    ] });
+  }
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(MarketPlace, { cluster: clusterPrepared, namespace: namespacePrepared, ...props });
 };
 
 const ContentCard = ({
@@ -34393,7 +34382,7 @@ const SidebarProvider = ({
 };
 
 const checkPermission = async ({
-  clusterName,
+  cluster,
   body
 }) => {
   const data = JSON.stringify({
@@ -34401,15 +34390,15 @@ const checkPermission = async ({
     kind: "SelfSubjectAccessReview",
     spec: {
       resourceAttributes: {
-        ...body.group ? { group: body.group } : {},
-        resource: body.resource,
+        ...body.apiGroup ? { group: body.apiGroup } : {},
+        resource: body.plural,
         verb: body.verb,
         ...body.namespace ? { namespace: body.namespace } : {},
         ...body.name ? { name: body.name } : {}
       }
     }
   });
-  return axios.post(`/api/clusters/${clusterName}/k8s/apis/authorization.k8s.io/v1/selfsubjectaccessreviews`, data, {
+  return axios.post(`/api/clusters/${cluster}/k8s/apis/authorization.k8s.io/v1/selfsubjectaccessreviews`, data, {
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -34418,23 +34407,23 @@ const checkPermission = async ({
 };
 
 const usePermissions = ({
-  clusterName,
+  cluster,
   namespace,
-  group,
-  resource,
+  apiGroup,
+  plural,
   verb,
   name,
   refetchInterval,
   enabler
 }) => {
   return useQuery({
-    queryKey: ["usePermissions", clusterName, namespace, group, resource, verb, name],
+    queryKey: ["usePermissions", cluster, namespace, apiGroup, plural, verb, name],
     queryFn: async () => (await checkPermission({
-      clusterName,
+      cluster,
       body: {
         namespace,
-        group,
-        resource,
+        apiGroup,
+        plural,
         verb
       }
     })).data,
@@ -34451,7 +34440,7 @@ const getLinkToBuiltinForm = ({
   baseprefix,
   namespace,
   syntheticProject,
-  typeName,
+  plural,
   inside,
   fullPath
 }) => {
@@ -34460,7 +34449,7 @@ const getLinkToBuiltinForm = ({
   const backlink = getBackLinkToTable({
     fullPath
   });
-  return `${mainRoute}/forms/builtin/v1/${typeName}?backlink=${backlink}`;
+  return `${mainRoute}/forms/builtin/v1/${plural}?backlink=${backlink}`;
 };
 const getLinkToApiForm = ({
   cluster,
@@ -34469,7 +34458,7 @@ const getLinkToApiForm = ({
   syntheticProject,
   apiGroup,
   apiVersion,
-  typeName,
+  plural,
   inside,
   fullPath
 }) => {
@@ -34478,7 +34467,7 @@ const getLinkToApiForm = ({
   const backlink = getBackLinkToTable({
     fullPath
   });
-  return `${mainRoute}/forms/apis/${apiGroup}/${apiVersion}/${typeName}?backlink=${backlink}`;
+  return `${mainRoute}/forms/apis/${apiGroup}/${apiVersion}/${plural}?backlink=${backlink}`;
 };
 const getLinkToForm = ({
   apiGroup,
@@ -34525,7 +34514,7 @@ const EnrichedTable$1 = ({
     fetchUrl,
     k8sResourceToFetch,
     pathToItems,
-    clusterNamePartOfUrl,
+    cluster,
     labelSelector,
     labelSelectorFull,
     fieldSelector,
@@ -34541,36 +34530,33 @@ const EnrichedTable$1 = ({
     acc[index.toString()] = value;
     return acc;
   }, {});
-  const clusterName = prepareTemplate({
-    template: clusterNamePartOfUrl,
-    replaceValues
-  });
+  const clusterPrepared = parseAll({ text: cluster, replaceValues, multiQueryData });
   const namespacePrepared = namespace ? parseAll({ text: namespace, replaceValues, multiQueryData }) : void 0;
   const k8sResourcePrePrepared = k8sResource ? {
     apiGroup: k8sResource.apiGroup ? parseAll({ text: k8sResource.apiGroup, replaceValues, multiQueryData }) : void 0,
     apiVersion: parseAll({ text: k8sResource.apiVersion, replaceValues, multiQueryData }),
-    resource: parseAll({ text: k8sResource.resource, replaceValues, multiQueryData })
+    plural: parseAll({ text: k8sResource.plural, replaceValues, multiQueryData })
   } : void 0;
-  const k8sResourcePrepared = k8sResourcePrePrepared?.apiGroup === "-" ? { apiVersion: k8sResourcePrePrepared.apiVersion, resource: k8sResourcePrePrepared.resource } : k8sResourcePrePrepared;
+  const k8sResourcePrepared = k8sResourcePrePrepared?.apiGroup === "-" ? { apiVersion: k8sResourcePrePrepared.apiVersion, plural: k8sResourcePrePrepared.plural } : k8sResourcePrePrepared;
   const dataForControlsPrepared = dataForControls ? {
-    cluster: clusterName,
+    cluster: clusterPrepared,
     syntheticProject: dataForControls.syntheticProject ? parseAll({ text: dataForControls.syntheticProject, replaceValues, multiQueryData }) : void 0,
-    resource: parseAll({ text: dataForControls.resource, replaceValues, multiQueryData }),
+    plural: parseAll({ text: dataForControls.plural, replaceValues, multiQueryData }),
     apiGroup: dataForControls.apiGroup ? parseAll({ text: dataForControls.apiGroup, replaceValues, multiQueryData }) : void 0,
     apiVersion: parseAll({ text: dataForControls.apiVersion, replaceValues, multiQueryData })
   } : void 0;
   const createPermission = usePermissions({
-    group: dataForControlsPrepared?.apiGroup,
-    resource: dataForControlsPrepared?.resource || "",
+    apiGroup: dataForControlsPrepared?.apiGroup,
+    plural: dataForControlsPrepared?.plural || "",
     namespace: namespacePrepared,
-    clusterName,
+    cluster: clusterPrepared,
     verb: "create",
     refetchInterval: false
   });
   const fetchUrlPrepared = fetchUrl ? parseAll({ text: fetchUrl, replaceValues, multiQueryData }) : void 0;
   const k8sResourceToFetchPrepared = k8sResourceToFetch ? {
-    group: k8sResourceToFetch.group ? parseAll({ text: k8sResourceToFetch.group, replaceValues, multiQueryData }) : void 0,
-    version: parseAll({ text: k8sResourceToFetch.version, replaceValues, multiQueryData }),
+    apiGroup: k8sResourceToFetch.apiGroup ? parseAll({ text: k8sResourceToFetch.apiGroup, replaceValues, multiQueryData }) : void 0,
+    apiVersion: parseAll({ text: k8sResourceToFetch.apiVersion, replaceValues, multiQueryData }),
     plural: parseAll({ text: k8sResourceToFetch.plural, replaceValues, multiQueryData }),
     namespace: k8sResourceToFetch.namespace ? parseAll({ text: k8sResourceToFetch.namespace, replaceValues, multiQueryData }) : void 0
   } : void 0;
@@ -34617,10 +34603,10 @@ const EnrichedTable$1 = ({
     isLoading: isFetchedDataSocketLoading,
     error: fetchedDataSocketError
   } = useK8sSmartResource({
-    cluster: clusterName || "",
+    cluster: clusterPrepared || "",
     namespace: k8sResourceToFetchPrepared?.namespace,
-    group: k8sResourceToFetchPrepared?.group,
-    version: k8sResourceToFetchPrepared?.version || "",
+    apiGroup: k8sResourceToFetchPrepared?.apiGroup,
+    apiVersion: k8sResourceToFetchPrepared?.apiVersion || "",
     plural: k8sResourceToFetchPrepared?.plural || "",
     fieldSelector: sParams.get("fieldSelector") || void 0,
     labelSelector: sParams.get("labelSelector") || void 0,
@@ -34671,7 +34657,7 @@ const EnrichedTable$1 = ({
       EnrichedTableProvider,
       {
         tableMappingsReplaceValues: replaceValues,
-        cluster: clusterName,
+        cluster: clusterPrepared,
         namespace: namespacePrepared,
         theme,
         dataItems: items,
@@ -34705,13 +34691,13 @@ const EnrichedTable$1 = ({
           type: "primary",
           onClick: () => {
             const url = getLinkToForm({
-              cluster: clusterName,
+              cluster: clusterPrepared,
               baseprefix,
               namespace: namespacePrepared,
               syntheticProject: params.syntheticProject,
               apiGroup: dataForControlsPrepared.apiGroup,
               apiVersion: dataForControlsPrepared.apiVersion,
-              typeName: dataForControlsPrepared.resource,
+              plural: dataForControlsPrepared.plural,
               fullPath
             });
             navigate(url);
@@ -34792,7 +34778,7 @@ const PodTerminal$1 = ({
   } = useK8sSmartResource({
     cluster: clusterPrepared,
     namespace: namespacePrepared,
-    version: "v1",
+    apiVersion: "v1",
     plural: "pods",
     fieldSelector: `metadata.name=${podNamePrepared}`,
     isEnabled: clusterPrepared !== void 0 && namespacePrepared !== void 0 && podNamePrepared !== void 0
@@ -34911,7 +34897,7 @@ const PodLogs$1 = ({
   } = useK8sSmartResource({
     cluster: clusterPrepared,
     namespace: namespacePrepared,
-    version: "v1",
+    apiVersion: "v1",
     plural: "pods",
     fieldSelector: `metadata.name=${podNamePrepared}`,
     isEnabled: clusterPrepared !== void 0 && namespacePrepared !== void 0 && podNamePrepared !== void 0
@@ -34997,7 +34983,7 @@ const YamlEditorSingleton$1 = ({
     type,
     apiGroup,
     apiVersion,
-    typeName,
+    plural,
     forcedKind,
     prefillValuesRequestIndex,
     pathToData,
@@ -35025,7 +35011,7 @@ const YamlEditorSingleton$1 = ({
   const clusterPrepared = parseAll({ text: cluster, replaceValues, multiQueryData });
   const apiGroupPrepared = apiGroup ? parseAll({ text: apiGroup, replaceValues, multiQueryData }) : "no-api-group";
   const apiVersionPrepared = apiVersion ? parseAll({ text: apiVersion, replaceValues, multiQueryData }) : "no-api-version";
-  const typeNamePrepared = parseAll({ text: typeName, replaceValues, multiQueryData });
+  const pluralPrepared = parseAll({ text: plural, replaceValues, multiQueryData });
   const prefillValuesRaw = multiQueryData[`req${prefillValuesRequestIndex}`];
   const prefillValues = pathToData ? getDataByPath({ prefillValuesRaw, pathToData }) : prefillValuesRaw;
   const prefillValuesWithForces = getPrefillValuesWithForces({ prefillValues, forcedKind, apiGroup, apiVersion });
@@ -35043,7 +35029,7 @@ const YamlEditorSingleton$1 = ({
         isCreate: false,
         type,
         apiGroupApiVersion: type === "builtin" ? "api/v1" : `${apiGroupPrepared}/${apiVersionPrepared}`,
-        typeName: typeNamePrepared,
+        plural: pluralPrepared,
         designNewLayout: true,
         designNewLayoutHeight: height,
         openNotification: true,
@@ -38030,7 +38016,7 @@ const Events$1 = ({
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     id,
     baseprefix,
-    clusterNamePartOfUrl,
+    cluster,
     wsUrl,
     pageSize,
     substractHeight,
@@ -38043,8 +38029,8 @@ const Events$1 = ({
     baseFactoryNamespacedBuiltinKey,
     baseFactoryClusterSceopedBuiltinKey,
     baseNamespaceFactoryKey,
-    baseNavigationPluralName,
-    baseNavigationSpecificName,
+    baseNavigationPlural,
+    baseNavigationName,
     ...props
   } = data;
   const theme = useTheme();
@@ -38053,10 +38039,7 @@ const Events$1 = ({
     acc[index.toString()] = value;
     return acc;
   }, {});
-  const clusterName = prepareTemplate({
-    template: clusterNamePartOfUrl,
-    replaceValues
-  });
+  const clusterPrepared = parseAll({ text: cluster, replaceValues, multiQueryData });
   const wsUrlPrepared = parseAll({ text: wsUrl, replaceValues, multiQueryData });
   const params = new URLSearchParams();
   if (limit) {
@@ -38100,7 +38083,7 @@ const Events$1 = ({
       {
         theme,
         baseprefix,
-        cluster: clusterName,
+        cluster: clusterPrepared,
         wsUrl: wsUrlWithParams,
         pageSize,
         substractHeight: substractHeight || 340,
@@ -38109,8 +38092,8 @@ const Events$1 = ({
         baseFactoryNamespacedBuiltinKey,
         baseFactoryClusterSceopedBuiltinKey,
         baseNamespaceFactoryKey,
-        baseNavigationPluralName,
-        baseNavigationSpecificName,
+        baseNavigationPlural,
+        baseNavigationName,
         ...props
       }
     ),
@@ -38118,8 +38101,8 @@ const Events$1 = ({
   ] });
 };
 
-const getKinds = async ({ clusterName }) => {
-  const result = await axios.get(`/api/clusters/${clusterName}/openapi-bff/search/kinds/getKinds`);
+const getKinds = async ({ cluster }) => {
+  const result = await axios.get(`/api/clusters/${cluster}/openapi-bff/search/kinds/getKinds`);
   return result.data;
 };
 
@@ -38316,14 +38299,14 @@ const RefsList = ({
   baseFactoryClusterSceopedAPIKey,
   baseFactoryNamespacedBuiltinKey,
   baseFactoryClusterSceopedBuiltinKey,
-  baseNavigationPluralName,
-  baseNavigationSpecificName,
+  baseNavigationPlural,
+  baseNavigationName,
   listFlexProps
 }) => {
   const [kindIndex, setKindIndex] = useState();
   const [kindsWithVersion, setKindWithVersion] = useState();
   useEffect(() => {
-    getKinds({ clusterName: cluster }).then((data) => {
+    getKinds({ cluster }).then((data) => {
       setKindIndex(data);
       setKindWithVersion(getSortedKindsAll(data));
     }).catch((error) => {
@@ -38332,10 +38315,10 @@ const RefsList = ({
   }, [cluster]);
   const { data: navigationDataArr } = useK8sSmartResource({
     cluster,
-    group: "front.in-cloud.io",
-    version: "v1alpha1",
-    plural: baseNavigationPluralName,
-    fieldSelector: `metadata.name=${baseNavigationSpecificName}`
+    apiGroup: "front.in-cloud.io",
+    apiVersion: "v1alpha1",
+    plural: baseNavigationPlural,
+    fieldSelector: `metadata.name=${baseNavigationName}`
   });
   const getPlural = kindsWithVersion ? pluralByKind(kindsWithVersion) : void 0;
   const baseFactoriesMapping = navigationDataArr && navigationDataArr.items && navigationDataArr.items.length > 0 ? navigationDataArr.items[0].spec?.baseFactoriesMapping : void 0;
@@ -38385,7 +38368,7 @@ const OwnerRefs = ({
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     id,
     baseprefix,
-    clusterNamePartOfUrl,
+    cluster,
     reqIndex,
     errorText,
     notArrayErrorText,
@@ -38396,13 +38379,14 @@ const OwnerRefs = ({
     keysToForcedLabel,
     forcedRelatedValuePath,
     jsonPathToArrayOfRefs,
+    forcedApiVersion,
     forcedNamespace,
     baseFactoryNamespacedAPIKey,
     baseFactoryClusterSceopedAPIKey,
     baseFactoryNamespacedBuiltinKey,
     baseFactoryClusterSceopedBuiltinKey,
-    baseNavigationPluralName,
-    baseNavigationSpecificName,
+    baseNavigationPlural,
+    baseNavigationName,
     ...props
   } = data;
   const theme = useTheme();
@@ -38411,10 +38395,17 @@ const OwnerRefs = ({
     acc[index.toString()] = value;
     return acc;
   }, {});
-  const clusterName = prepareTemplate({
-    template: clusterNamePartOfUrl,
-    replaceValues
-  });
+  const clusterPrepared = parseAll({ text: cluster, replaceValues, multiQueryData });
+  const preparedForcedApiVersion = forcedApiVersion ? forcedApiVersion.map(({ kind, apiVersion }) => ({
+    kind: prepareTemplate({
+      template: kind,
+      replaceValues
+    }),
+    apiVersion: prepareTemplate({
+      template: apiVersion,
+      replaceValues
+    })
+  })) : void 0;
   const preparedForcedNamespace = forcedNamespace ? prepareTemplate({
     template: forcedNamespace,
     replaceValues
@@ -38423,17 +38414,24 @@ const OwnerRefs = ({
   if (jsonRoot === void 0) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: containerStyle, children: errorText });
   }
-  const refsArr = jp.query(jsonRoot, `$${jsonPathToArrayOfRefs}`)[0];
+  const refsArr = jp.query(jsonRoot, `$${jsonPathToArrayOfRefs}`).flat();
   if (!Array.isArray(refsArr)) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: containerStyle, children: notArrayErrorText });
   }
   if (refsArr.length === 0) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: containerStyle, children: emptyArrayErrorText });
   }
-  if (refsArr.some((el) => !isOwnerReference(el))) {
+  const refsArrWithForcedApiVersion = refsArr.map((el) => {
+    const forceFound = preparedForcedApiVersion?.find((force) => force.kind === el.kind);
+    if (forceFound) {
+      return { ...el, apiVersion: forceFound.apiVersion };
+    }
+    return el;
+  });
+  if (refsArrWithForcedApiVersion.some((el) => !isOwnerReference(el))) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: containerStyle, children: isNotRefsArrayErrorText });
   }
-  const guardedRefsArr = refsArr;
+  const guardedRefsArr = refsArrWithForcedApiVersion;
   if (isMultiqueryLoading) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "Loading multiquery" });
   }
@@ -38443,7 +38441,7 @@ const OwnerRefs = ({
       {
         theme,
         baseprefix,
-        cluster: clusterName,
+        cluster: clusterPrepared,
         refsArr: guardedRefsArr,
         keysToForcedLabel,
         forcedRelatedValuePath,
@@ -38454,8 +38452,8 @@ const OwnerRefs = ({
         baseFactoryClusterSceopedAPIKey,
         baseFactoryNamespacedBuiltinKey,
         baseFactoryClusterSceopedBuiltinKey,
-        baseNavigationPluralName,
-        baseNavigationSpecificName,
+        baseNavigationPlural,
+        baseNavigationName,
         listFlexProps,
         ...props
       }
@@ -38779,7 +38777,15 @@ const prepareUrlsToFetchForDynamicRenderer = ({
   );
 };
 
-const STRING_KEYS = ["cluster", "group", "version", "plural", "namespace", "fieldSelector", "labelSelector"];
+const STRING_KEYS = [
+  "cluster",
+  "apiGroup",
+  "apiVersion",
+  "plural",
+  "namespace",
+  "fieldSelector",
+  "labelSelector"
+];
 const DynamicRendererWithProviders = (props) => {
   const location = useLocation();
   const { urlsToFetch, dataToApplyToContext, theme, nodeTerminalDefaultProfile, disableEventBubbling } = props;
@@ -38851,6 +38857,9 @@ const getCellRender = ({
 }) => {
   if (possibleCustomTypeWithProps) {
     const { type, customProps } = possibleCustomTypeWithProps;
+    if (type === "factory") {
+      return /* @__PURE__ */ jsxRuntimeExports.jsx(TableFactory, { record, customProps, theme });
+    }
     if (value === void 0 && possibleUndefinedValue) {
       return /* @__PURE__ */ jsxRuntimeExports.jsx(ShortenedTextWithTooltip, { trimLength: possibleTrimLength, text: possibleUndefinedValue });
     }
@@ -38888,9 +38897,6 @@ const getCellRender = ({
       }
       return /* @__PURE__ */ jsxRuntimeExports.jsx(TrimmedTags, { tags, trimLength: possibleTrimLength });
     }
-    if (type === "factory") {
-      return /* @__PURE__ */ jsxRuntimeExports.jsx(TableFactory, { record, customProps, theme });
-    }
   }
   if (value === null) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: "null" });
@@ -39071,13 +39077,13 @@ const getEnrichedColumnsWithControls = ({
                   domEvent.preventDefault();
                   if (key === "edit") {
                     navigate(
-                      `${baseprefix}/${value.cluster}${value.namespace ? `/${value.namespace}` : ""}${value.syntheticProject ? `/${value.syntheticProject}` : ""}/${value.pathPrefix}/${value.apiGroupAndVersion}/${value.typeName}/${value.entryName}?backlink=${value.backlink}`
+                      `${baseprefix}/${value.cluster}${value.namespace ? `/${value.namespace}` : ""}${value.syntheticProject ? `/${value.syntheticProject}` : ""}/${value.pathPrefix}/${value.apiGroupAndVersion}/${value.plural}/${value.name}?backlink=${value.backlink}`
                     );
                   }
                   if (key === "delete") {
                     value.onDeleteHandle(
-                      value.entryName,
-                      `${value.deletePathPrefix}/${value.apiGroupAndVersion}${value.namespace ? `/namespaces/${value.namespace}` : ""}/${value.typeName}/${value.entryName}`
+                      value.name,
+                      `${value.deletePathPrefix}/${value.apiGroupAndVersion}${value.namespace ? `/namespaces/${value.namespace}` : ""}/${value.plural}/${value.name}`
                     );
                   }
                 }
@@ -39178,8 +39184,8 @@ const EnrichedTable = ({
               selectData.onChange(
                 selectedRowKeys,
                 rows.map(({ internalDataForControls }) => ({
-                  name: internalDataForControls.entryName,
-                  endpoint: `${internalDataForControls.deletePathPrefix}/${internalDataForControls.apiGroupAndVersion}${internalDataForControls.namespace ? `/namespaces/${internalDataForControls.namespace}` : ""}/${internalDataForControls.typeName}/${internalDataForControls.entryName}`
+                  name: internalDataForControls.name,
+                  endpoint: `${internalDataForControls.deletePathPrefix}/${internalDataForControls.apiGroupAndVersion}${internalDataForControls.namespace ? `/namespaces/${internalDataForControls.namespace}` : ""}/${internalDataForControls.plural}/${internalDataForControls.name}`
                 }))
               );
             }
@@ -39280,8 +39286,8 @@ const prepare = ({
             syntheticProject: dataForControls.syntheticProject,
             pathPrefix: dataForControls.pathPrefix,
             apiGroupAndVersion: dataForControls.apiVersion,
-            typeName: dataForControls.typeName,
-            entryName: el.metadata.name,
+            plural: dataForControls.plural,
+            name: el.metadata.name,
             namespace: el.metadata.namespace || void 0,
             backlink: dataForControls.backlink,
             deletePathPrefix: dataForControls.deletePathPrefix,
@@ -39363,8 +39369,8 @@ const prepare = ({
             synthetichProject: dataForControls.syntheticProject,
             pathPrefix: dataForControls.pathPrefix,
             apiGroupAndVersion: dataForControls.apiVersion,
-            typeName: dataForControls.typeName,
-            entryName: el.metadata.name,
+            plural: dataForControls.plural,
+            name: el.metadata.name,
             namespace: el.metadata.namespace || void 0,
             backlink: dataForControls.backlink,
             deletePathPrefix: dataForControls.deletePathPrefix,
@@ -39409,18 +39415,18 @@ const EnrichedTableProvider = ({
   const [isLoading, setIsLoading] = useState(false);
   const [isError, setIsError] = useState(false);
   const updatePermission = usePermissions({
-    group: dataForControls?.apiGroup,
-    resource: dataForControls?.resource || "",
+    apiGroup: dataForControls?.apiGroup,
+    plural: dataForControls?.plural || "",
     namespace,
-    clusterName: cluster,
+    cluster,
     verb: "update",
     refetchInterval: false
   });
   const deletePermission = usePermissions({
-    group: dataForControls?.apiGroup,
-    resource: dataForControls?.resource || "",
+    apiGroup: dataForControls?.apiGroup,
+    plural: dataForControls?.plural || "",
     namespace,
-    clusterName: cluster,
+    cluster,
     verb: "delete",
     refetchInterval: false
   });
@@ -39428,7 +39434,7 @@ const EnrichedTableProvider = ({
     setIsError(void 0);
     setIsLoading(true);
     const payload = {
-      clusterName: cluster,
+      cluster,
       customizationId,
       tableMappingsReplaceValues,
       forceDefaultAdditionalPrinterColumns,
@@ -39471,7 +39477,7 @@ const EnrichedTableProvider = ({
       cluster: dataForControls.cluster,
       syntheticProject: dataForControls.syntheticProject,
       pathPrefix: !dataForControls.apiGroup || dataForControls.apiGroup.length === 0 ? "forms/builtin" : "forms/apis",
-      typeName: dataForControls.resource,
+      plural: dataForControls.plural,
       apiVersion: !dataForControls.apiGroup || dataForControls.apiGroup.length === 0 ? dataForControls.apiVersion : `${dataForControls.apiGroup}/${dataForControls.apiVersion}`,
       backlink: encodeURIComponent(fullPath),
       onDeleteHandle: dataForControlsInternal.onDeleteHandle,
@@ -47048,7 +47054,7 @@ const YamlEditorSingleton = ({
   isCreate,
   type,
   apiGroupApiVersion,
-  typeName,
+  plural,
   backlink,
   designNewLayout,
   designNewLayoutHeight,
@@ -47114,7 +47120,7 @@ const YamlEditorSingleton = ({
     const { namespace } = currentValues.metadata;
     const { name } = currentValues.metadata;
     const body = currentValues;
-    const endpoint = `/api/clusters/${cluster}/k8s/${type === "builtin" ? "" : "apis/"}${apiGroupApiVersion}${isNameSpaced ? `/namespaces/${namespace}` : ""}/${typeName}/${isCreate ? "" : name}`;
+    const endpoint = `/api/clusters/${cluster}/k8s/${type === "builtin" ? "" : "apis/"}${apiGroupApiVersion}${isNameSpaced ? `/namespaces/${namespace}` : ""}/${plural}/${isCreate ? "" : name}`;
     if (isCreate) {
       createNewEntry({ endpoint, body }).then((res) => {
         console.log(res);
@@ -47947,7 +47953,7 @@ const FormListInput = ({
   const onValuesChangeCallBack = useOnValuesChangeCallback();
   const isTouchedPeristed = useIsTouchedPersisted();
   const updateTouched = useUpdateIsTouchedPersisted();
-  const { clusterName, namespace, syntheticProject, entryName } = urlParams;
+  const { cluster, namespace, syntheticProject, name: entryName } = urlParams;
   const form = Form.useFormInstance();
   const fieldValue = Form.useWatch(name === "nodeName" ? "nodeNameBecauseOfSuddenBug" : name, form);
   const fixedName = name === "nodeName" ? "nodeNameBecauseOfSuddenBug" : name;
@@ -48000,7 +48006,7 @@ const FormListInput = ({
   }, [relatedPath, form, arrName, fixedName, relatedFieldValue, onValuesChangeCallBack, isTouchedPeristed]);
   const uri = prepareTemplate({
     template: customProps.valueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, relatedFieldValue, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, relatedFieldValue, name: entryName }
   });
   const {
     data: optionsObj,
@@ -48298,47 +48304,47 @@ const FormRangeInput = ({
   urlParams,
   onRemoveByMinus
 }) => {
-  const { clusterName, namespace, syntheticProject, entryName } = urlParams;
+  const { cluster, namespace, syntheticProject, name: entryName } = urlParams;
   const minMaxAndStep = isEdit ? customProps.edit : customProps.add;
   const minValueUri = minMaxAndStep.min.type === "resourceValue" ? prepareTemplate({
     template: minMaxAndStep.min.valueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const minSubstractFirstValueUri = minMaxAndStep.min.type === "substractResourceValues" ? prepareTemplate({
     template: minMaxAndStep.min.firstValueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const minSubstractSecondValueUri = minMaxAndStep.min.type === "substractResourceValues" ? prepareTemplate({
     template: minMaxAndStep.min.secondValueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const minAddFirstValueUri = minMaxAndStep.min.type === "addResourceValues" ? prepareTemplate({
     template: minMaxAndStep.min.firstValueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const minAddSecondValueUri = minMaxAndStep.min.type === "addResourceValues" ? prepareTemplate({
     template: minMaxAndStep.min.secondValueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const maxValueUri = minMaxAndStep.max.type === "resourceValue" ? prepareTemplate({
     template: minMaxAndStep.max.valueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const maxSubstractFirstValueUri = minMaxAndStep.max.type === "substractResourceValues" ? prepareTemplate({
     template: minMaxAndStep.max.firstValueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const maxSubstractSecondValueUri = minMaxAndStep.max.type === "substractResourceValues" ? prepareTemplate({
     template: minMaxAndStep.max.secondValueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const maxAddFirstValueUri = minMaxAndStep.max.type === "addResourceValues" ? prepareTemplate({
     template: minMaxAndStep.max.firstValueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const maxAddSecondValueUri = minMaxAndStep.max.type === "addResourceValues" ? prepareTemplate({
     template: minMaxAndStep.max.secondValueUri,
-    replaceValues: { clusterName, namespace, syntheticProject, entryName }
+    replaceValues: { cluster, namespace, syntheticProject, name: entryName }
   }) : void 0;
   const {
     data: minValueObj,
@@ -50180,8 +50186,8 @@ const BlackholeForm = ({
   isCreate,
   type,
   apiGroupApiVersion,
-  kindName,
-  typeName,
+  kind,
+  plural,
   backlink,
   designNewLayout,
   designNewLayoutHeight
@@ -50216,8 +50222,8 @@ const BlackholeForm = ({
   const yamlToValuesAbortRef = useRef(null);
   const isAnyFieldFocusedRef = useRef(false);
   const editorUri = useMemo(
-    () => `inmemory://openapi-ui/${cluster}/${apiGroupApiVersion}/${type}/${typeName}/${kindName}${isCreate ? "/create" : "/edit"}.yaml`,
-    [cluster, apiGroupApiVersion, type, typeName, kindName, isCreate]
+    () => `inmemory://openapi-ui/${cluster}/${apiGroupApiVersion}/${type}/${plural}/${kind}${isCreate ? "/create" : "/edit"}.yaml`,
+    [cluster, apiGroupApiVersion, type, plural, kind, isCreate]
   );
   useEffect(() => {
     valuesToYamlReqId.current++;
@@ -50235,19 +50241,19 @@ const BlackholeForm = ({
     setYamlValues(void 0);
   }, [editorUri]);
   const createPermission = usePermissions({
-    group: type === "builtin" ? void 0 : urlParamsForPermissions.apiGroup ? urlParamsForPermissions.apiGroup : "",
-    resource: urlParamsForPermissions.typeName || "",
+    apiGroup: type === "builtin" ? void 0 : urlParamsForPermissions.apiGroup ? urlParamsForPermissions.apiGroup : "",
+    plural: urlParamsForPermissions.plural || "",
     namespace: isNameSpaced ? namespaceFromFormData : void 0,
-    clusterName: cluster,
+    cluster,
     verb: "create",
     refetchInterval: false,
     enabler: isCreate === true
   });
   const updatePermission = usePermissions({
-    group: type === "builtin" ? void 0 : urlParamsForPermissions.apiGroup ? urlParamsForPermissions.apiGroup : "",
-    resource: urlParamsForPermissions.typeName || "",
+    apiGroup: type === "builtin" ? void 0 : urlParamsForPermissions.apiGroup ? urlParamsForPermissions.apiGroup : "",
+    plural: urlParamsForPermissions.plural || "",
     namespace: isNameSpaced ? namespaceFromFormData : void 0,
-    clusterName: cluster,
+    cluster,
     verb: "update",
     refetchInterval: false,
     enabler: isCreate !== true
@@ -50277,7 +50283,7 @@ const BlackholeForm = ({
         payload
       ).then(({ data }) => {
         const body = data;
-        const endpoint = `/api/clusters/${cluster}/k8s/${type === "builtin" ? "" : "apis/"}${apiGroupApiVersion}${isNameSpaced ? `/namespaces/${namespace}` : ""}/${typeName}/${isCreate ? "" : name}`;
+        const endpoint = `/api/clusters/${cluster}/k8s/${type === "builtin" ? "" : "apis/"}${apiGroupApiVersion}${isNameSpaced ? `/namespaces/${namespace}` : ""}/${plural}/${isCreate ? "" : name}`;
         if (isCreate) {
           createNewEntry({ endpoint, body }).then((res) => {
             console.log(res);
@@ -50335,7 +50341,7 @@ const BlackholeForm = ({
     const allValues2 = {};
     if (isCreate) {
       _$1.set(allValues2, ["apiVersion"], apiGroupApiVersion === "api/v1" ? "v1" : apiGroupApiVersion);
-      _$1.set(allValues2, ["kind"], kindName);
+      _$1.set(allValues2, ["kind"], kind);
     }
     if (formsPrefills) {
       formsPrefills.spec.values.forEach(({ path, value }) => {
@@ -50355,7 +50361,7 @@ const BlackholeForm = ({
     }
     const sorted = Object.fromEntries(Object.entries(allValues2).sort(([a], [b]) => a.localeCompare(b)));
     return sorted;
-  }, [formsPrefills, prefillValueNamespaceOnly, isCreate, apiGroupApiVersion, kindName, normalizedPrefill]);
+  }, [formsPrefills, prefillValueNamespaceOnly, isCreate, apiGroupApiVersion, kind, normalizedPrefill]);
   const prefillTemplates = useMemo(() => {
     const templates = [];
     if (formsPrefills?.spec?.values?.length) {
@@ -50726,7 +50732,7 @@ const BlackholeForm = ({
       return true;
     });
     setExpandedKeys([...uniqueKeys]);
-  }, [apiGroupApiVersion, formsPrefills, prefillValuesSchema, type, typeName]);
+  }, [apiGroupApiVersion, formsPrefills, prefillValuesSchema, type, plural]);
   useEffect(() => {
     if (!initialValues) return;
     setProperties((prev) => {
@@ -50985,7 +50991,7 @@ const BlackholeFormProvider = ({
     setIsLoading(true);
     const payload = {
       data,
-      clusterName: cluster,
+      cluster,
       customizationId
     };
     axios.post(`/api/clusters/${cluster}/openapi-bff/forms/formPrepare/prepareFormProps`, payload).then(({ data: data2 }) => {
@@ -51004,10 +51010,11 @@ const BlackholeFormProvider = ({
           expandedPaths: data2.expandedPaths || [],
           persistedPaths: data2.persistedPaths || [],
           sortPaths: data2.sortPaths,
-          kindName: data2.kindName || "",
+          kind: data2.kind || "",
           formPrefills: data2.formPrefills,
           namespacesData: data2.namespacesData
         });
+        setIsError(void 0);
       }
     }).catch((e) => {
       setIsError(e.message);
@@ -51029,7 +51036,7 @@ const BlackholeFormProvider = ({
         type: data.type,
         isNameSpaced: isNamespaced,
         apiGroupApiVersion: data.type === "builtin" ? "api/v1" : `${data.apiGroup}/${data.apiVersion}`,
-        typeName: data.typeName,
+        plural: data.plural,
         backlink,
         designNewLayout,
         designNewLayoutHeight
@@ -51065,8 +51072,8 @@ const BlackholeFormProvider = ({
       type: data.type,
       isNameSpaced: isNamespaced ? preparedData.namespacesData : false,
       apiGroupApiVersion: data.type === "builtin" ? "api/v1" : `${data.apiGroup}/${data.apiVersion}`,
-      kindName: preparedData.kindName,
-      typeName: data.typeName,
+      kind: preparedData.kind,
+      plural: data.plural,
       backlink,
       designNewLayout,
       designNewLayoutHeight
@@ -51157,11 +51164,11 @@ function v4(options, buf, offset) {
 }
 
 const AddEditFormModal = ({
-  clusterName,
+  cluster,
   baseApiGroup,
   baseApiVersion,
-  mpResourceName,
-  mpResourceKind,
+  marketplacePlural,
+  marketplaceKind,
   isOpen,
   setIsOpen,
   setError,
@@ -51177,7 +51184,7 @@ const AddEditFormModal = ({
     type: "direct",
     apiGroup: "",
     apiVersion: "",
-    typeName: "",
+    plural: "",
     pathToNav: "",
     tags: [],
     disabled: false,
@@ -51186,10 +51193,10 @@ const AddEditFormModal = ({
   const onSubmit = (values) => {
     if (typeof isOpen === "boolean") {
       createNewEntry({
-        endpoint: `/api/clusters/${clusterName}/k8s/apis/${baseApiGroup}/${baseApiVersion}/${mpResourceName}`,
+        endpoint: `/api/clusters/${cluster}/k8s/apis/${baseApiGroup}/${baseApiVersion}/${marketplacePlural}`,
         body: {
           apiVersion: `${baseApiGroup}/${baseApiVersion}`,
-          kind: mpResourceKind,
+          kind: marketplaceKind,
           metadata: {
             name: v4()
           },
@@ -51206,10 +51213,10 @@ const AddEditFormModal = ({
       return;
     }
     updateEntry({
-      endpoint: `/api/clusters/${clusterName}/k8s/apis/${baseApiGroup}/${baseApiVersion}/${mpResourceName}/${isOpen.metadata.name}`,
+      endpoint: `/api/clusters/${cluster}/k8s/apis/${baseApiGroup}/${baseApiVersion}/${marketplacePlural}/${isOpen.metadata.name}`,
       body: {
         apiVersion: `${baseApiGroup}/${baseApiVersion}`,
-        kind: mpResourceKind,
+        kind: marketplaceKind,
         metadata: {
           name: isOpen.metadata.name,
           resourceVersion: isOpen.metadata.resourceVersion
@@ -51255,7 +51262,7 @@ const AddEditFormModal = ({
         ) }),
         /* @__PURE__ */ jsxRuntimeExports.jsx(Form.Item, { label: "Enter API group", name: "apiGroup", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { disabled: type === "direct" || type === "built-in" }) }),
         /* @__PURE__ */ jsxRuntimeExports.jsx(Form.Item, { label: "Enter API version", name: "apiVersion", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { disabled: type === "direct" }) }),
-        /* @__PURE__ */ jsxRuntimeExports.jsx(Form.Item, { label: "Enter resource type", name: "typeName", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { disabled: type === "direct" }) }),
+        /* @__PURE__ */ jsxRuntimeExports.jsx(Form.Item, { label: "Enter resource type", name: "plural", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { disabled: type === "direct" }) }),
         /* @__PURE__ */ jsxRuntimeExports.jsx(Form.Item, { label: "Enter path", name: "pathToNav", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Input, { disabled: type !== "direct" }) }),
         /* @__PURE__ */ jsxRuntimeExports.jsx(Form.Item, { label: "Tags", name: "tags", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
           Select,
@@ -51274,11 +51281,11 @@ const AddEditFormModal = ({
 };
 
 const getPathToNav = ({
-  clusterName,
+  cluster,
   namespace,
   type,
   pathToNav,
-  typeName,
+  plural,
   apiGroup,
   apiVersion,
   baseprefix
@@ -51288,19 +51295,19 @@ const getPathToNav = ({
     return pathToNav;
   }
   if (type === "crd") {
-    return `/${baseprefix}/${clusterName}/${namespace}/crd-table/${apiGroup}/${apiVersion}/${apiExtensionVersion}/${typeName}`;
+    return `/${baseprefix}/${cluster}/${namespace}/crd-table/${apiGroup}/${apiVersion}/${apiExtensionVersion}/${plural}`;
   }
   if (type === "nonCrd") {
-    return `/${baseprefix}/${clusterName}/${namespace}/api-table/${apiGroup}/${apiVersion}/${typeName}`;
+    return `/${baseprefix}/${cluster}/${namespace}/api-table/${apiGroup}/${apiVersion}/${plural}`;
   }
-  return `/${baseprefix}/${clusterName}/${namespace}/builtin-table/${typeName}`;
+  return `/${baseprefix}/${cluster}/${namespace}/builtin-table/${plural}`;
 };
 const getCreatePathToNav = ({
-  clusterName,
+  cluster,
   namespace,
   type,
   pathToNav,
-  typeName,
+  plural,
   apiGroup,
   apiVersion,
   baseprefix
@@ -51309,12 +51316,12 @@ const getCreatePathToNav = ({
     return pathToNav;
   }
   if (type === "crd") {
-    return `/${baseprefix}/${clusterName}/${namespace}/forms/crds/${apiGroup}/${apiVersion}/${typeName}?backlink=${window.location.pathname}`;
+    return `/${baseprefix}/${cluster}/${namespace}/forms/crds/${apiGroup}/${apiVersion}/${plural}?backlink=${window.location.pathname}`;
   }
   if (type === "nonCrd") {
-    return `/${baseprefix}/${clusterName}/${namespace}/forms/apis/${apiGroup}/${apiVersion}/${typeName}?backlink=${window.location.pathname}`;
+    return `/${baseprefix}/${cluster}/${namespace}/forms/apis/${apiGroup}/${apiVersion}/${plural}?backlink=${window.location.pathname}`;
   }
-  return `/${baseprefix}/${clusterName}/${namespace}/forms/builtin/${apiVersion}/${typeName}?backlink=${window.location.pathname}`;
+  return `/${baseprefix}/${cluster}/${namespace}/forms/builtin/${apiVersion}/${plural}?backlink=${window.location.pathname}`;
 };
 
 const CustomCard$4 = styled(Card$1)`
@@ -51404,11 +51411,11 @@ const MarketplaceCard = ({
   description,
   name,
   icon,
-  clusterName,
+  cluster,
   namespace,
   type,
   pathToNav,
-  typeName,
+  plural,
   apiGroup,
   apiVersion,
   tags,
@@ -51430,29 +51437,29 @@ const MarketplaceCard = ({
     decodedIcon = "Can't decode";
   }
   const navigateUrl = addedMode || standalone ? getPathToNav({
-    clusterName,
+    cluster,
     namespace,
     type,
     pathToNav,
-    typeName,
+    plural,
     apiGroup,
     apiVersion,
     baseprefix
   }) : getCreatePathToNav({
-    clusterName,
+    cluster,
     namespace,
     type,
     pathToNav,
-    typeName,
+    plural,
     apiGroup,
     apiVersion,
     baseprefix
   });
   const { data: k8sList, error: k8sListError } = useK8sSmartResource({
-    cluster: clusterName || "",
+    cluster,
     namespace,
-    group: apiGroup,
-    version: apiVersion || "",
+    apiGroup,
+    apiVersion: apiVersion || "",
     plural: type,
     isEnabled: Boolean(apiVersion && addedMode && type !== "direct")
   });
@@ -51563,12 +51570,12 @@ const Styled$c = {
 };
 
 const MarketPlace = ({
-  clusterName,
+  cluster,
   namespace,
   baseApiGroup,
   baseApiVersion,
-  mpResourceName,
-  mpResourceKind,
+  marketplacePlural,
+  marketplaceKind,
   baseprefix,
   standalone,
   forceAddedMode,
@@ -51589,30 +51596,29 @@ const MarketPlace = ({
     isLoading,
     error
   } = useK8sSmartResource({
-    cluster: clusterName || "",
-    group: baseApiGroup,
-    version: baseApiVersion,
-    plural: mpResourceName,
-    isEnabled: Boolean(clusterName !== void 0)
+    cluster,
+    apiGroup: baseApiGroup,
+    apiVersion: baseApiVersion,
+    plural: marketplacePlural
   });
   const createPermission = usePermissions({
-    group: baseApiGroup,
-    resource: mpResourceName,
-    clusterName: clusterName || "",
+    apiGroup: baseApiGroup,
+    plural: marketplacePlural,
+    cluster,
     verb: "create",
     refetchInterval: false
   });
   const updatePermission = usePermissions({
-    group: baseApiGroup,
-    resource: mpResourceName,
-    clusterName: clusterName || "",
+    apiGroup: baseApiGroup,
+    plural: marketplacePlural,
+    cluster,
     verb: "update",
     refetchInterval: false
   });
   const deletePermission = usePermissions({
-    group: baseApiGroup,
-    resource: mpResourceName,
-    clusterName: clusterName || "",
+    apiGroup: baseApiGroup,
+    plural: marketplacePlural,
+    cluster,
     verb: "delete",
     refetchInterval: false
   });
@@ -51699,8 +51705,8 @@ const MarketPlace = ({
       }
     ),
     /* @__PURE__ */ jsxRuntimeExports.jsxs(Flex, { gap: 22, wrap: true, children: [
-      clusterName && namespace && filteredAndSortedData.map(
-        ({ name, description, icon, type, pathToNav, typeName, apiGroup, apiVersion, tags, disabled }) => /* @__PURE__ */ jsxRuntimeExports.jsx(
+      namespace && filteredAndSortedData.map(
+        ({ name, description, icon, type, pathToNav, plural, apiGroup, apiVersion, tags, disabled }) => /* @__PURE__ */ jsxRuntimeExports.jsx(
           MarketplaceCard,
           {
             baseprefix,
@@ -51709,11 +51715,11 @@ const MarketPlace = ({
             icon,
             isEditMode,
             name,
-            clusterName,
+            cluster,
             namespace,
             type,
             pathToNav,
-            typeName,
+            plural,
             apiGroup,
             apiVersion,
             tags,
@@ -51743,11 +51749,11 @@ const MarketPlace = ({
     isAddEditOpen && /* @__PURE__ */ jsxRuntimeExports.jsx(
       AddEditFormModal,
       {
-        clusterName,
+        cluster,
         baseApiGroup,
         baseApiVersion,
-        mpResourceName,
-        mpResourceKind,
+        marketplacePlural,
+        marketplaceKind,
         isOpen: isAddEditOpen,
         setError: setCreateUpdateError,
         setIsOpen: setIsAddEditOpen,
@@ -51760,7 +51766,7 @@ const MarketPlace = ({
       {
         name: isDeleteOpen.name,
         onClose: () => setIsDeleteOpen(false),
-        endpoint: `/api/clusters/${clusterName}/k8s/apis/${baseApiGroup}/${baseApiVersion}/${mpResourceName}/${isDeleteOpen.name}`
+        endpoint: `/api/clusters/${cluster}/k8s/apis/${baseApiGroup}/${baseApiVersion}/${marketplacePlural}/${isDeleteOpen.name}`
       }
     )
   ] });
@@ -51879,14 +51885,14 @@ const Styled$b = {
   ActionMenuPlaceholder};
 
 const ProjectInfoCard = ({
-  clusterName,
+  cluster,
   namespace,
   baseApiGroup,
   baseApiVersion,
   baseProjectApiGroup,
   baseProjectVersion,
-  mpResourceName,
-  projectResourceName,
+  marketplacePlural,
+  projectPlural,
   baseprefix,
   accessGroups,
   showZeroResources,
@@ -51898,45 +51904,43 @@ const ProjectInfoCard = ({
     isLoading: marketplaceIsLoading
     // error: marketplaceError,
   } = useK8sSmartResource({
-    cluster: clusterName || "",
-    group: baseApiGroup,
-    version: baseApiVersion,
-    plural: mpResourceName,
-    isEnabled: Boolean(clusterName !== void 0)
+    cluster,
+    apiGroup: baseApiGroup,
+    apiVersion: baseApiVersion,
+    plural: marketplacePlural
   });
   const {
     data: projectArr,
     isLoading,
     error
   } = useK8sSmartResource({
-    cluster: clusterName || "",
-    group: baseProjectApiGroup,
-    version: baseProjectVersion,
-    plural: projectResourceName,
-    fieldSelector: `metadata.name=${namespace}`,
-    isEnabled: Boolean(clusterName !== void 0)
+    cluster,
+    apiGroup: baseProjectApiGroup,
+    apiVersion: baseProjectVersion,
+    plural: projectPlural,
+    fieldSelector: `metadata.name=${namespace}`
   });
   const project = projectArr && projectArr.items && projectArr.items.length > 0 ? projectArr.items[0] : void 0;
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const updatePermission = usePermissions({
-    group: baseProjectApiGroup,
-    resource: projectResourceName,
-    clusterName: clusterName || "",
+    apiGroup: baseProjectApiGroup,
+    plural: projectPlural,
+    cluster,
     verb: "update",
     refetchInterval: false
   });
   const deletePermission = usePermissions({
-    group: baseProjectApiGroup,
-    resource: projectResourceName,
-    clusterName: clusterName || "",
+    apiGroup: baseProjectApiGroup,
+    plural: projectPlural,
+    cluster,
     verb: "delete",
     refetchInterval: false
   });
   const openUpdate = useCallback(() => {
     navigate(
-      `/${baseprefix}/${clusterName}/forms/apis/${baseProjectApiGroup}/${baseProjectVersion}/${projectResourceName}/${namespace}?backlink=${baseprefix}/clusters/${clusterName}`
+      `/${baseprefix}/${cluster}/forms/apis/${baseProjectApiGroup}/${baseProjectVersion}/${projectPlural}/${namespace}?backlink=${baseprefix}/clusters/${cluster}`
     );
-  }, [baseprefix, clusterName, namespace, baseProjectApiGroup, baseProjectVersion, projectResourceName, navigate]);
+  }, [baseprefix, cluster, namespace, baseProjectApiGroup, baseProjectVersion, projectPlural, navigate]);
   if (isLoading) {
     return /* @__PURE__ */ jsxRuntimeExports.jsx(Spin, {});
   }
@@ -51965,7 +51969,7 @@ const ProjectInfoCard = ({
     /* @__PURE__ */ jsxRuntimeExports.jsx(Spacer$1, { $space: 12, $samespace: true }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs(Flex, { gap: 22, wrap: true, children: [
       marketplaceIsLoading && /* @__PURE__ */ jsxRuntimeExports.jsx(Spin, {}),
-      clusterName && namespace && marketplacePanels?.items.map(({ spec }) => spec).sort().map(({ name, description, icon, type, pathToNav, typeName, apiGroup, apiVersion, tags, disabled }) => /* @__PURE__ */ jsxRuntimeExports.jsx(
+      namespace && marketplacePanels?.items.map(({ spec }) => spec).sort().map(({ name, description, icon, type, pathToNav, plural, apiGroup, apiVersion, tags, disabled }) => /* @__PURE__ */ jsxRuntimeExports.jsx(
         MarketplaceCard,
         {
           baseprefix,
@@ -51974,11 +51978,11 @@ const ProjectInfoCard = ({
           icon,
           isEditMode: false,
           name,
-          clusterName,
+          cluster,
           namespace,
           type,
           pathToNav,
-          typeName,
+          plural,
           apiGroup,
           apiVersion,
           tags,
@@ -51994,9 +51998,9 @@ const ProjectInfoCard = ({
         name: project.metadata.name,
         onClose: () => {
           setIsDeleteModalOpen(false);
-          navigate(`${baseprefix}/clusters/${clusterName}`);
+          navigate(`${baseprefix}/clusters/${cluster}`);
         },
-        endpoint: `/api/clusters/${clusterName}/k8s/apis/${baseProjectApiGroup}/${baseProjectVersion}/${projectResourceName}/${project.metadata.name}`
+        endpoint: `/api/clusters/${cluster}/k8s/apis/${baseProjectApiGroup}/${baseProjectVersion}/${projectPlural}/${project.metadata.name}`
       }
     )
   ] });
@@ -53539,14 +53543,14 @@ const Events = ({
   baseFactoryNamespacedBuiltinKey,
   baseFactoryClusterSceopedBuiltinKey,
   baseNamespaceFactoryKey,
-  baseNavigationPluralName,
-  baseNavigationSpecificName
+  baseNavigationPlural,
+  baseNavigationName
 }) => {
   const { token } = theme.useToken();
   const [kindIndex, setKindIndex] = useState();
   const [kindsWithVersion, setKindWithVersion] = useState();
   useEffect(() => {
-    getKinds({ clusterName: cluster }).then((data) => {
+    getKinds({ cluster }).then((data) => {
       setKindIndex(data);
       setKindWithVersion(getSortedKindsAll(data));
     }).catch((error) => {
@@ -53555,10 +53559,10 @@ const Events = ({
   }, [cluster]);
   const { data: navigationDataArr } = useK8sSmartResource({
     cluster,
-    group: "front.in-cloud.io",
-    version: "v1alpha1",
-    plural: baseNavigationPluralName,
-    fieldSelector: `metadata.name=${baseNavigationSpecificName}`
+    apiGroup: "front.in-cloud.io",
+    apiVersion: "v1alpha1",
+    plural: baseNavigationPlural,
+    fieldSelector: `metadata.name=${baseNavigationName}`
   });
   const [isPaused, setIsPaused] = useState(false);
   const pausedRef = useRef(isPaused);
@@ -53902,44 +53906,44 @@ const getBuiltinTreeData = (apis) => {
 };
 
 const filterIfApiInstanceNamespaceScoped = async ({
+  cluster,
   namespace,
-  data,
   apiGroup,
   apiVersion,
-  clusterName
+  data
 }) => {
   const payload = {
+    cluster,
     namespace,
-    data,
     apiGroup,
     apiVersion,
-    clusterName
+    data
   };
   const result = await axios.post(
-    `/api/clusters/${clusterName}/openapi-bff/scopes/filterScopes/filterIfApiNamespaceScoped`,
+    `/api/clusters/${cluster}/openapi-bff/scopes/filterScopes/filterIfApiNamespaceScoped`,
     payload
   );
   return result.data;
 };
 const filterIfBuiltInInstanceNamespaceScoped = async ({
+  cluster,
   namespace,
-  data,
-  clusterName
+  data
 }) => {
   const payload = {
+    cluster,
     namespace,
-    data,
-    clusterName
+    data
   };
   const result = await axios.post(
-    `/api/clusters/${clusterName}/openapi-bff/scopes/filterScopes/filterIfBuiltInNamespaceScoped`,
+    `/api/clusters/${cluster}/openapi-bff/scopes/filterScopes/filterIfBuiltInNamespaceScoped`,
     payload
   );
   return result.data;
 };
 
 const getGroupsByCategory = async ({
-  clusterName,
+  cluster,
   apiGroupListData,
   builtinResourceTypesData,
   namespace,
@@ -53951,7 +53955,7 @@ const getGroupsByCategory = async ({
   const filteredBuiltinData = await filterIfBuiltInInstanceNamespaceScoped({
     namespace,
     data: builtinResourceTypesData,
-    clusterName
+    cluster
   });
   return { crdGroups, nonCrdGroups, builtinGroups: filteredBuiltinData, apiExtensionVersion };
 };
@@ -54066,12 +54070,12 @@ const getClusterList = async () => {
 };
 
 const getApiResources = async ({
-  clusterName,
+  cluster,
   namespace,
   apiGroup,
   apiVersion,
-  typeName,
-  specificName,
+  plural,
+  name,
   labels,
   fields,
   limit
@@ -54088,27 +54092,27 @@ const getApiResources = async ({
   }
   const searchParams = params.toString();
   return axios.get(
-    `/api/clusters/${clusterName}/k8s/apis/${apiGroup}/${apiVersion}${namespace ? `/namespaces/${namespace}` : ""}/${typeName}${specificName ? `/${specificName}` : ""}${searchParams.length > 0 ? `?${searchParams}` : ""}`
+    `/api/clusters/${cluster}/k8s/apis/${apiGroup}/${apiVersion}${namespace ? `/namespaces/${namespace}` : ""}/${plural}${name ? `/${name}` : ""}${searchParams.length > 0 ? `?${searchParams}` : ""}`
   );
 };
 const getApiResourceSingle = async ({
-  clusterName,
+  cluster,
   namespace,
   apiGroup,
   apiVersion,
-  typeName,
-  entryName
+  plural,
+  name
 }) => {
   return axios.get(
-    `/api/clusters/${clusterName}/k8s/apis/${apiGroup}/${apiVersion}${namespace ? `/namespaces/${namespace}` : ""}/${typeName}/${entryName}`
+    `/api/clusters/${cluster}/k8s/apis/${apiGroup}/${apiVersion}${namespace ? `/namespaces/${namespace}` : ""}/${plural}/${name}`
   );
 };
 
 const getBuiltinResources = async ({
-  clusterName,
+  cluster,
   namespace,
-  typeName,
-  specificName,
+  plural,
+  name,
   labels,
   fields,
   limit
@@ -54125,105 +54129,101 @@ const getBuiltinResources = async ({
   }
   const searchParams = params.toString();
   return axios.get(
-    `/api/clusters/${clusterName}/k8s/api/v1${namespace ? `/namespaces/${namespace}` : ""}/${typeName}${specificName ? `/${specificName}` : ""}${searchParams.length > 0 ? `?${searchParams}` : ""}`
+    `/api/clusters/${cluster}/k8s/api/v1${namespace ? `/namespaces/${namespace}` : ""}/${plural}${name ? `/${name}` : ""}${searchParams.length > 0 ? `?${searchParams}` : ""}`
   );
 };
 const getBuiltinResourceSingle = async ({
-  clusterName,
+  cluster,
   namespace,
-  typeName,
-  entryName
+  plural,
+  name
 }) => {
   return axios.get(
-    `/api/clusters/${clusterName}/k8s/api/v1${namespace ? `/namespaces/${namespace}` : ""}/${typeName}/${entryName}`
+    `/api/clusters/${cluster}/k8s/api/v1${namespace ? `/namespaces/${namespace}` : ""}/${plural}/${name}`
   );
 };
 
 const getCrdResources = async ({
-  clusterName,
+  cluster,
   namespace,
   apiGroup,
   apiVersion,
   crdName
 }) => {
   return axios.get(
-    `/api/clusters/${clusterName}/k8s/apis/${apiGroup}/${apiVersion}${namespace ? `/namespaces/${namespace}` : ""}/${crdName}`
+    `/api/clusters/${cluster}/k8s/apis/${apiGroup}/${apiVersion}${namespace ? `/namespaces/${namespace}` : ""}/${crdName}`
   );
 };
 const getCrdResourceSingle = async ({
-  clusterName,
+  cluster,
   namespace,
   apiGroup,
   apiVersion,
   crdName,
-  entryName
+  name
 }) => {
   return axios.get(
-    `/api/clusters/${clusterName}/k8s/apis/${apiGroup}/${apiVersion}${namespace ? `/namespaces/${namespace}` : ""}/${crdName}/${entryName}`
+    `/api/clusters/${cluster}/k8s/apis/${apiGroup}/${apiVersion}${namespace ? `/namespaces/${namespace}` : ""}/${crdName}/${name}`
   );
 };
 
-const getApiResourceTypes = async ({ clusterName }) => {
-  return axios.get(`/api/clusters/${clusterName}/k8s/apis/`);
+const getApiResourceTypes = async ({ cluster }) => {
+  return axios.get(`/api/clusters/${cluster}/k8s/apis/`);
 };
 const getApiResourceTypesByApiGroup = async ({
-  clusterName,
+  cluster,
   apiGroup,
   apiVersion
 }) => {
-  return axios.get(`/api/clusters/${clusterName}/k8s/apis/${apiGroup}/${apiVersion}/`);
+  return axios.get(`/api/clusters/${cluster}/k8s/apis/${apiGroup}/${apiVersion}/`);
 };
 
-const getBuiltinResourceTypes = async ({
-  clusterName
-}) => {
-  return axios.get(`/api/clusters/${clusterName}/k8s/api/v1`);
+const getBuiltinResourceTypes = async ({ cluster }) => {
+  return axios.get(`/api/clusters/${cluster}/k8s/api/v1`);
 };
 
 const getCrdData = async ({
-  clusterName,
+  cluster,
   apiExtensionVersion,
   crdName
 }) => {
   return axios.get(
-    `/api/clusters/${clusterName}/k8s/apis/apiextensions.k8s.io/${apiExtensionVersion}/customresourcedefinitions/${crdName}`
+    `/api/clusters/${cluster}/k8s/apis/apiextensions.k8s.io/${apiExtensionVersion}/customresourcedefinitions/${crdName}`
   );
 };
 
-const getSwagger = async ({
-  clusterName
-}) => {
-  return axios.get(`/api/clusters/${clusterName}/openapi-bff/swagger/swagger/${clusterName}`);
+const getSwagger = async ({ cluster }) => {
+  return axios.get(`/api/clusters/${cluster}/openapi-bff/swagger/swagger/${cluster}`);
 };
 
 const checkIfApiInstanceNamespaceScoped = async ({
-  typeName,
+  plural,
   apiGroup,
   apiVersion,
-  clusterName
+  cluster
 }) => {
   const payload = {
-    typeName,
+    plural,
     apiGroup,
     apiVersion,
-    clusterName
+    cluster
   };
   const { data } = await axios.post(
-    `/api/clusters/${clusterName}/openapi-bff/scopes/checkScopes/checkIfApiNamespaceScoped`,
+    `/api/clusters/${cluster}/openapi-bff/scopes/checkScopes/checkIfApiNamespaceScoped`,
     payload
   );
   return data;
 };
 const checkIfBuiltInInstanceNamespaceScoped = async ({
-  typeName,
-  clusterName
+  plural,
+  cluster
 }) => {
   const payload = {
-    typeName,
-    clusterName
+    plural,
+    cluster
   };
   const { data } = await axios.post(
-    `/api/clusters/${clusterName}/openapi-bff/scopes/checkScopes/checkIfBuiltInNamespaceScoped`,
+    `/api/clusters/${cluster}/openapi-bff/scopes/checkScopes/checkIfBuiltInNamespaceScoped`,
     payload
   );
   return data;
@@ -54238,12 +54238,12 @@ const useClusterList = ({ refetchInterval }) => {
 };
 
 const useApiResources = ({
-  clusterName,
+  cluster,
   namespace,
   apiGroup,
   apiVersion,
-  typeName,
-  specificName,
+  plural,
+  name,
   labels,
   fields,
   limit,
@@ -54251,26 +54251,15 @@ const useApiResources = ({
   isEnabled
 }) => {
   return useQuery({
-    queryKey: [
-      "useApiResources",
-      clusterName,
-      namespace,
-      apiGroup,
-      apiVersion,
-      typeName,
-      specificName,
-      labels,
-      fields,
-      limit
-    ],
+    queryKey: ["useApiResources", cluster, namespace, apiGroup, apiVersion, plural, name, labels, fields, limit],
     queryFn: async () => {
       const response = await getApiResources({
-        clusterName,
+        cluster,
         namespace,
         apiGroup,
         apiVersion,
-        typeName,
-        specificName,
+        plural,
+        name,
         labels,
         fields,
         limit
@@ -54286,33 +54275,33 @@ const useApiResources = ({
   });
 };
 const useApiResourceSingle = ({
-  clusterName,
+  cluster,
   namespace,
   apiGroup,
   apiVersion,
-  typeName,
-  entryName,
+  plural,
+  name,
   refetchInterval
 }) => {
   return useQuery({
-    queryKey: ["useApiResourceSingle", clusterName, namespace, apiGroup, apiVersion, typeName, entryName],
+    queryKey: ["useApiResourceSingle", cluster, namespace, apiGroup, apiVersion, plural, name],
     queryFn: async () => (await getApiResourceSingle({
-      clusterName,
+      cluster,
       namespace,
       apiGroup,
       apiVersion,
-      typeName,
-      entryName
+      plural,
+      name
     })).data,
     refetchInterval: refetchInterval !== void 0 ? refetchInterval : 5e3
   });
 };
 
 const useBuiltinResources = ({
-  clusterName,
+  cluster,
   namespace,
-  typeName,
-  specificName,
+  plural,
+  name,
   labels,
   fields,
   limit,
@@ -54320,13 +54309,13 @@ const useBuiltinResources = ({
   isEnabled
 }) => {
   return useQuery({
-    queryKey: ["useBuiltinResourceType", clusterName, namespace, typeName, specificName, labels, fields, limit],
+    queryKey: ["useBuiltinResourceType", cluster, namespace, plural, name, labels, fields, limit],
     queryFn: async () => {
       const response = await getBuiltinResources({
-        clusterName,
+        cluster,
         namespace,
-        typeName,
-        specificName,
+        plural,
+        name,
         labels,
         fields,
         limit
@@ -54342,21 +54331,21 @@ const useBuiltinResources = ({
   });
 };
 const useBuiltinResourceSingle = ({
-  clusterName,
+  cluster,
   namespace,
-  typeName,
-  entryName,
+  plural,
+  name,
   refetchInterval
 }) => {
   return useQuery({
-    queryKey: ["useBuiltinResourceSingle", clusterName, namespace, typeName, entryName],
-    queryFn: async () => (await getBuiltinResourceSingle({ clusterName, namespace, typeName, entryName })).data,
+    queryKey: ["useBuiltinResourceSingle", cluster, namespace, plural, name],
+    queryFn: async () => (await getBuiltinResourceSingle({ cluster, namespace, plural, name })).data,
     refetchInterval: refetchInterval !== void 0 ? refetchInterval : 5e3
   });
 };
 
 const useCrdResources = ({
-  clusterName,
+  cluster,
   namespace,
   apiGroup,
   apiVersion,
@@ -54365,10 +54354,10 @@ const useCrdResources = ({
   isEnabled
 }) => {
   return useQuery({
-    queryKey: ["useCrdResources", clusterName, namespace, apiGroup, apiVersion, crdName],
+    queryKey: ["useCrdResources", cluster, namespace, apiGroup, apiVersion, crdName],
     queryFn: async () => {
       const response = await getCrdResources({
-        clusterName,
+        cluster,
         namespace,
         apiGroup,
         apiVersion,
@@ -54385,33 +54374,33 @@ const useCrdResources = ({
   });
 };
 const useCrdResourceSingle = ({
-  clusterName,
+  cluster,
   namespace,
   apiGroup,
   apiVersion,
   crdName,
-  entryName,
+  name,
   refetchInterval
 }) => {
   return useQuery({
-    queryKey: ["useCrdResourceSingle", clusterName, namespace, apiGroup, apiVersion, crdName, entryName],
+    queryKey: ["useCrdResourceSingle", cluster, namespace, apiGroup, apiVersion, crdName, name],
     queryFn: async () => (await getCrdResourceSingle({
-      clusterName,
+      cluster,
       namespace,
       apiGroup,
       apiVersion,
       crdName,
-      entryName
+      name
     })).data,
     refetchInterval: refetchInterval !== void 0 ? refetchInterval : 5e3
   });
 };
 
-const useApisResourceTypes = ({ clusterName }) => {
+const useApisResourceTypes = ({ cluster }) => {
   return useQuery({
-    queryKey: ["useApisResourceTypes", clusterName],
+    queryKey: ["useApisResourceTypes", cluster],
     queryFn: async () => {
-      const response = await getApiResourceTypes({ clusterName });
+      const response = await getApiResourceTypes({ cluster });
       const data = JSON.parse(JSON.stringify(response.data));
       if (data.metadata?.resourceVersion) {
         delete data.metadata.resourceVersion;
@@ -54422,15 +54411,15 @@ const useApisResourceTypes = ({ clusterName }) => {
   });
 };
 const useApiResourceTypesByGroup = ({
-  clusterName,
+  cluster,
   apiGroup,
   apiVersion
 }) => {
   return useQuery({
-    queryKey: ["useApiResourceTypesByGroup", clusterName, apiGroup, apiVersion],
+    queryKey: ["useApiResourceTypesByGroup", cluster, apiGroup, apiVersion],
     queryFn: async () => {
       const response = await getApiResourceTypesByApiGroup({
-        clusterName,
+        cluster,
         apiGroup,
         apiVersion
       });
@@ -54444,11 +54433,11 @@ const useApiResourceTypesByGroup = ({
   });
 };
 
-const useBuiltinResourceTypes = ({ clusterName }) => {
+const useBuiltinResourceTypes = ({ cluster }) => {
   return useQuery({
-    queryKey: ["useBuiltinResourceTypes", clusterName],
+    queryKey: ["useBuiltinResourceTypes", cluster],
     queryFn: async () => {
-      const response = await getBuiltinResourceTypes({ clusterName });
+      const response = await getBuiltinResourceTypes({ cluster });
       const data = JSON.parse(JSON.stringify(response.data));
       if (data.metadata?.resourceVersion) {
         delete data.metadata.resourceVersion;
@@ -54460,15 +54449,15 @@ const useBuiltinResourceTypes = ({ clusterName }) => {
 };
 
 const useCrdData = ({
-  clusterName,
+  cluster,
   apiExtensionVersion,
   crdName
 }) => {
   return useQuery({
-    queryKey: ["useCrdData", clusterName, apiExtensionVersion, crdName],
+    queryKey: ["useCrdData", cluster, apiExtensionVersion, crdName],
     queryFn: async () => {
       const response = await getCrdData({
-        clusterName,
+        cluster,
         apiExtensionVersion,
         crdName
       });