@rh-support/cases 2.1.84 → 2.1.85

package/lib/esm/components/case-list/case-list-filters/VersionsFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VersionsFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/VersionsFilter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAA+B,MAAM,OAAO,CAAC;AAIpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAMxE,UAAU,MAAM;IACZ,WAAW,EAAE,cAAc,CAAC;IAC5B,mBAAmB,EAAE,uBAAuB,EAAE,CAAC;CAClD;AAED,wBAAgB,cAAc,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,EAAE,MAAM,qBA4D1E"}
+{"version":3,"file":"VersionsFilter.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-list-filters/VersionsFilter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAI7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAgB,MAAM,0BAA0B,CAAC;AAoCxE,UAAU,MAAM;IACZ,WAAW,EAAE,cAAc,CAAC;IAC5B,mBAAmB,EAAE,uBAAuB,EAAE,CAAC;CAClD;AAED,wBAAgB,cAAc,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,EAAE,MAAM,qBA+D1E"}

package/lib/esm/components/case-list/case-list-filters/VersionsFilter.js

@@ -1,6 +1,6 @@
 import { Select, SelectOption, SelectVariant } from '@patternfly/react-core/deprecated';
 import isEmpty from 'lodash/isEmpty';
-import React, { useContext, useState } from 'react';
+import React, { useContext, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SolrKeys, SolrPivotKeys } from '../../../enums/filters';
 import { CaseListFilterDispatchContext, CaseListFilterStateContext } from '../CaseListFilterContext';
@@ -8,6 +8,34 @@ import { updateFilter } from '../CaseListFilterReducer';
 function getVersionValuesForProduct(productPivot = [], productName) {
     return (productPivot.find((item) => item.value === productName) || {}).case_version;
 }
+//split version into parts
+function parseVersionIntoParts(version) {
+    //keep unknown version at last
+    if (version === 'Unknown')
+        return [Infinity];
+    //split dots and spaces
+    return version.split(/[.\s]/).map((p) => (isNaN(Number(p)) ? p : Number(p)));
+}
+function compareVersions(versionA, versionB) {
+    var _a, _b;
+    const pA = parseVersionIntoParts(versionA), pB = parseVersionIntoParts(versionB);
+    //compare each part
+    for (let i = 0; i < Math.max(pA.length, pB.length); i++) {
+        const a = (_a = pA[i]) !== null && _a !== void 0 ? _a : 0, b = (_b = pB[i]) !== null && _b !== void 0 ? _b : 0; //undefined as 0
+        if (a == b)
+            continue;
+        if (typeof a === 'number' && typeof b === 'number')
+            return a - b;
+        if (typeof a === 'string' && typeof b === 'string')
+            return a.localeCompare(b);
+        //one is string and other is number => string takes precendence
+        if (typeof a === 'string')
+            return -1;
+        if (typeof b == 'string')
+            return 1;
+    }
+    return 0;
+}
 export function VersionsFilter({ productInfo, productVersionPivot }) {
     const { t } = useTranslation();
     const { filterInfo } = useContext(CaseListFilterStateContext);
@@ -29,7 +57,10 @@ export function VersionsFilter({ productInfo, productVersionPivot }) {
         };
         updateFilter(dispatch, { filterKey: SolrPivotKeys.product_version, values: productNewState });
     };
-    const versions = getVersionValuesForProduct(productVersionPivot, productInfo.value);
+    const versions = useMemo(() => {
+        const versionValues = getVersionValuesForProduct(productVersionPivot, productInfo.value);
+        return versionValues === null || versionValues === void 0 ? void 0 : versionValues.sort((a, b) => compareVersions(a.value, b.value));
+    }, [productVersionPivot, productInfo.value]);
     const titleId = 'case-list-versions-filter';
     return (React.createElement(React.Fragment, null, !isEmpty(versions) && (React.createElement(React.Fragment, null,
         React.createElement("label", { hidden: true, htmlFor: titleId }, t('Open versions dropdown')),

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "2.1.84",
+    "version": "2.1.85",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -96,5 +96,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "099d42e24ad273e72ecd1066dc081abe1b2e09f1"
+    "gitHead": "667a07388538d5e8a6e406b8bedfeabfef4b8cf4"
 }