mirror of
https://github.com/hasura/graphql-engine.git
synced 2024-12-15 09:22:43 +03:00
Merge branch 'master' into 3759-3791-minor-metadata-build-bugfixes
This commit is contained in:
commit
446a788943
@ -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];
|
||||
|
@ -638,7 +638,7 @@ const ViewRows = ({
|
||||
count={count}
|
||||
tableName={curTableName}
|
||||
offset={offset}
|
||||
urlQuery={location.query}
|
||||
urlQuery={location && location.query}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user