hasura · bertyhell · Sep 5, 2020 · Sep 5, 2020 · Sep 5, 2020 · Sep 5, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -86,6 +86,7 @@ This release contains the [PDV refactor (#4111)](https://github.com/hasura/graph
 - console: remove ONLY as default for ALTER TABLE in column alter operations (close #5512) #5706
 - console: add option to flag an insertion as a migration from `Data` section (close #1766) (#4933)
 - console: add notifications (#5070)
+- console: select first operator by default when filtering row data in data browser (close #5729) (#5730)
 - docs: add docs page on networking with docker (close #4346) (#4811)
 - docs: add tabs for console / cli / api workflows (close #3593) (#4948)
 - docs: add postgres concepts page to docs (close #4440) (#4471)

@@ -304,7 +304,7 @@ export const passVFilterQueryEq = () => {
   // Select operator as `eq`
   cy.get('select')
     .find('option')
-    .contains('-- op --')
+    .contains('[_eq] equals')
     .parent()
     .last()
     .select('$eq');

@@ -295,7 +295,7 @@ export const passVFilterQueryEq = () => {
   // Select operator as `eq`
   cy.get('select')
     .find('option')
-    .contains('-- op --')
+    .contains('[_eq] equals')
     .parent()
     .last()
     .select('$eq');

@@ -3,7 +3,6 @@ import { ValueFilter, Operator } from './types';
 import { allOperators } from './utils';
 
 import { BaseTable } from '../utils/pgUtils';
-import { isNotDefined } from '../utils/jsUtils';
 import styles from './FilterQuery.scss';
 
 type Props = {
@@ -81,13 +80,12 @@ const Where: React.FC<Props> = props => {
                 value={filter.operator || ''}
                 data-test={`filter-op-${i}`}
               >
-                {isNotDefined(filter.operator) ? (
-                  <option disabled value="">
-                    -- op --
-                  </option>
-                ) : null}
                 {allOperators.map(o => (
-                  <option key={o.operator} value={o.operator}>
+                  <option
+                    key={o.operator}
+                    value={o.operator}
+                    selected={i === 0}
+                  >
                     {`[${o.alias}] ${o.name}`}
                   </option>
                 ))}

@@ -74,13 +74,8 @@ const renderOps = (opName, onChange, key) => (
     value={opName.trim()}
     data-test={`filter-op-${key}`}
   >
-    {opName.trim() === '' ? (
-      <option disabled value="">
-        -- op --
-      </option>
-    ) : null}
     {Operators.map((o, i) => (
-      <option key={i} value={o.value}>
+      <option key={i} value={o.value} selected={i === 0}>
         {`[${o.graphqlOp}] ${o.name}`}
       </option>
     ))}