Skip to content

Commit c606261

Browse files
committed
Only show the "Beta Analytics" checkbox if Kylin analytics is enabled.
1 parent 53d1ef8 commit c606261

File tree

5 files changed

+26
-2
lines changed

5 files changed

+26
-2
lines changed

src/api-umbrella/web-app/app/assets/javascripts/admin/templates/stats/_query_form.hbs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
<a id="filter_toggle" {{action 'toggleFilters' target='view'}}><i class="fa fa-caret-right"></i>{{t 'admin.stats.filter_results'}}</a>
55
</div>
66
<div class="span8 filter-times">
7-
<label class="checkbox" style="display: inline-block; font-size: 12px; margin: 0px 40px 0px 0px; color: #666; position: relative; top: 2px;">{{view Ember.Checkbox checkedBinding="view.isBetaAnalytics" action="toggleBetaAnalytics" target="view"}} Beta Analytics</label>
7+
{{#if view.enableBetaAnalytics}}
8+
<label class="checkbox" style="display: inline-block; font-size: 12px; margin: 0px 40px 0px 0px; color: #666; position: relative; top: 2px;">{{view Ember.Checkbox checkedBinding="view.isBetaAnalytics" action="toggleBetaAnalytics" target="view"}} Beta Analytics</label>
9+
{{/if}}
810

911
{{#if view.enableInterval}}
1012
<div id="interval_buttons" class="btn-group" data-toggle="buttons-radio">

src/api-umbrella/web-app/app/assets/javascripts/admin/views/stats/query_form_view.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Admin.StatsQueryFormView = Ember.View.extend({
33

44
enableInterval: false,
55

6+
enableBetaAnalytics: enableBetaAnalytics,
7+
68
datePickerRanges: {
79
'Today': [
810
moment().startOf('day'),

src/api-umbrella/web-app/app/views/layouts/admin.html.erb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<%= stylesheet_link_tag "admin" %>
77
<%= javascript_tag do %>
88
webAdminAjaxApiKey = <%= web_admin_ajax_api_user.api_key.to_json.html_safe %>;
9-
currentAdmin = <%= current_admin.attributes.slice("username", "superuser").to_json.html_safe %>
9+
currentAdmin = <%= current_admin.attributes.slice("username", "superuser").to_json.html_safe %>;
10+
enableBetaAnalytics = <%= (ApiUmbrellaConfig[:analytics][:adapter] == "kylin" || (ApiUmbrellaConfig[:analytics][:outputs] && ApiUmbrellaConfig[:analytics][:outputs].include?("kylin"))).to_json.html_safe %>;
1011
<% end %>
1112
<link href='//fonts.googleapis.com/css?family=Oswald:400,700' rel='stylesheet' type='text/css'>
1213
<%= javascript_include_tag "admin/locales/#{I18n.locale}" %>

src/api-umbrella/web-app/lib/tasks/jshint.rake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ begin
3636
"CommonValidations",
3737
"currentAdmin",
3838
"Ember",
39+
"enableBetaAnalytics",
3940
"google",
4041
"ic",
4142
"inflection",

src/api-umbrella/web-app/spec/features/admin/stats_logs_spec.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,22 @@
141141
page.response_headers["Content-Type"].should eql("text/csv")
142142
end
143143
end
144+
145+
describe "beta analytics option" do
146+
it "doesn't show the beta analytics option by default" do
147+
visit "/admin/#/stats/logs/tz=America%2FDenver&search=&start_at=2015-01-12&end_at=2015-01-18&interval=day"
148+
page.should_not have_content("Beta Analytics")
149+
end
150+
151+
it "shows the beta analytics toggle if kylin analytics are enabled" do
152+
original = ApiUmbrellaConfig[:analytics][:outputs]
153+
begin
154+
ApiUmbrellaConfig[:analytics][:outputs] = ["kylin"]
155+
visit "/admin/#/stats/logs/tz=America%2FDenver&search=&start_at=2015-01-12&end_at=2015-01-18&interval=day"
156+
page.should have_content("Beta Analytics")
157+
ensure
158+
ApiUmbrellaConfig[:analytics][:outputs] = original
159+
end
160+
end
161+
end
144162
end

0 commit comments

Comments
 (0)