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

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

@@ -7891,6 +7891,13 @@
         "Content-Type": "application/json-patch+json"
       }
     };
+    const addOp = [
+      {
+        op: "add",
+        path: pathToValue,
+        value: body
+      }
+    ];
     const replaceOp = [
       {
         op: "replace",
@@ -7899,24 +7906,11 @@
       }
     ];
     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,
@@ -9182,23 +9176,23 @@
     };
   };
 
-  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();
@@ -9209,8 +9203,8 @@
   };
   const useK8sSmartResource = ({
     cluster,
-    group,
-    version,
+    apiGroup,
+    apiVersion,
     plural,
     namespace,
     fieldSelector,
@@ -9228,15 +9222,15 @@
       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,
@@ -9256,8 +9250,8 @@
       queryKey: [
         "k8s-list",
         cluster,
-        group || "",
-        version,
+        apiGroup || "",
+        apiVersion,
         namespace || "",
         plural,
         fieldSelector || "",
@@ -9278,8 +9272,8 @@
       isEnabled: watchEnabled,
       pageSize: limit,
       query: {
-        apiGroup: group,
-        apiVersion: version,
+        apiGroup,
+        apiVersion,
         plural,
         namespace,
         fieldSelector,
@@ -9378,9 +9372,9 @@
       isError: rawDataError,
       isLoading: rawDataLoading
     } = useK8sSmartResource({
-      cluster: cluster || "",
-      group: apiGroup,
-      version: apiVersion,
+      cluster,
+      apiGroup,
+      apiVersion,
       plural,
       isEnabled
     });
@@ -9590,8 +9584,8 @@
       isLoading: rawDataLoading
     } = useK8sSmartResource({
       cluster,
-      group: apiGroup,
-      version: apiVersion,
+      apiGroup,
+      apiVersion,
       plural,
       isEnabled
     });
@@ -34218,21 +34212,15 @@
     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 })
     );
@@ -34242,7 +34230,7 @@
         /* @__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 = ({
@@ -34250,21 +34238,22 @@
     // 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 = ({
@@ -34392,7 +34381,7 @@
   };
 
   const checkPermission = async ({
-    clusterName,
+    cluster,
     body
   }) => {
     const data = JSON.stringify({
@@ -34400,15 +34389,15 @@
       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"
@@ -34417,23 +34406,23 @@
   };
 
   const usePermissions = ({
-    clusterName,
+    cluster,
     namespace,
-    group,
-    resource,
+    apiGroup,
+    plural,
     verb,
     name,
     refetchInterval,
     enabler
   }) => {
     return reactQuery.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,
@@ -34450,7 +34439,7 @@
     baseprefix,
     namespace,
     syntheticProject,
-    typeName,
+    plural,
     inside,
     fullPath
   }) => {
@@ -34459,7 +34448,7 @@
     const backlink = getBackLinkToTable({
       fullPath
     });
-    return `${mainRoute}/forms/builtin/v1/${typeName}?backlink=${backlink}`;
+    return `${mainRoute}/forms/builtin/v1/${plural}?backlink=${backlink}`;
   };
   const getLinkToApiForm = ({
     cluster,
@@ -34468,7 +34457,7 @@
     syntheticProject,
     apiGroup,
     apiVersion,
-    typeName,
+    plural,
     inside,
     fullPath
   }) => {
@@ -34477,7 +34466,7 @@
     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,
@@ -34524,7 +34513,7 @@
       fetchUrl,
       k8sResourceToFetch,
       pathToItems,
-      clusterNamePartOfUrl,
+      cluster,
       labelSelector,
       labelSelectorFull,
       fieldSelector,
@@ -34540,36 +34529,33 @@
       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;
@@ -34616,10 +34602,10 @@
       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,
@@ -34670,7 +34656,7 @@
         EnrichedTableProvider,
         {
           tableMappingsReplaceValues: replaceValues,
-          cluster: clusterName,
+          cluster: clusterPrepared,
           namespace: namespacePrepared,
           theme,
           dataItems: items,
@@ -34704,13 +34690,13 @@
             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);
@@ -34791,7 +34777,7 @@
     } = 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
@@ -34910,7 +34896,7 @@
     } = 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
@@ -34996,7 +34982,7 @@
       type,
       apiGroup,
       apiVersion,
-      typeName,
+      plural,
       forcedKind,
       prefillValuesRequestIndex,
       pathToData,
@@ -35024,7 +35010,7 @@
     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 });
@@ -35042,7 +35028,7 @@
           isCreate: false,
           type,
           apiGroupApiVersion: type === "builtin" ? "api/v1" : `${apiGroupPrepared}/${apiVersionPrepared}`,
-          typeName: typeNamePrepared,
+          plural: pluralPrepared,
           designNewLayout: true,
           designNewLayoutHeight: height,
           openNotification: true,
@@ -38029,7 +38015,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       id,
       baseprefix,
-      clusterNamePartOfUrl,
+      cluster,
       wsUrl,
       pageSize,
       substractHeight,
@@ -38042,8 +38028,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       baseFactoryNamespacedBuiltinKey,
       baseFactoryClusterSceopedBuiltinKey,
       baseNamespaceFactoryKey,
-      baseNavigationPluralName,
-      baseNavigationSpecificName,
+      baseNavigationPlural,
+      baseNavigationName,
       ...props
     } = data;
     const theme = useTheme();
@@ -38052,10 +38038,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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) {
@@ -38099,7 +38082,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         {
           theme,
           baseprefix,
-          cluster: clusterName,
+          cluster: clusterPrepared,
           wsUrl: wsUrlWithParams,
           pageSize,
           substractHeight: substractHeight || 340,
@@ -38108,8 +38091,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           baseFactoryNamespacedBuiltinKey,
           baseFactoryClusterSceopedBuiltinKey,
           baseNamespaceFactoryKey,
-          baseNavigationPluralName,
-          baseNavigationSpecificName,
+          baseNavigationPlural,
+          baseNavigationName,
           ...props
         }
       ),
@@ -38117,8 +38100,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     ] });
   };
 
-  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;
   };
 
@@ -38315,14 +38298,14 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     baseFactoryClusterSceopedAPIKey,
     baseFactoryNamespacedBuiltinKey,
     baseFactoryClusterSceopedBuiltinKey,
-    baseNavigationPluralName,
-    baseNavigationSpecificName,
+    baseNavigationPlural,
+    baseNavigationName,
     listFlexProps
   }) => {
     const [kindIndex, setKindIndex] = K.useState();
     const [kindsWithVersion, setKindWithVersion] = K.useState();
     K.useEffect(() => {
-      getKinds({ clusterName: cluster }).then((data) => {
+      getKinds({ cluster }).then((data) => {
         setKindIndex(data);
         setKindWithVersion(getSortedKindsAll(data));
       }).catch((error) => {
@@ -38331,10 +38314,10 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     }, [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;
@@ -38384,7 +38367,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       id,
       baseprefix,
-      clusterNamePartOfUrl,
+      cluster,
       reqIndex,
       errorText,
       notArrayErrorText,
@@ -38395,13 +38378,14 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       keysToForcedLabel,
       forcedRelatedValuePath,
       jsonPathToArrayOfRefs,
+      forcedApiVersion,
       forcedNamespace,
       baseFactoryNamespacedAPIKey,
       baseFactoryClusterSceopedAPIKey,
       baseFactoryNamespacedBuiltinKey,
       baseFactoryClusterSceopedBuiltinKey,
-      baseNavigationPluralName,
-      baseNavigationSpecificName,
+      baseNavigationPlural,
+      baseNavigationName,
       ...props
     } = data;
     const theme = useTheme();
@@ -38410,10 +38394,17 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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
@@ -38422,17 +38413,24 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     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" });
     }
@@ -38442,7 +38440,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         {
           theme,
           baseprefix,
-          cluster: clusterName,
+          cluster: clusterPrepared,
           refsArr: guardedRefsArr,
           keysToForcedLabel,
           forcedRelatedValuePath,
@@ -38453,8 +38451,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           baseFactoryClusterSceopedAPIKey,
           baseFactoryNamespacedBuiltinKey,
           baseFactoryClusterSceopedBuiltinKey,
-          baseNavigationPluralName,
-          baseNavigationSpecificName,
+          baseNavigationPlural,
+          baseNavigationName,
           listFlexProps,
           ...props
         }
@@ -38778,7 +38776,15 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     );
   };
 
-  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 = reactRouterDom.useLocation();
     const { urlsToFetch, dataToApplyToContext, theme, nodeTerminalDefaultProfile, disableEventBubbling } = props;
@@ -38850,6 +38856,9 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   }) => {
     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 });
       }
@@ -38887,9 +38896,6 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         }
         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" });
@@ -39070,13 +39076,13 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
                     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}`
                       );
                     }
                   }
@@ -39177,8 +39183,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
                 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}`
                   }))
                 );
               }
@@ -39279,8 +39285,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
               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,
@@ -39362,8 +39368,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
               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,
@@ -39408,18 +39414,18 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     const [isLoading, setIsLoading] = K.useState(false);
     const [isError, setIsError] = K.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
     });
@@ -39427,7 +39433,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       setIsError(void 0);
       setIsLoading(true);
       const payload = {
-        clusterName: cluster,
+        cluster,
         customizationId,
         tableMappingsReplaceValues,
         forceDefaultAdditionalPrinterColumns,
@@ -39470,7 +39476,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         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,
@@ -47047,7 +47053,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     isCreate,
     type,
     apiGroupApiVersion,
-    typeName,
+    plural,
     backlink,
     designNewLayout,
     designNewLayoutHeight,
@@ -47113,7 +47119,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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);
@@ -47946,7 +47952,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     const onValuesChangeCallBack = useOnValuesChangeCallback();
     const isTouchedPeristed = useIsTouchedPersisted();
     const updateTouched = useUpdateIsTouchedPersisted();
-    const { clusterName, namespace, syntheticProject, entryName } = urlParams;
+    const { cluster, namespace, syntheticProject, name: entryName } = urlParams;
     const form = antd.Form.useFormInstance();
     const fieldValue = antd.Form.useWatch(name === "nodeName" ? "nodeNameBecauseOfSuddenBug" : name, form);
     const fixedName = name === "nodeName" ? "nodeNameBecauseOfSuddenBug" : name;
@@ -47999,7 +48005,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     }, [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,
@@ -48297,47 +48303,47 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     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,
@@ -50179,8 +50185,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     isCreate,
     type,
     apiGroupApiVersion,
-    kindName,
-    typeName,
+    kind,
+    plural,
     backlink,
     designNewLayout,
     designNewLayoutHeight
@@ -50215,8 +50221,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     const yamlToValuesAbortRef = K.useRef(null);
     const isAnyFieldFocusedRef = K.useRef(false);
     const editorUri = K.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]
     );
     K.useEffect(() => {
       valuesToYamlReqId.current++;
@@ -50234,19 +50240,19 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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
@@ -50276,7 +50282,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           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);
@@ -50334,7 +50340,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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 }) => {
@@ -50354,7 +50360,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       }
       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 = K.useMemo(() => {
       const templates = [];
       if (formsPrefills?.spec?.values?.length) {
@@ -50725,7 +50731,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         return true;
       });
       setExpandedKeys([...uniqueKeys]);
-    }, [apiGroupApiVersion, formsPrefills, prefillValuesSchema, type, typeName]);
+    }, [apiGroupApiVersion, formsPrefills, prefillValuesSchema, type, plural]);
     K.useEffect(() => {
       if (!initialValues) return;
       setProperties((prev) => {
@@ -50984,7 +50990,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       setIsLoading(true);
       const payload = {
         data,
-        clusterName: cluster,
+        cluster,
         customizationId
       };
       axios.post(`/api/clusters/${cluster}/openapi-bff/forms/formPrepare/prepareFormProps`, payload).then(({ data: data2 }) => {
@@ -51003,10 +51009,11 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
             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);
@@ -51028,7 +51035,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           type: data.type,
           isNameSpaced: isNamespaced,
           apiGroupApiVersion: data.type === "builtin" ? "api/v1" : `${data.apiGroup}/${data.apiVersion}`,
-          typeName: data.typeName,
+          plural: data.plural,
           backlink,
           designNewLayout,
           designNewLayoutHeight
@@ -51064,8 +51071,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         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
@@ -51156,11 +51163,11 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   }
 
   const AddEditFormModal = ({
-    clusterName,
+    cluster,
     baseApiGroup,
     baseApiVersion,
-    mpResourceName,
-    mpResourceKind,
+    marketplacePlural,
+    marketplaceKind,
     isOpen,
     setIsOpen,
     setError,
@@ -51176,7 +51183,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       type: "direct",
       apiGroup: "",
       apiVersion: "",
-      typeName: "",
+      plural: "",
       pathToNav: "",
       tags: [],
       disabled: false,
@@ -51185,10 +51192,10 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     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()
             },
@@ -51205,10 +51212,10 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         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
@@ -51254,7 +51261,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           ) }),
           /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Form.Item, { label: "Enter API group", name: "apiGroup", children: /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Input, { disabled: type === "direct" || type === "built-in" }) }),
           /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Form.Item, { label: "Enter API version", name: "apiVersion", children: /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Input, { disabled: type === "direct" }) }),
-          /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Form.Item, { label: "Enter resource type", name: "typeName", children: /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Input, { disabled: type === "direct" }) }),
+          /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Form.Item, { label: "Enter resource type", name: "plural", children: /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Input, { disabled: type === "direct" }) }),
           /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Form.Item, { label: "Enter path", name: "pathToNav", children: /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Input, { disabled: type !== "direct" }) }),
           /* @__PURE__ */ jsxRuntimeExports.jsx(antd.Form.Item, { label: "Tags", name: "tags", children: /* @__PURE__ */ jsxRuntimeExports.jsx(
             antd.Select,
@@ -51273,11 +51280,11 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   };
 
   const getPathToNav = ({
-    clusterName,
+    cluster,
     namespace,
     type,
     pathToNav,
-    typeName,
+    plural,
     apiGroup,
     apiVersion,
     baseprefix
@@ -51287,19 +51294,19 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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
@@ -51308,12 +51315,12 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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(antd.Card)`
@@ -51403,11 +51410,11 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     description,
     name,
     icon,
-    clusterName,
+    cluster,
     namespace,
     type,
     pathToNav,
-    typeName,
+    plural,
     apiGroup,
     apiVersion,
     tags,
@@ -51429,29 +51436,29 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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")
     });
@@ -51562,12 +51569,12 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   };
 
   const MarketPlace = ({
-    clusterName,
+    cluster,
     namespace,
     baseApiGroup,
     baseApiVersion,
-    mpResourceName,
-    mpResourceKind,
+    marketplacePlural,
+    marketplaceKind,
     baseprefix,
     standalone,
     forceAddedMode,
@@ -51588,30 +51595,29 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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
     });
@@ -51698,8 +51704,8 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         }
       ),
       /* @__PURE__ */ jsxRuntimeExports.jsxs(antd.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,
@@ -51708,11 +51714,11 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
               icon,
               isEditMode,
               name,
-              clusterName,
+              cluster,
               namespace,
               type,
               pathToNav,
-              typeName,
+              plural,
               apiGroup,
               apiVersion,
               tags,
@@ -51742,11 +51748,11 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       isAddEditOpen && /* @__PURE__ */ jsxRuntimeExports.jsx(
         AddEditFormModal,
         {
-          clusterName,
+          cluster,
           baseApiGroup,
           baseApiVersion,
-          mpResourceName,
-          mpResourceKind,
+          marketplacePlural,
+          marketplaceKind,
           isOpen: isAddEditOpen,
           setError: setCreateUpdateError,
           setIsOpen: setIsAddEditOpen,
@@ -51759,7 +51765,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         {
           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}`
         }
       )
     ] });
@@ -51878,14 +51884,14 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     ActionMenuPlaceholder};
 
   const ProjectInfoCard = ({
-    clusterName,
+    cluster,
     namespace,
     baseApiGroup,
     baseApiVersion,
     baseProjectApiGroup,
     baseProjectVersion,
-    mpResourceName,
-    projectResourceName,
+    marketplacePlural,
+    projectPlural,
     baseprefix,
     accessGroups,
     showZeroResources,
@@ -51897,45 +51903,43 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       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] = K.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 = K.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(antd.Spin, {});
     }
@@ -51964,7 +51968,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
       /* @__PURE__ */ jsxRuntimeExports.jsx(Spacer$1, { $space: 12, $samespace: true }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs(antd.Flex, { gap: 22, wrap: true, children: [
         marketplaceIsLoading && /* @__PURE__ */ jsxRuntimeExports.jsx(antd.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,
@@ -51973,11 +51977,11 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
             icon,
             isEditMode: false,
             name,
-            clusterName,
+            cluster,
             namespace,
             type,
             pathToNav,
-            typeName,
+            plural,
             apiGroup,
             apiVersion,
             tags,
@@ -51993,9 +51997,9 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           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}`
         }
       )
     ] });
@@ -53538,14 +53542,14 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     baseFactoryNamespacedBuiltinKey,
     baseFactoryClusterSceopedBuiltinKey,
     baseNamespaceFactoryKey,
-    baseNavigationPluralName,
-    baseNavigationSpecificName
+    baseNavigationPlural,
+    baseNavigationName
   }) => {
     const { token } = antd.theme.useToken();
     const [kindIndex, setKindIndex] = K.useState();
     const [kindsWithVersion, setKindWithVersion] = K.useState();
     K.useEffect(() => {
-      getKinds({ clusterName: cluster }).then((data) => {
+      getKinds({ cluster }).then((data) => {
         setKindIndex(data);
         setKindWithVersion(getSortedKindsAll(data));
       }).catch((error) => {
@@ -53554,10 +53558,10 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     }, [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] = K.useState(false);
     const pausedRef = K.useRef(isPaused);
@@ -53901,44 +53905,44 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   };
 
   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,
@@ -53950,7 +53954,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     const filteredBuiltinData = await filterIfBuiltInInstanceNamespaceScoped({
       namespace,
       data: builtinResourceTypesData,
-      clusterName
+      cluster
     });
     return { crdGroups, nonCrdGroups, builtinGroups: filteredBuiltinData, apiExtensionVersion };
   };
@@ -54065,12 +54069,12 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   };
 
   const getApiResources = async ({
-    clusterName,
+    cluster,
     namespace,
     apiGroup,
     apiVersion,
-    typeName,
-    specificName,
+    plural,
+    name,
     labels,
     fields,
     limit
@@ -54087,27 +54091,27 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     }
     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
@@ -54124,105 +54128,101 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     }
     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;
@@ -54237,12 +54237,12 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   };
 
   const useApiResources = ({
-    clusterName,
+    cluster,
     namespace,
     apiGroup,
     apiVersion,
-    typeName,
-    specificName,
+    plural,
+    name,
     labels,
     fields,
     limit,
@@ -54250,26 +54250,15 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     isEnabled
   }) => {
     return reactQuery.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
@@ -54285,33 +54274,33 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     });
   };
   const useApiResourceSingle = ({
-    clusterName,
+    cluster,
     namespace,
     apiGroup,
     apiVersion,
-    typeName,
-    entryName,
+    plural,
+    name,
     refetchInterval
   }) => {
     return reactQuery.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,
@@ -54319,13 +54308,13 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     isEnabled
   }) => {
     return reactQuery.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
@@ -54341,21 +54330,21 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     });
   };
   const useBuiltinResourceSingle = ({
-    clusterName,
+    cluster,
     namespace,
-    typeName,
-    entryName,
+    plural,
+    name,
     refetchInterval
   }) => {
     return reactQuery.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,
@@ -54364,10 +54353,10 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     isEnabled
   }) => {
     return reactQuery.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,
@@ -54384,33 +54373,33 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     });
   };
   const useCrdResourceSingle = ({
-    clusterName,
+    cluster,
     namespace,
     apiGroup,
     apiVersion,
     crdName,
-    entryName,
+    name,
     refetchInterval
   }) => {
     return reactQuery.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 reactQuery.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;
@@ -54421,15 +54410,15 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     });
   };
   const useApiResourceTypesByGroup = ({
-    clusterName,
+    cluster,
     apiGroup,
     apiVersion
   }) => {
     return reactQuery.useQuery({
-      queryKey: ["useApiResourceTypesByGroup", clusterName, apiGroup, apiVersion],
+      queryKey: ["useApiResourceTypesByGroup", cluster, apiGroup, apiVersion],
       queryFn: async () => {
         const response = await getApiResourceTypesByApiGroup({
-          clusterName,
+          cluster,
           apiGroup,
           apiVersion
         });
@@ -54443,11 +54432,11 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     });
   };
 
-  const useBuiltinResourceTypes = ({ clusterName }) => {
+  const useBuiltinResourceTypes = ({ cluster }) => {
     return reactQuery.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;
@@ -54459,15 +54448,15 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
   };
 
   const useCrdData = ({
-    clusterName,
+    cluster,
     apiExtensionVersion,
     crdName
   }) => {
     return reactQuery.useQuery({
-      queryKey: ["useCrdData", clusterName, apiExtensionVersion, crdName],
+      queryKey: ["useCrdData", cluster, apiExtensionVersion, crdName],
       queryFn: async () => {
         const response = await getCrdData({
-          clusterName,
+          cluster,
           apiExtensionVersion,
           crdName
         });