From b38104075ad3dca1529e89b6c613b32b0d092f92 Mon Sep 17 00:00:00 2001 From: Aravind Shankar Date: Thu, 27 Jun 2019 16:53:22 +0530 Subject: [PATCH 1/2] fix inconsistent state while filtering rows using a boolean column, close #2421 --- .../Services/Data/TableBrowseRows/FilterActions.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/console/src/components/Services/Data/TableBrowseRows/FilterActions.js b/console/src/components/Services/Data/TableBrowseRows/FilterActions.js index 04e58479e00b5..cb59fd905e255 100644 --- a/console/src/components/Services/Data/TableBrowseRows/FilterActions.js +++ b/console/src/components/Services/Data/TableBrowseRows/FilterActions.js @@ -72,7 +72,11 @@ const runQuery = tableSchema => { return w; } if (colType === 'boolean') { - w[colName][opName] = val === 'true' ? true : false; + if (val === 'true') { + w[colName][opName] = true; + } else if (val === 'false') { + w[colName][opName] = false; + } } return w; }); From 14e3ecaa1541a535d8e987fc8e4502c5fbb83474 Mon Sep 17 00:00:00 2001 From: Aravind Shankar Date: Fri, 28 Jun 2019 15:18:38 +0530 Subject: [PATCH 2/2] show error notification --- .../Services/Data/TableBrowseRows/ViewActions.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/console/src/components/Services/Data/TableBrowseRows/ViewActions.js b/console/src/components/Services/Data/TableBrowseRows/ViewActions.js index 674c36711a078..8da26825b480c 100644 --- a/console/src/components/Services/Data/TableBrowseRows/ViewActions.js +++ b/console/src/components/Services/Data/TableBrowseRows/ViewActions.js @@ -12,7 +12,6 @@ import dataHeaders from '../Common/Headers'; /* ****************** View actions *************/ const V_SET_DEFAULTS = 'ViewTable/V_SET_DEFAULTS'; const V_REQUEST_SUCCESS = 'ViewTable/V_REQUEST_SUCCESS'; -const V_REQUEST_ERROR = 'ViewTable/V_REQUEST_ERROR'; const V_EXPAND_REL = 'ViewTable/V_EXPAND_REL'; const V_CLOSE_REL = 'ViewTable/V_CLOSE_REL'; const V_SET_ACTIVE = 'ViewTable/V_SET_ACTIVE'; @@ -101,7 +100,12 @@ const vMakeRequest = () => { } }, error => { - dispatch({ type: V_REQUEST_ERROR, data: error }); + Promise.all([ + dispatch( + showErrorNotification('Browse query failed!', error.error, error) + ), + dispatch({ type: V_REQUEST_PROGRESS, data: false }), + ]); } ); };