@rh-support/cases 2.0.16 → 2.0.18

package/lib/esm/hooks/useFilterStateOnLoad.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFilterStateOnLoad.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFilterStateOnLoad.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAI1D,wBAAgB,oBAAoB;wBAkBd,MAAM,mBACH,MAAM,sBACH,MAAM,cACd,mBAAmB;;;;EAsDtC"}
+{"version":3,"file":"useFilterStateOnLoad.d.ts","sourceRoot":"","sources":["../../../src/hooks/useFilterStateOnLoad.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAI1D,wBAAgB,oBAAoB;wBAkBd,MAAM,mBACH,MAAM,sBACH,MAAM,cACd,mBAAmB;;;;EA+DtC"}

package/lib/esm/hooks/useFilterStateOnLoad.js

@@ -11,23 +11,27 @@ export function useFilterStateOnLoad() {
     const savesSearches = find(hydraUserPreferences.data, (pref) => pref.key === UserPreferencesKeys.caseSavedSearchFilters);
     const savedSearchesObj = useMemo(() => ((savesSearches === null || savesSearches === void 0 ? void 0 : savesSearches.value) ? JSON.parse(savesSearches.value) : {}), [savesSearches]);
     const set = (queryFromUrl, pageSizeFromUrl, currentPageFromUrl, searchType) => {
-        const filterStateFromURL = createFilterStateFromUrlQuery(queryFromUrl, globalMetadataState, pageSizeFromUrl, currentPageFromUrl, searchType);
         let savedSearchFilterState = null;
         const defaultSavedSearchKey = findKey(savedSearchesObj, { defaultChecked: true });
         if (defaultSavedSearchKey) {
             const { filterState: filterStateSaved, queryString, type, sortState, } = savedSearchesObj[defaultSavedSearchKey];
             savedSearchFilterState = Object.assign(Object.assign({}, filterState), { sortInfo: sortState, filterQueryInfo: Object.assign(Object.assign({}, filterState.filterQueryInfo), { queryString, type }), filterInfo: Object.assign(Object.assign({}, initialCaseFilterState.filterInfo), filterStateSaved) });
         }
-        let defaultFilterState = queryFromUrl
-            ? filterStateFromURL
-            : savedSearchFilterState
-                ? savedSearchFilterState
-                : filterState;
         const defaultGroup = (caseGroups.data || []).find((group) => group.isDefault);
-        if (defaultGroup) {
-            const updatedFilterInfo = Object.assign(Object.assign({}, filterState.filterInfo), { [SolrKeys.group]: [{ key: defaultGroup.groupNum, value: defaultGroup.name }] });
-            defaultFilterState = Object.assign(Object.assign({}, filterState), { filterInfo: updatedFilterInfo });
-        }
+        const [urlQuery] = (queryFromUrl || '').split(/ orderBy /i);
+        /**
+        When user lands on page for the first time:
+        If we have any query in url(for example redirect from dashboard), we apply the query, if not
+        check if user has any saved search then we apply the save search, if not
+        check if user has default group the apply group filter,
+        non of the above, we apply default search values
+        */
+        let defaultFilterState = urlQuery && urlQuery !== 'undefined'
+            ? createFilterStateFromUrlQuery(queryFromUrl, globalMetadataState, pageSizeFromUrl, currentPageFromUrl, searchType)
+            : defaultSavedSearchKey
+                ? savedSearchFilterState
+                : !!(defaultGroup === null || defaultGroup === void 0 ? void 0 : defaultGroup.name)
+                    ? Object.assign(Object.assign({}, filterState), { filterInfo: Object.assign(Object.assign({}, filterState.filterInfo), { [SolrKeys.group]: [{ key: defaultGroup.groupNum, value: defaultGroup.name }] }) }) : filterState;
         return {
             initFilterState: defaultFilterState,
             defaultSearchName: defaultSavedSearchKey && !queryFromUrl ? defaultSavedSearchKey : '',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "2.0.16",
+    "version": "2.0.18",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -46,11 +46,11 @@
         "@patternfly/pfe-collapse": "1.12.3",
         "@patternfly/react-core": "4.264.0",
         "@patternfly/react-table": "4.111.33",
-        "@rh-support/components": "2.0.8",
-        "@rh-support/react-context": "2.0.8",
+        "@rh-support/components": "2.0.9",
+        "@rh-support/react-context": "2.0.9",
         "@rh-support/types": "2.0.2",
-        "@rh-support/user-permissions": "2.0.8",
-        "@rh-support/utils": "2.0.8",
+        "@rh-support/user-permissions": "2.0.9",
+        "@rh-support/utils": "2.0.9",
         "i18next": "^19.0.1",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
@@ -93,5 +93,5 @@
         "defaults and supports es6-module",
         "maintained node versions"
     ],
-    "gitHead": "6bc43bd45d0a24ad38a702c83104b701ed4d4a8c"
+    "gitHead": "c8c300debff17f7a569d204850217ab7dfed7fb6"
 }