Skip to content

Commit 4fa5a8e

Browse files
committed
adjust order by parms to not have a default
1 parent 03b9a88 commit 4fa5a8e

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

lib/superset/dashboard/list.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ def ids_not_in_filters
8686
ids_not_in.map {|id| "(col:id,opr:neq,value:'#{id}')"}.join(',')
8787
end
8888

89+
def order_by
90+
",order_column:changed_on,order_direction:desc"
91+
end
92+
8993
def list_attributes
9094
[:id, :dashboard_title, :status, :url]
9195
end

lib/superset/request.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ def query_params
3636
[filters, pagination, order_by].join
3737
end
3838

39-
def order_by
40-
# by default, we will order by changed_on as per the GUI
41-
",order_column:changed_on,order_direction:desc"
42-
end
43-
4439
private
4540

4641
def route
@@ -59,6 +54,13 @@ def pagination
5954
"page:#{page_num},page_size:#{PAGE_SIZE}"
6055
end
6156

57+
def order_by
58+
# order options are to not be consistant across all objects
59+
# eg changed_on is NOT available on all objects .. requires customization in each ::List class
60+
#
61+
# Example only: ",order_column:changed_on,order_direction:desc"
62+
end
63+
6264
def filters
6365
""
6466
end

spec/superset/chart/list_spec.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,10 @@
7474
"viz_type"=>"dist_bar"
7575
}]
7676
end
77-
let(:default_query_params) { "page:0,page_size:100,order_column:changed_on,order_direction:desc" }
77+
let(:default_query_params) { "page:0,page_size:100" }
7878

7979
before do
8080
allow(subject).to receive(:result).and_return(result)
81-
#allow(subject).to receive(:superset_host).and_return(superset_host)
82-
#allow(subject).to receive(:response).and_return( { 'count': 2 } )
8381
end
8482

8583
describe '#rows' do

spec/superset/database/list_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
]
2121
}
2222
end
23-
let(:default_query_params) { "page:0,page_size:100,order_column:changed_on,order_direction:desc" }
23+
let(:default_query_params) { "page:0,page_size:100" }
2424

2525
describe '#rows' do
2626
before do

spec/superset/dataset/list_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
]
4444
end
4545

46-
let(:default_query_params) { "page:0,page_size:100,order_column:changed_on,order_direction:desc" }
46+
let(:default_query_params) { "page:0,page_size:100" }
4747

4848
before do
4949
allow(subject).to receive(:result).and_return(result)

spec/superset/request_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
describe '#query_params' do
4343
it 'returns the default query params' do
44-
expect(subject.send(:query_params)).to eq("page:0,page_size:100,order_column:changed_on,order_direction:desc")
44+
expect(subject.send(:query_params)).to eq("page:0,page_size:100")
4545
end
4646
end
4747
end

spec/superset/security/user/list_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}]
3636
end
3737

38-
let(:default_query_params) { "page:0,page_size:100,order_column:changed_on,order_direction:desc" }
38+
let(:default_query_params) { "page:0,page_size:100" }
3939

4040
before do
4141
allow(subject).to receive(:result).and_return(result)

0 commit comments

Comments
 (0)