Merge branch 'master' into 3759-3791-minor-metadata-build-bugfixes

This commit is contained in:
Vamshi Surabhi 2020-02-05 18:48:11 +05:30 committed by GitHub
commit 446a788943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -185,6 +185,11 @@ const renderSorts = (orderBy, tableSchema, dispatch) => {
class FilterQuery extends Component {
componentDidMount() {
const dispatch = this.props.dispatch;
if (!this.props.urlQuery) {
dispatch(setDefaultQuery(this.props.curQuery));
return;
}
let urlFilters = [];
if (typeof this.props.urlQuery.filter === 'string') {
urlFilters = [this.props.urlQuery.filter];

View File

@ -638,7 +638,7 @@ const ViewRows = ({
count={count}
tableName={curTableName}
offset={offset}
urlQuery={location.query}
urlQuery={location && location.query}
/>
);
}