mirror of https://github.com/apache/superset.git
Merge a995f08def
into f5843fe588
This commit is contained in:
commit
3b07cc4c31
|
@ -187,13 +187,13 @@ describe('Drill to detail modal', () => {
|
|||
cy.on('uncaught:exception', () => false);
|
||||
cy.wait('@samples');
|
||||
cy.get('.virtual-table-cell').should($rows => {
|
||||
expect($rows).to.contain('Kelly');
|
||||
expect($rows).to.contain('Kimberly');
|
||||
});
|
||||
|
||||
// verify scroll top on pagination
|
||||
cy.getBySelLike('Number-modal').find('.virtual-grid').scrollTo(0, 200);
|
||||
|
||||
cy.get('.virtual-grid').contains('Juan').should('not.be.visible');
|
||||
cy.get('.virtual-grid').contains('Kim').should('not.be.visible');
|
||||
|
||||
cy.get('.ant-pagination-item').eq(0).click();
|
||||
|
||||
|
|
|
@ -170,7 +170,6 @@ def _get_drill_detail(
|
|||
datasource = _get_datasource(query_context, query_obj)
|
||||
query_obj = copy.copy(query_obj)
|
||||
query_obj.is_timeseries = False
|
||||
query_obj.orderby = []
|
||||
query_obj.metrics = None
|
||||
query_obj.post_processing = []
|
||||
qry_obj_cols = []
|
||||
|
@ -180,6 +179,7 @@ def _get_drill_detail(
|
|||
else:
|
||||
qry_obj_cols.append(o.column_name)
|
||||
query_obj.columns = qry_obj_cols
|
||||
query_obj.orderby = [(query_obj.columns[0], True)]
|
||||
return _get_full(query_context, query_obj, force_cached)
|
||||
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ FormData = dict[str, Any]
|
|||
Granularity = Union[str, dict[str, Union[str, float]]]
|
||||
Column = Union[AdhocColumn, str]
|
||||
Metric = Union[AdhocMetric, str]
|
||||
OrderBy = tuple[Metric, bool]
|
||||
OrderBy = tuple[Union[Metric, Column], bool]
|
||||
QueryObjectDict = dict[str, Any]
|
||||
VizData = Optional[Union[list[Any], dict[Any, Any]]]
|
||||
VizPayload = dict[str, Any]
|
||||
|
|
Loading…
Reference in New Issue