@rh-support/react-context 2.1.77 → 2.1.79

package/lib/esm/components/AccountSelector/AccountSelectorInternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountSelectorInternal.d.ts","sourceRoot":"","sources":["../../../../src/components/AccountSelector/AccountSelectorInternal.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAgBhF,OAAO,EAAE,kBAAkB,EAA8B,MAAM,wBAAwB,CAAC;AAKxF,OAAO,KAA+C,MAAM,OAAO,CAAC;AAGpE,UAAU,MAAO,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IACjD,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC9B,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC7B,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC;IACzC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,6BAA6B,CAAC,EAAE,OAAO,CAAC;CAC3C;AAkCD,iBAAS,uBAAuB,CAAC,KAAK,EAAE,MAAM,qBAqS7C;kBArSQ,uBAAuB;;;AAwShC,OAAO,EAAE,uBAAuB,EAAE,CAAC"}
+{"version":3,"file":"AccountSelectorInternal.d.ts","sourceRoot":"","sources":["../../../../src/components/AccountSelector/AccountSelectorInternal.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAgBhF,OAAO,EAAE,kBAAkB,EAA8B,MAAM,wBAAwB,CAAC;AAKxF,OAAO,KAA+C,MAAM,OAAO,CAAC;AAGpE,UAAU,MAAO,SAAQ,kBAAkB,CAAC,QAAQ,CAAC;IACjD,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC9B,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC7B,kBAAkB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC;IACzC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,6BAA6B,CAAC,EAAE,OAAO,CAAC;CAC3C;AAkCD,iBAAS,uBAAuB,CAAC,KAAK,EAAE,MAAM,qBA4T7C;kBA5TQ,uBAAuB;;;AA+ThC,OAAO,EAAE,uBAAuB,EAAE,CAAC"}

package/lib/esm/components/AccountSelector/AccountSelectorInternal.js

@@ -114,6 +114,25 @@ function AccountSelectorInternal(props) {
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [items, bookmarkedAccountsDeduped, isFetching, itemsToRender, isQueryChanged]);
+    /**
+     * The below function sorts the account search results based on the provided query string (account name or number).
+     */
+    function sortAccountsByQuery(accounts, queryStr, queryKey) {
+        function getSimilarityScore(value) {
+            if (value.startsWith(queryStr)) {
+                return 1000 + queryStr.length;
+            }
+            else if (value.includes(queryStr)) {
+                return 500 + queryStr.length;
+            }
+            else {
+                return 0;
+            }
+        }
+        return accounts.sort((a, b) => {
+            return getSimilarityScore(b[queryKey]) - getSimilarityScore(a[queryKey]);
+        });
+    }
     const fetchAccounts = (query) => __awaiter(this, void 0, void 0, function* () {
         if (isEmpty(query)) {
             return;
@@ -125,17 +144,21 @@ function AccountSelectorInternal(props) {
             limit: 60,
             accountNumberNotNull: true,
         };
+        let queryKey;
         // query as number is a hack to get around TS, isNaN can take a string but it was throwing error here
         if (isNaN(query)) {
             params.nameLike = query;
+            queryKey = 'name';
         }
         else {
             params.accountNumberLike = query;
+            queryKey = 'accountNumber';
         }
         const queryParams = params;
         const response = request && (yield request(queryParams));
         const options = response && response.items && response.items.length ? response.items : [];
-        setItems(options);
+        const sortedOptions = sortAccountsByQuery(options, query, queryKey);
+        setItems(sortedOptions);
     });
     const onOuterClick = () => {
         setQueryLabel(props.selectedAccounts || []);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/react-context",
-    "version": "2.1.77",
+    "version": "2.1.79",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -40,7 +40,7 @@
         "@cee-eng/hydrajs": "4.17.21",
         "@patternfly/react-core": "5.1.1",
         "@patternfly/react-icons": "5.1.1",
-        "@rh-support/components": "2.1.69",
+        "@rh-support/components": "2.1.71",
         "@rh-support/types": "2.0.4",
         "@rh-support/user-permissions": "2.1.48",
         "@rh-support/utils": "2.1.37",
@@ -93,5 +93,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "8720a44261dd585266b2cfdf2bf5092a0cec88d0"
+    "gitHead": "9de4fff35aa1e2abec92656fa48e1b7b759a9e6c"
 }