From 4dba150a3e4a3065a26da7df7b607a43b5ef6cc9 Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Sat, 5 Sep 2020 16:00:12 +0200 Subject: [PATCH 1/7] console: select first operator by default (#5729) --- .../Services/Data/TableBrowseRows/FilterQuery.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js b/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js index 0aca0fce421b5..a633c4478750e 100644 --- a/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js +++ b/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js @@ -74,13 +74,8 @@ const renderOps = (opName, onChange, key) => ( value={opName.trim()} data-test={`filter-op-${key}`} > - {opName.trim() === '' ? ( - - ) : null} {Operators.map((o, i) => ( - ))} From c987218615a23642f670ec02ed752ffb1a50bcdc Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Sat, 5 Sep 2020 16:38:30 +0200 Subject: [PATCH 2/7] console: fix prettier issue in FilterQuery.js (double quotes) --- .../src/components/Services/Data/TableBrowseRows/FilterQuery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js b/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js index a633c4478750e..cb68494535110 100644 --- a/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js +++ b/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js @@ -75,7 +75,7 @@ const renderOps = (opName, onChange, key) => ( data-test={`filter-op-${key}`} > {Operators.map((o, i) => ( - ))} From d93296e01fcd4b66640a22a9febbe322efcb0fa8 Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Sat, 5 Sep 2020 16:48:34 +0200 Subject: [PATCH 3/7] console: add change to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index acad5c5a876c3..fdbe4f33dc47d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ This release contains the [PDV refactor (#4111)](https://github.com/hasura/graph - server: allow remote relationships joining `type` column with `[type]` input argument as spec allows this coercion (fixes #5133) - console: allow user to cascade Postgres dependencies when dropping Postgres objects (close #5109) (#5248) - console: mark inconsistent remote schemas in the UI (close #5093) (#5181) +- console: select first operator by default when filtering row data (close #5729) (#5730) - cli: add missing global flags for seeds command (#5565) - docs: add docs page on networking with docker (close #4346) (#4811) From 6ec5bb2e7955bf49cc645ee5fc8ee67f2d493687 Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Sat, 5 Sep 2020 17:51:51 +0200 Subject: [PATCH 4/7] console: fix tests for default selected operation --- .../cypress/integration/data/materialized-views/spec.ts | 2 +- console/cypress/integration/data/views/spec.ts | 2 +- console/src/components/Common/FilterQuery/Where.tsx | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/console/cypress/integration/data/materialized-views/spec.ts b/console/cypress/integration/data/materialized-views/spec.ts index 56bb7f023e298..7dd9a8ba256ce 100644 --- a/console/cypress/integration/data/materialized-views/spec.ts +++ b/console/cypress/integration/data/materialized-views/spec.ts @@ -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'); diff --git a/console/cypress/integration/data/views/spec.ts b/console/cypress/integration/data/views/spec.ts index cf1405b420665..3530c9f8174ce 100644 --- a/console/cypress/integration/data/views/spec.ts +++ b/console/cypress/integration/data/views/spec.ts @@ -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'); diff --git a/console/src/components/Common/FilterQuery/Where.tsx b/console/src/components/Common/FilterQuery/Where.tsx index 4e8897dfb451f..59833a3427d21 100644 --- a/console/src/components/Common/FilterQuery/Where.tsx +++ b/console/src/components/Common/FilterQuery/Where.tsx @@ -81,13 +81,8 @@ const Where: React.FC = props => { value={filter.operator || ''} data-test={`filter-op-${i}`} > - {isNotDefined(filter.operator) ? ( - - ) : null} {allOperators.map(o => ( - ))} From e47b618770f6bb371c18ff94d08a1bc2b4db7d92 Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Sat, 5 Sep 2020 17:57:44 +0200 Subject: [PATCH 5/7] console: remove unused import --- console/src/components/Common/FilterQuery/Where.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/console/src/components/Common/FilterQuery/Where.tsx b/console/src/components/Common/FilterQuery/Where.tsx index 59833a3427d21..30c77d97287c9 100644 --- a/console/src/components/Common/FilterQuery/Where.tsx +++ b/console/src/components/Common/FilterQuery/Where.tsx @@ -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 = { From f1ff66ff3856016b5db9cedb0bfbfec444fd676d Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Sat, 5 Sep 2020 17:59:41 +0200 Subject: [PATCH 6/7] console: format Where.tsx according to prettier rules --- console/src/components/Common/FilterQuery/Where.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/console/src/components/Common/FilterQuery/Where.tsx b/console/src/components/Common/FilterQuery/Where.tsx index 30c77d97287c9..6d4e027f10aa8 100644 --- a/console/src/components/Common/FilterQuery/Where.tsx +++ b/console/src/components/Common/FilterQuery/Where.tsx @@ -81,7 +81,11 @@ const Where: React.FC = props => { data-test={`filter-op-${i}`} > {allOperators.map(o => ( - ))} From 8bc4fb4dc9f5ef4ec7e863e909539828af1d6e96 Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Sat, 5 Sep 2020 18:14:34 +0200 Subject: [PATCH 7/7] console: fix selected option type to be boolean instead of string --- console/src/components/Common/FilterQuery/Where.tsx | 2 +- .../src/components/Services/Data/TableBrowseRows/FilterQuery.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/console/src/components/Common/FilterQuery/Where.tsx b/console/src/components/Common/FilterQuery/Where.tsx index 6d4e027f10aa8..767abc54daa76 100644 --- a/console/src/components/Common/FilterQuery/Where.tsx +++ b/console/src/components/Common/FilterQuery/Where.tsx @@ -84,7 +84,7 @@ const Where: React.FC = props => { diff --git a/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js b/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js index cb68494535110..e4e38343c995f 100644 --- a/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js +++ b/console/src/components/Services/Data/TableBrowseRows/FilterQuery.js @@ -75,7 +75,7 @@ const renderOps = (opName, onChange, key) => ( data-test={`filter-op-${key}`} > {Operators.map((o, i) => ( - ))}