DRYD-1975: Search > Show empty form when starting a new session (#301)

Author: spirosdi

src/components/search/AdvancedSearchBuilder.jsx

@@ -122,20 +122,36 @@ export default class AdvancedSearchBuilder extends Component {
 
     if (recordType && onConditionCommit) {
       let normalizedCondition;
+      let initialCondition;
 
       if (condition) {
         normalizedCondition = ensureRootBooleanOp(condition, preferredBooleanOp);
       } else {
-        let initialCondition = searchTermsGroup === SEARCH_TERMS_GROUP_LIMIT_BY
-          || searchTermsGroup === SEARCH_TERMS_GROUP_SEARCH_TERMS
-          ? preferredConditionNew : preferredCondition;
-
-        if (!initialCondition) {
-          initialCondition = searchTermsGroup === SEARCH_TERMS_GROUP_LIMIT_BY
-            ? null
-            : Immutable.fromJS(
-              get(config, ['recordTypes', recordType, 'advancedSearch']),
-            );
+        const isNewSearchForm = searchTermsGroup === SEARCH_TERMS_GROUP_LIMIT_BY
+          || searchTermsGroup === SEARCH_TERMS_GROUP_SEARCH_TERMS;
+
+        // use preferred condition when not using new search form
+        // or for both new "search terms, limit by" groups when recordType is not collectionobject
+        if (isNewSearchForm && recordType !== 'collectionobject') {
+          initialCondition = preferredConditionNew;
+        } else if (!isNewSearchForm) {
+          initialCondition = preferredCondition;
+        } else {
+          initialCondition = null;
+        }
+
+        // use config condition when there is no preferred condition
+        // and not using new search form or for new search terms group
+        // when recordType is not collectionobject
+        if (
+          !initialCondition && (
+            !isNewSearchForm
+            || (searchTermsGroup === SEARCH_TERMS_GROUP_SEARCH_TERMS && recordType !== 'collectionobject')
+          )
+        ) {
+          initialCondition = Immutable.fromJS(
+            get(config, ['recordTypes', recordType, 'advancedSearch']),
+          );
         }
 
         normalizedCondition = ensureRootBooleanOp(initialCondition, preferredBooleanOp);

src/components/search/SearchFormContentNew.jsx

@@ -78,7 +78,6 @@ const SearchFormContentNew = ({
         </div>
         <ConnectedPanel
           collapsible
-          collapsed={!newSearchShown}
           name="searchTermsPanel"
           header={<h3>{intl.formatMessage(messages.enterSearchTerms)}</h3>}
         >
@@ -104,7 +103,6 @@ const SearchFormContentNew = ({
         <div className={styles.mb12}><b>{intl.formatMessage(messages.and)}</b></div>
         <ConnectedPanel
           collapsible
-          collapsed={!newSearchShown}
           name="limitByPanel"
           header={<h3>{intl.formatMessage(messages.limitBySpecificFields)}</h3>}
         >

test/specs/components/search/AdvancedSearchBuilder.spec.jsx

@@ -22,6 +22,9 @@ import {
   OP_GT,
   OP_RANGE,
 } from '../../../../src/constants/searchOperators';
+import {
+  SEARCH_TERMS_GROUP_SEARCH_TERMS,
+} from '../../../../src/constants/searchNames';
 
 chai.use(chaiImmutable);
 chai.should();
@@ -129,6 +132,17 @@ const config = {
         },
       },
     },
+    all: {
+      advancedSearch: {
+        op: OP_OR,
+        value: [
+          {
+            op: OP_EQ,
+            path: 'ns2:collectionobjects_common/objectNumber',
+          },
+        ],
+      },
+    },
   },
 };
 
@@ -340,6 +354,65 @@ describe('AdvancedSearchBuilder', () => {
       }));
   });
 
+  it('should normalize an undefined condition to an empty condition for search terms group when recordType is collectionobject', function test() {
+    let committedCondition = null;
+
+    const handleConditionCommit = (conditionArg) => {
+      committedCondition = conditionArg;
+    };
+
+    render(
+      <IntlProvider locale="en">
+        <ConfigProvider config={config}>
+          <StoreProvider store={store}>
+            <AdvancedSearchBuilder
+              config={config}
+              recordType="collectionobject"
+              searchTermsGroup={SEARCH_TERMS_GROUP_SEARCH_TERMS}
+              onConditionCommit={handleConditionCommit}
+            />
+          </StoreProvider>
+        </ConfigProvider>
+      </IntlProvider>, this.container,
+    );
+
+    committedCondition.should
+      .equal(
+        Immutable.fromJS({
+          op: OP_OR,
+          value: [],
+        }),
+      );
+  });
+
+  it('should normalize an undefined condition to the default condition for search terms group when recordType is not collectionobject', function test() {
+    let committedCondition = null;
+
+    const handleConditionCommit = (conditionArg) => {
+      committedCondition = conditionArg;
+    };
+
+    render(
+      <IntlProvider locale="en">
+        <ConfigProvider config={config}>
+          <StoreProvider store={store}>
+            <AdvancedSearchBuilder
+              config={config}
+              recordType="all"
+              searchTermsGroup={SEARCH_TERMS_GROUP_SEARCH_TERMS}
+              onConditionCommit={handleConditionCommit}
+            />
+          </StoreProvider>
+        </ConfigProvider>
+      </IntlProvider>, this.container,
+    );
+
+    committedCondition.should
+      .equal(
+        Immutable.fromJS(config.recordTypes.all.advancedSearch),
+      );
+  });
+
   it('should render a field condition as a FieldConditionInput if onConditionCommit is not supplied', function test() {
     const condition = Immutable.fromJS({
       op: OP_EQ,