这是indexloc提供的服务，不要输入任何密码
Skip to content

fix inconsistent state while filtering rows using a boolean column, close #2421 #2440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 28, 2019
Merged

fix inconsistent state while filtering rows using a boolean column, close #2421 #2440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b381040
fix inconsistent state while filtering rows using a boolean column, c…
arvi3411301 Jun 27, 2019
ec2f831
Merge branch 'master' into issue-2421
arvi3411301 Jun 28, 2019
14e3eca
show error notification
arvi3411301 Jun 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion console/src/components/Services/Data/TableBrowseRows/FilterActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
Expand Down
8 changes: 6 additions & 2 deletions console/src/components/Services/Data/TableBrowseRows/ViewActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 }),
]);
}
);
};
Expand Down