STCOM-1242: Doesn't replace an unsupported search option if the advan…

…ced search modal is not open. (#2189)

index.js

@@ -120,6 +120,7 @@ export {
   BOOLEAN_OPERATORS as ADVANCED_SEARCH_BOOLEAN_OPERATORS,
   MATCH_OPTIONS as ADVANCED_SEARCH_MATCH_OPTIONS,
   FIELD_NAMES as ADVANCED_SEARCH_FIELD_NAMES,
+  DEFAULT_SEARCH_OPTION as ADVANCED_SEARCH_DEFAULT_SEARCH_OPTION,
 } from './lib/AdvancedSearch';
 
 /* specific use */

lib/AdvancedSearch/AdvancedSearch.js

@@ -65,6 +65,7 @@ const AdvancedSearch = ({
     searchOptions,
     queryToRow,
     hasQueryOption,
+    open,
   });
 
   const renderRows = () => {

lib/AdvancedSearch/constants.js

@@ -11,6 +11,7 @@ export const BOOLEAN_OPERATORS = {
   NOT: 'not',
 };
 export const QUERY_OPTION_VALUE = 'advancedSearch';
+export const DEFAULT_SEARCH_OPTION = 'keyword';
 export const MATCH_OPTIONS = {
   EXACT_PHRASE: 'exactPhrase',
   CONTAINS_ALL: 'containsAll',

lib/AdvancedSearch/hooks/tests/useAdvancedSearch-test.js

@@ -0,0 +1,48 @@
+import {
+  describe,
+  it,
+} from 'mocha';
+import { expect } from 'chai';
+
+import getHookExecutionResult from "../../../../tests/helpers/getHookExecutionResult";
+import useAdvancedSearch from '../useAdvancedSearch';
+
+describe('useAdvancedSearch', () => {
+  describe('when advanced search modal is closed', () => {
+    it('should not replace the search option with default one', async () => {
+      const firstRowInitialSearch = {
+        query: "identifiers.value==n83169267",
+        option: "advancedSearch",
+      };
+
+      const args = {
+        defaultSearchOptionValue: 'keyword',
+        firstRowInitialSearch,
+        open: false,
+      };
+
+      const hookResult = await getHookExecutionResult(useAdvancedSearch, args);
+
+      expect(hookResult.filledRows[0].searchOption).to.equal('identifiers.value');
+    });
+  });
+
+  describe('when advanced search modal is open', () => {
+    it('should replace the search option with default one', async () => {
+      const firstRowInitialSearch = {
+        query: "identifiers.value==n83169267",
+        option: "advancedSearch",
+      };
+
+      const args = {
+        defaultSearchOptionValue: 'keyword',
+        firstRowInitialSearch,
+        open: true,
+      };
+
+      const hookResult = await getHookExecutionResult(useAdvancedSearch, args);
+
+      expect(hookResult.filledRows[0].searchOption).to.equal('keyword');
+    });
+  });
+});

lib/AdvancedSearch/hooks/useAdvancedSearch/useAdvancedSearch.js

@@ -33,7 +33,11 @@ const createInitialRowState = (firstRowInitialSearch, defaultSearchOptionValue)
   }));
 };
 
-const replaceUnsupportedOptions = (row, searchOptions, defaultSearchOptionValue, hasQueryOption) => {
+const replaceUnsupportedOptions = (row, searchOptions, defaultSearchOptionValue, hasQueryOption, open) => {
+  if (!open) {
+    return row;
+  }
+
   const hasSupportedSearchOption = searchOptions.some(option => option.value === row.searchOption);
 
   if (hasQueryOption || hasSupportedSearchOption) {
@@ -56,6 +60,7 @@ const useAdvancedSearch = ({
   queryToRow = defaultQueryToRow,
   searchOptions = [],
   hasQueryOption,
+  open,
 }) => {
   const initialRowState = useMemo(() => {
     const initialRows = createInitialRowState(firstRowInitialSearch, defaultSearchOptionValue);
@@ -68,10 +73,10 @@ const useAdvancedSearch = ({
   const [prevFirstRowInitialSearch, setPrevFirstRowInitialSearch] = useState(firstRowInitialSearch);
   const filledRows = useMemo(() => {
     const rows = splitQueryRows(rowState, queryToRow)
-      .map(row => replaceUnsupportedOptions(row, searchOptions, defaultSearchOptionValue, hasQueryOption));
+      .map(row => replaceUnsupportedOptions(row, searchOptions, defaultSearchOptionValue, hasQueryOption, open));
 
     return filterFilledRows(rows)
-  }, [rowState, queryToRow, searchOptions, defaultSearchOptionValue, hasQueryOption]);
+  }, [rowState, queryToRow, searchOptions, defaultSearchOptionValue, hasQueryOption, open]);
 
   const searchOptionsWithQuery = useMemo(() => (
     [{

lib/AdvancedSearch/index.js

@@ -5,4 +5,5 @@ export {
   FIELD_NAMES,
   BOOLEAN_OPERATORS,
   MATCH_OPTIONS,
+  DEFAULT_SEARCH_OPTION,
 } from './constants';

tests/helpers/getHookExecutionResult.js

@@ -14,7 +14,9 @@ import { mountWithContext } from '../helpers';
 const getHookExecutionResult = (hook, hookArguments = []) => {
   let result = {};
   const TestComponent = () => {
-    const hookResult = hook(...hookArguments);
+    const hookResult = Array.isArray(hookArguments)
+      ? hook(...hookArguments)
+      : hook(hookArguments);
     if (typeof hookResult === 'function') {
       result = hookResult;
     } else {