blazer 1.7.0 → 1.7.1

data/app/assets/stylesheets/blazer/application.css

@@ -165,3 +165,16 @@ input.search:focus {
 #header a.active {
   color: #999;
 }
+
+#code {
+  max-height: 236px;
+  overflow: hidden;
+}
+
+#code.expanded {
+  max-height: none;
+}
+
+[v-cloak] {
+  display: none;
+}

data/app/controllers/blazer/base_controller.rb

@@ -17,7 +17,7 @@ module Blazer
     end
 
     if Blazer.before_action
-      before_action Blazer.before_action
+      before_action Blazer.before_action.to_sym
     end
 
     layout "blazer/application"
@@ -35,16 +35,24 @@ module Blazer
         @bind_vars.each do |var|
           value = params[var].presence
           if value
+            if ["start_time", "end_time"].include?(var)
+              value = value.to_s.gsub(" ", "+") # fix for Quip bug
+            end
+
+            if var.end_with?("_at")
+              begin
+                value = Blazer.time_zone.parse(value)
+              rescue
+                # do nothing
+              end
+            end
+
             if value =~ /\A\d+\z/
               value = value.to_i
             elsif value =~ /\A\d+\.\d+\z/
               value = value.to_f
             end
           end
-          if var.end_with?("_at")
-            value = Blazer.time_zone.parse(value) rescue nil
-          end
-          value.gsub!(" ", "+") if ["start_time", "end_time"].include?(var) # fix for Quip bug
           statement.gsub!("{#{var}}", ActiveRecord::Base.connection.quote(value))
         end
       end
@@ -72,7 +80,7 @@ module Blazer
     helper_method :extract_vars
 
     def variable_params
-      params.except(:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name, :fork_query_id, :blazer).permit!
+      params.except(:controller, :action, :id, :host, :query, :dashboard, :query_id, :query_ids, :table_names, :authenticity_token, :utf8, :_method, :commit, :statement, :data_source, :name, :fork_query_id, :blazer, :run_id).permit!
     end
     helper_method :variable_params
 
@@ -80,5 +88,11 @@ module Blazer
       send(Blazer.user_method) if Blazer.user_method && respond_to?(Blazer.user_method)
     end
     helper_method :blazer_user
+
+    def render_errors(resource)
+      @errors = resource.errors
+      action = resource.persisted? ? :edit : :new
+      render action, status: :unprocessable_entity
+    end
   end
 end

data/app/controllers/blazer/checks_controller.rb

@@ -19,17 +19,17 @@ module Blazer
       @check.creator = blazer_user if @check.respond_to?(:creator_id=) && blazer_user
 
       if @check.save
-        redirect_to run_check_path(@check)
+        redirect_to query_path(@check.query)
       else
-        render :new
+        render_errors @check
       end
     end
 
     def update
       if @check.update(check_params)
-        redirect_to run_check_path(@check)
+        redirect_to query_path(@check.query)
       else
-        render :edit
+        render_errors @check
       end
     end
 

data/app/controllers/blazer/dashboards_controller.rb

@@ -19,7 +19,7 @@ module Blazer
       if update_dashboard(@dashboard)
         redirect_to dashboard_path(@dashboard)
       else
-        render :new
+        render_errors @dashboard
       end
     end
 
@@ -49,7 +49,7 @@ module Blazer
       if update_dashboard(@dashboard)
         redirect_to dashboard_path(@dashboard, variable_params)
       else
-        render :edit
+        render_errors @dashboard
       end
     end
 

data/app/controllers/blazer/queries_controller.rb

@@ -15,12 +15,19 @@ module Blazer
       @dashboards =
         @dashboards.map do |d|
           {
-            name: "<strong>#{view_context.link_to(d.name, d)}</strong>",
+            id: d.id,
+            name: d.name,
             creator: blazer_user && d.try(:creator) == blazer_user ? "You" : d.try(:creator).try(Blazer.user_name),
-            hide: d.name.gsub(/\s+/, ""),
-            vars: nil
+            to_param: d.to_param,
+            dashboard: true
           }
         end
+
+      gon.push(
+        dashboards: @dashboards,
+        queries: @queries,
+        more: @more
+      )
     end
 
     def index
@@ -45,7 +52,7 @@ module Blazer
       if @query.save
         redirect_to query_path(@query, variable_params)
       else
-        render :new
+        render_errors @query
       end
     end
 
@@ -158,7 +165,7 @@ module Blazer
       if @query.errors.empty? && @query.update(query_params)
         redirect_to query_path(@query, variable_params)
       else
-        render :edit
+        render_errors @query
       end
     end
 
@@ -188,7 +195,7 @@ module Blazer
     end
 
     def render_run
-      @checks = @query ? @query.checks : []
+      @checks = @query ? @query.checks.order(:id) : []
 
       @first_row = @rows.first || []
       @column_types = []
@@ -250,7 +257,7 @@ module Blazer
           []
         end
 
-      @queries = Blazer::Query.named
+      @queries = Blazer::Query.named.select(:id, :name, :creator_id, :statement)
       @queries = @queries.includes(:creator) if Blazer.user_class
 
       if blazer_user && params[:filter] == "mine"
@@ -272,10 +279,10 @@ module Blazer
         @queries.map do |q|
           {
             id: q.id,
-            name: view_context.link_to(q.name, q),
+            name: q.name,
             creator: blazer_user && q.try(:creator) == blazer_user ? "You" : q.try(:creator).try(Blazer.user_name),
-            hide: q.name.gsub(/\s+/, ""),
-            vars: extract_vars(q.statement).join(", ")
+            vars: extract_vars(q.statement).join(", "),
+            to_param: q.to_param
           }
         end
     end

data/app/models/blazer/check.rb

@@ -6,10 +6,7 @@ module Blazer
     validates :query_id, presence: true
 
     before_validation :set_state
-
-    def set_state
-      self.state ||= "new"
-    end
+    before_validation :fix_emails
 
     def split_emails
       emails.to_s.downcase.split(",").map(&:strip)
@@ -65,5 +62,17 @@ module Blazer
       end
       save! if changed?
     end
+
+    private
+
+      def set_state
+        self.state ||= "new"
+      end
+
+      def fix_emails
+        # some people like doing ; instead of ,
+        # but we know what they mean, so let's fix it
+        self.emails = emails.gsub(";", ",") if emails.present?
+      end
   end
 end

data/app/views/blazer/_variables.html.erb

@@ -0,0 +1,102 @@
+<% if @bind_vars.any? %>
+  <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 10px;">
+    <% date_vars = ["start_time", "end_time"] %>
+    <% if (date_vars - @bind_vars).empty? %>
+      <% @bind_vars = @bind_vars - date_vars %>
+    <% else %>
+      <% date_vars = nil %>
+    <% end %>
+
+    <% @bind_vars.each_with_index do |var, i| %>
+      <%= label_tag var, var %>
+      <% if (data = @smart_vars[var]) %>
+        <%= select_tag var, options_for_select([[nil, nil]] + data, selected: params[var]), style: "margin-right: 20px; width: 200px; display: none;" %>
+        <script>
+          $("#<%= var %>").selectize({
+            create: true
+          });
+        </script>
+      <% else %>
+        <%= text_field_tag var, params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !params[var], class: "form-control" %>
+        <% if var.end_with?("_at") %>
+          <script>
+            $("#<%= var %>").daterangepicker({singleDatePicker: true, locale: {format: "YYYY-MM-DD"}, autoUpdateInput: false});
+            // hack to start with empty date
+            $("#<%= var %>").on("apply.daterangepicker", function(ev, picker) {
+              $(this).val(picker.startDate.format("YYYY-MM-DD"));
+              $(this).change();
+            });
+          </script>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <% if date_vars %>
+      <% date_vars.each do |var| %>
+        <%= hidden_field_tag var, params[var] %>
+      <% end %>
+
+      <%= label_tag nil, date_vars.join(" & ") %>
+      <div class="selectize-control single" style="width: 300px;">
+        <div id="reportrange" class="selectize-input" style="display: inline-block;">
+          <span>Select a time range</span>
+        </div>
+      </div>
+
+      <script>
+        var timeZone = "<%= Blazer.time_zone.tzinfo.name %>";
+        var format = "YYYY-MM-DD";
+        var now = moment.tz(timeZone);
+
+        function dateStr(daysAgo) {
+          return now.clone().subtract(daysAgo || 0, "days").format(format);
+        }
+
+        function toDate(time) {
+          return moment.tz(time.format(format), timeZone);
+        }
+
+        function setTimeInputs(start, end) {
+          $("#start_time").val(toDate(start).utc().format());
+          $("#end_time").val(toDate(end).endOf("day").utc().format());
+        }
+
+        $('#reportrange').daterangepicker(
+          {
+            ranges: {
+             "Today": [dateStr(), dateStr()],
+             "Last 7 Days": [dateStr(6), dateStr()],
+             "Last 30 Days": [dateStr(29), dateStr()]
+            },
+            locale: {
+              format: format
+            },
+            startDate: dateStr(29),
+            endDate: dateStr(),
+            opens: "right"
+          },
+          function(start, end) {
+            setTimeInputs(start, end);
+            submitIfCompleted($("#start_time").closest("form"));
+          }
+        ).on('apply.daterangepicker', function(ev, picker) {
+          setTimeInputs(picker.startDate, picker.endDate);
+          $('#reportrange span').html(toDate(picker.startDate).format('MMMM D, YYYY') + ' - ' + toDate(picker.endDate).format('MMMM D, YYYY'));
+        })
+
+        if ($("#start_time").val().length > 0) {
+          var picker = $("#reportrange").data('daterangepicker');
+          picker.setStartDate(moment.tz($("#start_time").val(), timeZone));
+          picker.setEndDate(moment.tz($("#end_time").val(), timeZone));
+          $("#reportrange").trigger('apply.daterangepicker', picker)
+        } else {
+          var picker = $("#reportrange").data('daterangepicker');
+          $("#reportrange").trigger('apply.daterangepicker', picker);
+          submitIfCompleted($("#start_time").closest("form"));
+        }
+      </script>
+    <% end %>
+
+    <input type="submit" class="btn btn-success" value="Run" style="vertical-align: top;" />
+  </form>
+<% end %>

data/app/views/blazer/checks/_form.html.erb

@@ -66,5 +66,6 @@
       <%= link_to "Delete", check_path(@check), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
     <% end %>
     <%= f.submit "Save", class: "btn btn-success" %>
+    <%= link_to "Back", :back, class: "btn btn-link" %>
   </p>
 <% end %>

data/app/views/blazer/checks/index.html.erb

@@ -32,7 +32,7 @@
         </td>
         <td style="text-align: right; padding: 1px;">
           <%= link_to "Edit", edit_check_path(check), class: "btn btn-info" %>
-          <%= link_to "Run Now", run_check_path(check), target: "_blank", class: "btn btn-primary" %>
+          <%= link_to "Run Now", query_path(check.query), class: "btn btn-primary" %>
         </td>
       </tr>
     <% end %>

data/app/views/blazer/dashboards/_form.html.erb

@@ -43,9 +43,10 @@
   </div>
   <p>
     <% if @dashboard.persisted? %>
-      <%= link_to "Delete", dashboard_path(@dashboard), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger" %>
+      <%= link_to "Delete", dashboard_path(@dashboard), method: :delete, "data-confirm" => "Are you sure?", class: "btn btn-danger"%>
     <% end %>
     <%= f.submit "Save", class: "btn btn-success" %>
+    <%= link_to "Back", :back, class: "btn btn-link" %>
   </p>
 <% end %>
 
@@ -54,20 +55,4 @@
     $(this).parents("li:first").remove();
   });
   Sortable.create($(".list-group").get(0));
-
-  // $("form").submit( function () {
-  //   var query_ids = $("li").map( function () {
-  //     return $(this).attr("data-query-id");
-  //   });
-  //   console.log(query_ids.join(","));
-  //   return false;
-  // });
-
-  // var editableList = Sortable.create($(".list-group").get(0), {
-  //   filter: '.js-remove',
-  //   onFilter: function (evt) {
-  //     var el = editableList.closest(evt.item); // get dragged item
-  //     el && el.parentNode.removeChild(el);
-  //   }
-  // });
 </script>

data/app/views/blazer/dashboards/show.html.erb

@@ -25,101 +25,7 @@
   </p>
 <% end %>
 
-<% if @bind_vars.any? %>
-  <form id="bind" method="get" action="<%= dashboard_path(@dashboard, variable_params) %>" class="form-inline" style="margin-bottom: 10px;">
-    <% date_vars = ["start_time", "end_time"] %>
-    <% if (date_vars - @bind_vars).empty? %>
-      <% @bind_vars = @bind_vars - date_vars %>
-    <% else %>
-      <% date_vars = nil %>
-    <% end %>
-
-    <% @bind_vars.each_with_index do |var, i| %>
-      <%= label_tag var, var %>
-      <% if (data = @smart_vars[var]) %>
-        <%= select_tag var, options_for_select([[nil, nil]] + data, selected: params[var]), style: "margin-right: 20px; width: 200px; display: none;" %>
-        <script>
-          $("#<%= var %>").selectize({
-            create: true
-          });
-        </script>
-      <% else %>
-        <%= text_field_tag var, params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !params[var], class: "form-control" %>
-        <% if var.end_with?("_at") %>
-          <script>
-            $("#<%= var %>").daterangepicker({singleDatePicker: true, locale: {format: "YYYY-MM-DD"}});
-          </script>
-        <% end %>
-      <% end %>
-    <% end %>
-
-    <% if date_vars %>
-      <% date_vars.each do |var| %>
-        <%= hidden_field_tag var, params[var] %>
-      <% end %>
-
-      <%= label_tag nil, date_vars.join(" & ") %>
-      <div class="selectize-control single" style="width: 300px;">
-        <div id="reportrange" class="selectize-input" style="display: inline-block;">
-          <span>Select a time range</span>
-        </div>
-      </div>
-
-      <script>
-        var timeZone = "<%= Blazer.time_zone.tzinfo.name %>";
-        var format = "YYYY-MM-DD";
-        var now = moment.tz(timeZone);
-
-        function dateStr(daysAgo) {
-          return now.clone().subtract(daysAgo || 0, "days").format(format);
-        }
-
-        function toDate(time) {
-          return moment.tz(time.format(format), timeZone);
-        }
-
-        function setTimeInputs(start, end) {
-          $("#start_time").val(toDate(start).utc().format());
-          $("#end_time").val(toDate(end).endOf("day").utc().format());
-        }
-
-        $('#reportrange').daterangepicker(
-          {
-            ranges: {
-             "Today": [dateStr(), dateStr()],
-             "Last 7 Days": [dateStr(6), dateStr()],
-             "Last 30 Days": [dateStr(29), dateStr()]
-            },
-            locale: {
-              format: format
-            },
-            startDate: dateStr(29),
-            endDate: dateStr(),
-            opens: "left"
-          },
-          function(start, end) {
-            setTimeInputs(start, end);
-            submitIfCompleted($("#start_time").closest("form"));
-          }
-        ).on('apply.daterangepicker', function(ev, picker) {
-          setTimeInputs(picker.startDate, picker.endDate);
-          $('#reportrange span').html(toDate(picker.startDate).format('MMMM D, YYYY') + ' - ' + toDate(picker.endDate).format('MMMM D, YYYY'));
-        })
-
-        if ($("#start_time").val().length > 0) {
-          var picker = $("#reportrange").data('daterangepicker');
-          picker.setStartDate(moment.tz($("#start_time").val(), timeZone));
-          picker.setEndDate(moment.tz($("#end_time").val(), timeZone));
-          $("#reportrange").trigger('apply.daterangepicker', picker)
-        } else {
-          var picker = $("#reportrange").data('daterangepicker');
-          $("#reportrange").trigger('apply.daterangepicker', picker);
-          submitIfCompleted($("#start_time").closest("form"));
-        }
-      </script>
-    <% end %>
-  </form>
-<% end %>
+<%= render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)} %>
 
 <% @queries.each_with_index do |query, i| %>
   <div style="padding-top: 10px; clear: both;">
@@ -139,9 +45,3 @@
     });
   </script>
 <% end %>
-
-<script>
-  $(".form-inline input, .form-inline select").change( function () {
-    submitIfCompleted($(this).closest("form"));
-  });
-</script>