@prorobotech/openapi-k8s-toolkit 1.2.0-alpha.7 → 1.2.0-alpha.8

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

@@ -47071,9 +47071,9 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
     }
     return columns.map((el, colIndex) => {
       const possibleAdditionalPrinterColumnsCustomSortersAndFiltersType = additionalPrinterColumnsCustomSortersAndFilters?.find(({ key }) => key === el.key)?.type;
-      const isSortersAndFitlersDisabled = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "disabled";
-      const isSortersAndFitlersCPU = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "cpu";
-      const isSortersAndFitlersMemory = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "memory";
+      const isSortersAndFiltersDisabled = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "disabled";
+      const isSortersAndFiltersCPU = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "cpu";
+      const isSortersAndFiltersMemory = possibleAdditionalPrinterColumnsCustomSortersAndFiltersType === "memory";
       const possibleUndefinedValue = additionalPrinterColumnsUndefinedValues?.find(({ key }) => key === el.key)?.value;
       const possibleTrimLength = additionalPrinterColumnsTrimLengths?.find(({ key }) => key === el.key)?.value;
       const possibleColWidth = additionalPrinterColumnsColWidths?.find(({ key }) => key === el.key)?.value;
@@ -47087,36 +47087,25 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
         if (!cell) return "";
         return (cell.innerText || cell.textContent || "").trim().toLowerCase();
       };
-      const getEntry = (record) => {
-        const { dataIndex } = el;
-        return Array.isArray(dataIndex) ? lodashExports.get(record, dataIndex) : record[dataIndex];
-      };
-      const getTextForNumericUnitSort = (record) => {
-        if (useFactorySearch) {
-          const textFromDom = getCellTextFromDOM(record);
-          if (textFromDom) return textFromDom;
-        }
-        const raw = getEntry(record);
-        if (raw == null) return null;
-        return String(raw);
-      };
       const getMemoryInBytes = (record) => {
-        const text = getTextForNumericUnitSort(record);
-        if (!text) return NaN;
+        const text = getCellTextFromDOM(record);
+        if (!text) return 0;
         const parsed = parseValueWithUnit(text);
-        if (!parsed) return NaN;
+        if (!parsed) return 0;
         if (parsed.unit) {
-          return toBytes(parsed.value, parsed.unit);
+          const bytes = toBytes(parsed.value, parsed.unit);
+          return bytes >= 0 ? bytes : 0;
         }
         return parsed.value;
       };
       const getCpuInCores = (record) => {
-        const text = getTextForNumericUnitSort(record);
-        if (!text) return NaN;
+        const text = getCellTextFromDOM(record);
+        if (!text) return 0;
         const parsed = parseCoresWithUnit(text);
-        if (!parsed) return NaN;
+        if (!parsed) return 0;
         if (parsed.unit) {
-          return toCores(parsed.value, parsed.unit);
+          const cores = toCores(parsed.value, parsed.unit);
+          return cores >= 0 ? cores : 0;
         }
         return parsed.value;
       };
@@ -47148,7 +47137,7 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           };
         },
         filterDropdown: ({ setSelectedKeys, selectedKeys, confirm, clearFilters, close }) => {
-          if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+          if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
             return null;
           }
           return /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -47163,13 +47152,13 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           );
         },
         filterIcon: (filtered) => {
-          if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+          if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
             return null;
           }
           return /* @__PURE__ */ jsxRuntimeExports.jsx(icons.SearchOutlined, { style: { color: filtered ? "#1677ff" : void 0 } });
         },
         onFilter: (value, record) => {
-          if (isSortersAndFitlersDisabled || isSortersAndFitlersMemory || isSortersAndFitlersCPU) {
+          if (isSortersAndFiltersDisabled || isSortersAndFiltersMemory || isSortersAndFiltersCPU) {
             return false;
           }
           if (useFactorySearch) {
@@ -47196,22 +47185,22 @@ if (_IS_WORKLET) registerPaint("spoiler", SpoilerPainterWorklet);
           }
           return false;
         },
-        sorter: isSortersAndFitlersDisabled ? false : (a, b) => {
-          if (useFactorySearch) {
-            const aText = getCellTextFromDOM(a);
-            const bText = getCellTextFromDOM(b);
-            return aText.localeCompare(bText);
-          }
-          if (isSortersAndFitlersMemory) {
+        sorter: isSortersAndFiltersDisabled ? false : (a, b) => {
+          if (isSortersAndFiltersMemory) {
             const aBytes = getMemoryInBytes(a);
             const bBytes = getMemoryInBytes(b);
             return safeNumericCompare(aBytes, bBytes);
           }
-          if (isSortersAndFitlersCPU) {
+          if (isSortersAndFiltersCPU) {
             const aCores = getCpuInCores(a);
             const bCores = getCpuInCores(b);
             return safeNumericCompare(aCores, bCores);
           }
+          if (useFactorySearch) {
+            const aText = getCellTextFromDOM(a);
+            const bText = getCellTextFromDOM(b);
+            return aText.localeCompare(bText);
+          }
           const { dataIndex } = el;
           const aEntry = Array.isArray(dataIndex) ? lodashExports.get(a, dataIndex) : a[dataIndex];
           const bEntry = Array.isArray(dataIndex) ? lodashExports.get(b, dataIndex) : b[dataIndex];