@rh-support/cases 0.2.41 → 0.2.42

package/lib/esm/components/case-list/case-search/SaveCaseSearchModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SaveCaseSearchModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/SaveCaseSearchModal.tsx"],"names":[],"mappings":"AA2BA,UAAU,MAAM;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,wBAAwB,EAAE,MAAM,CAAC;CACpC;AAED,wBAAgB,mBAAmB,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,wBAAwB,EAAE,EAAE,MAAM,eAgQ3G"}
+{"version":3,"file":"SaveCaseSearchModal.d.ts","sourceRoot":"","sources":["../../../../../src/components/case-list/case-search/SaveCaseSearchModal.tsx"],"names":[],"mappings":"AA4BA,UAAU,MAAM;IACZ,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,wBAAwB,EAAE,MAAM,CAAC;CACpC;AAED,wBAAgB,mBAAmB,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,wBAAwB,EAAE,EAAE,MAAM,eA0Q3G"}

package/lib/esm/components/case-list/case-search/SaveCaseSearchModal.js

@@ -16,6 +16,7 @@ import isEmpty from 'lodash/isEmpty';
 import pickBy from 'lodash/pickBy';
 import React, { useContext, useEffect, useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
+import { CaseSearchQueryType } from '../../../enums/caseSearch';
 import { createUserFriendlyQueryFromFilterState } from '../../../utils/caseSearchUtils';
 import { CaseListFilterStateContext } from '../CaseListFilterContext';
 export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, selectedSearchNameToEdit }) {
@@ -69,11 +70,13 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
             // need to remove old default search if there is any
             localDefaultChecked && setDefaultSearchToFalse();
             if (isAdding) {
+                const type = filterState.filterQueryInfo.type;
                 previousBookmarkedSearchesObj[localSavedSearchName] = {
                     filterState: pickBy(filterState.filterInfo, (value) => value.length !== 0),
                     sortState: sortInfo,
-                    type: filterState.filterQueryInfo.type,
+                    type,
                     defaultChecked: localDefaultChecked,
+                    queryString: getQueryStr(),
                 };
             }
             else {
@@ -86,16 +89,13 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
             }
             yield preferencesApiCall(previousBookmarkedSearchesObj);
             setIsUpdating(false);
-            setSaveButtonIsClicked(false);
             ToastNotification.addSuccessMessage(t('Saved search has been updated successfully'));
-            modalToggle();
         }
         catch (e) {
             setIsUpdating(false);
-            setSaveButtonIsClicked(false);
             ToastNotification.addDangerMessage(t('Saved search failed to update'));
-            modalToggle();
         }
+        closeModal();
     });
     const deleteSavedSearch = () => __awaiter(this, void 0, void 0, function* () {
         try {
@@ -126,6 +126,23 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
         setLocalSavedSearchName('');
         modalToggle();
     };
+    const getQueryStr = () => {
+        let queryStr = '';
+        if (isAdding) {
+            const type = filterState.filterQueryInfo.type;
+            queryStr =
+                type === CaseSearchQueryType.BASIC
+                    ? createUserFriendlyQueryFromFilterState(filterInfo, filterQueryInfo.queryString)
+                    : filterQueryInfo.queryString;
+        }
+        else if (selectedSearchNameToEdit && previousBookmarkedSearchesObj[selectedSearchNameToEdit]) {
+            queryStr = createUserFriendlyQueryFromFilterState(previousBookmarkedSearchesObj[selectedSearchNameToEdit].filterState, previousBookmarkedSearchesObj[selectedSearchNameToEdit].queryString);
+        }
+        else {
+            queryStr = previousBookmarkedSearchesObj[localSavedSearchName] || '';
+        }
+        return queryStr;
+    };
     useEffect(() => {
         var _a;
         setLocalSavedSearchName(selectedSearchNameToEdit);
@@ -156,9 +173,5 @@ export function SaveCaseSearchModal({ isModalOpen, modalToggle, isAdding, select
                         ? 'error'
                         : 'default' })),
             React.createElement(FormGroup, { label: t('Search and filter query'), isRequired: true, fieldId: "filter-query", className: "form-group pf-u-mt-lg", validated: saveButtonIsClicked ? 'error' : 'default' },
-                React.createElement(TextArea, { isRequired: true, type: "text", id: "filter-query", name: "filter-query", "aria-describedby": "filter-query-helper", value: isAdding
-                        ? createUserFriendlyQueryFromFilterState(filterInfo, filterQueryInfo.queryString)
-                        : selectedSearchNameToEdit && previousBookmarkedSearchesObj[selectedSearchNameToEdit]
-                            ? createUserFriendlyQueryFromFilterState(previousBookmarkedSearchesObj[selectedSearchNameToEdit].filterState, previousBookmarkedSearchesObj[selectedSearchNameToEdit].queryString)
-                            : '', className: "form-control", isDisabled: true })))));
+                React.createElement(TextArea, { isRequired: true, type: "text", id: "filter-query", name: "filter-query", "aria-describedby": "filter-query-helper", value: getQueryStr(), className: "form-control", isDisabled: true })))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rh-support/cases",
-    "version": "0.2.41",
+    "version": "0.2.42",
     "publishConfig": {
         "access": "public",
         "registry": "https://registry.npmjs.org"
@@ -101,5 +101,5 @@
         "not ie <= 11",
         "not op_mini all"
     ],
-    "gitHead": "cb0d1a0aad49e869ec8b6f6192c49d710dcf37cb"
+    "gitHead": "8ce3e080eafb6dd8df726bed5b7f2d54acf8cc22"
 }