Merge branch '196-disable-agents' of https://github.com/alias1/huginn into alias1-196-disable-agents

app/assets/stylesheets/application.css.scss.erb

@@ -133,4 +133,10 @@ span.not-applicable:after {
   position: relative;
   width: 940px;
   height: 400px;
-}
+}
+
+// Disabled
+
+.agent-disabled {
+  opacity: 0.5;
+}

app/controllers/agents_controller.rb

@@ -113,7 +113,13 @@ class AgentsController < ApplicationController
 
     respond_to do |format|
       if @agent.update_attributes(params[:agent])
-        format.html { redirect_to agents_path, notice: 'Your Agent was successfully updated.' }
+        format.html {
+          if params[:return] == "show"
+            redirect_to agent_path(@agent), notice: 'Your Agent was successfully updated.'
+          else
+            redirect_to agents_path, notice: 'Your Agent was successfully updated.'
+          end
+        }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }

app/helpers/application_helper.rb

@@ -8,10 +8,12 @@ module ApplicationHelper
   end
 
   def working(agent)
-    if agent.working?
+    if agent.disabled?
+      '<span class="label label-warning">Disabled</span>'.html_safe
+    elsif agent.working?
       '<span class="label label-success">Yes</span>'.html_safe
     else
-      link_to '<span class="label label-warning">No</span>'.html_safe, agent_path(agent, :tab => (agent.recent_error_logs? ? 'logs' : 'details'))
+      link_to '<span class="label btn-danger">No</span>'.html_safe, agent_path(agent, :tab => (agent.recent_error_logs? ? 'logs' : 'details'))
     end
   end
 end

app/helpers/dot_helper.rb

@@ -22,16 +22,20 @@ module DotHelper
     '"%s"' % string.gsub(/\\/, "\\\\\\\\").gsub(/"/, "\\\\\"")
   end
 
+  def disabled_label(agent)
+    agent.disabled? ? dot_id(agent.name + " (Disabled)") : dot_id(agent.name)
+  end
+
   def agents_dot(agents, rich = false)
     "digraph foo {".tap { |dot|
       agents.each.with_index do |agent, index|
         if rich
-          dot << '%s[URL=%s];' % [dot_id(agent.name), dot_id(agent_path(agent.id))]
+          dot << '%s[URL=%s];' % [disabled_label(agent), dot_id(agent_path(agent.id))]
         else
-          dot << '%s;' % dot_id(agent.name)
+          dot << '%s;' % disabled_label(agent)
         end
         agent.receivers.each do |receiver|
-          dot << "%s->%s;" % [dot_id(agent.name), dot_id(receiver.name)]
+          dot << "%s->%s;" % [disabled_label(agent), disabled_label(receiver)]
         end
       end
       dot << "}"

app/models/agent.rb

@@ -22,7 +22,7 @@ class Agent < ActiveRecord::Base
 
   EVENT_RETENTION_SCHEDULES = [["Forever", 0], ["1 day", 1], *([2, 3, 4, 5, 7, 14, 21, 30, 45, 90, 180, 365].map {|n| ["#{n} days", n] })]
 
-  attr_accessible :options, :memory, :name, :type, :schedule, :source_ids, :keep_events_for, :propagate_immediately
+  attr_accessible :options, :memory, :name, :type, :schedule, :disabled, :source_ids, :keep_events_for, :propagate_immediately
 
   json_serialize :options, :memory
 
@@ -86,8 +86,8 @@ class Agent < ActiveRecord::Base
 
   def create_event(attrs)
     if can_create_events?
-      events.create!({ 
-         :user => user, 
+      events.create!({
+         :user => user,
          :expires_at => new_event_expiration_date
       }.merge(attrs))
     else
@@ -117,7 +117,7 @@ class Agent < ActiveRecord::Base
     if keep_events_for == 0
       events.update_all :expires_at => nil
     else
-      events.update_all "expires_at = " + rdbms_date_add("created_at", "DAY", keep_events_for.to_i) 
+      events.update_all "expires_at = " + rdbms_date_add("created_at", "DAY", keep_events_for.to_i)
     end
   end
 
@@ -275,11 +275,11 @@ class Agent < ActiveRecord::Base
                 joins("JOIN links ON (links.receiver_id = agents.id)").
                 joins("JOIN agents AS sources ON (links.source_id = sources.id)").
                 joins("JOIN events ON (events.agent_id = sources.id AND events.id > links.event_id_at_creation)").
-                where("agents.last_checked_event_id IS NULL OR events.id > agents.last_checked_event_id")
+                where("NOT agents.disabled AND (agents.last_checked_event_id IS NULL OR events.id > agents.last_checked_event_id)")
         if options[:only_receivers].present?
           scope = scope.where("agents.id in (?)", options[:only_receivers])
         end
- 
+
         sql = scope.to_sql()
 
         agents_to_events = {}
@@ -310,6 +310,7 @@ class Agent < ActiveRecord::Base
     def async_receive(agent_id, event_ids)
       agent = Agent.find(agent_id)
       begin
+        return if agent.disabled?
         agent.receive(Event.where(:id => event_ids))
         agent.last_receive_at = Time.now
         agent.save!
@@ -334,7 +335,7 @@ class Agent < ActiveRecord::Base
     # per type of agent, so you can override this to define custom bulk check behavior for your custom Agent type.
     def bulk_check(schedule)
       raise "Call #bulk_check on the appropriate subclass of Agent" if self == Agent
-      where(:schedule => schedule).pluck("agents.id").each do |agent_id|
+      where("agents.schedule = ? and disabled = false", schedule).pluck("agents.id").each do |agent_id|
         async_check(agent_id)
       end
     end
@@ -347,6 +348,7 @@ class Agent < ActiveRecord::Base
     def async_check(agent_id)
       agent = Agent.find(agent_id)
       begin
+        return if agent.disabled?
         agent.check
         agent.last_check_at = Time.now
         agent.save!

app/views/agents/_form.html.erb

@@ -64,7 +64,7 @@
       <span class='cannot-receive-events text-info'>This type of Agent cannot receive events.</span>
       <span class="propagate-immediately"><br>
          <%= f.label :propagate_immediately, :class => 'control-label' do %>Propagate immediately
-            <%= f.check_box :propagate_immediately %> 
+            <%= f.check_box :propagate_immediately %>
          <% end %>
       </span>
     </div>

app/views/agents/index.html.erb

@@ -18,7 +18,11 @@
         </tr>
 
         <% @agents.each do |agent| %>
-          <tr>
+          <% if agent.disabled? %>
+            <tr class='agent-disabled'>
+          <% else %>
+            <tr>
+          <% end %>
             <td>
               <%= agent.name %>
               <br/>
@@ -62,13 +66,22 @@
             <td><%= working(agent) %></td>
             <td>
               <div class="btn-group">
-                <%= link_to 'Show', agent_path(agent), class: "btn btn-mini" %>
-                <%= link_to 'Edit', edit_agent_path(agent), class: "btn btn-mini" %>
-                <%= link_to 'Delete', agent_path(agent), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-mini" %>
-                <% if agent.can_be_scheduled? %>
-                  <%= link_to 'Run', run_agent_path(agent, :return => "index"), method: :post, class: "btn btn-mini" %>
+                <%= link_to 'Show', agent_path(agent), class: "btn btn-mini btn-primary" %>
+
+                <%= link_to 'Edit', edit_agent_path(agent), class: "btn btn-mini btn-primary" %>
+
+                <% if agent.disabled? %>
+                  <%= link_to "Enable", agent_path(agent, :agent => { :disabled => false }), :method => :put, class: "btn btn-mini btn-success"%>
+                <% else %>
+                  <%= link_to "Disable", agent_path(agent, :agent => { :disabled => true }), :method => :put, class: "btn btn-mini btn-warning"%>
+                <% end %>
+
+                <%= link_to 'Delete', agent_path(agent), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-mini btn-danger" %>
+
+                <% if agent.can_be_scheduled? && !agent.disabled? %>
+                  <%= link_to 'Run', run_agent_path(agent, :return => "index"), method: :post, class: "btn btn-mini btn-success" %>
                 <% else %>
-                  <%= link_to 'Run', "#", class: "btn btn-mini disabled" %>
+                  <span class='btn btn-mini disabled'>Run</span>
                 <% end %>
               </div>
             </td>

app/views/agents/show.html.erb

@@ -4,6 +4,7 @@
 
       <div class="tabbable tabs-left">
         <ul class="nav nav-tabs" id="show-tabs">
+          <li><%= link_to '<i class="icon-chevron-left"></i> Agents'.html_safe, agents_path %></li>
           <% if agent_show_view(@agent).present? %>
             <li class='active'><a href="#summary" data-toggle="tab"><i class='icon-picture'></i> Summary</a></li>
             <li><a href="#details" data-toggle="tab"><i class='icon-indent-left'></i> Details</a></li>
@@ -15,29 +16,37 @@
 
           <% if @agent.can_create_events? && @agent.events.count > 0 %>
             <li><%= link_to '<i class="icon-random"></i> Events'.html_safe, events_path(:agent => @agent.to_param) %></li>
+          <% else %>
+            <li class='disabled'><a><i class='icon-random'></i> Events</a></li>
           <% end %>
-          <li><%= link_to '<i class="icon-chevron-left"></i> Back'.html_safe, agents_path %></li>
-          <li><%= link_to '<i class="icon-pencil"></i> Edit'.html_safe, edit_agent_path(@agent) %></li>
-          <li><%= link_to '<i class="icon-plus"></i> Clone'.html_safe, new_agent_path(id: @agent) %></li>
-
-          <% if @agent.can_be_scheduled? || @agent.events.count > 0 %>
-            <li class="dropdown">
-              <a class="dropdown-toggle" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a>
-              <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                <% if @agent.can_be_scheduled? %>
-                  <li>
-                    <%= link_to '<i class="icon-refresh"></i> Run'.html_safe, run_agent_path(@agent, :return => "show"), method: :post, :tabindex => "-1" %>
-                  </li>
-                <% end %>
 
-                <% if @agent.can_create_events? && @agent.events.count > 0 %>
-                  <li>
-                    <%= link_to '<i class="icon-trash"></i> Delete all events'.html_safe, remove_events_agent_path(@agent), method: :delete, data: {confirm: 'Are you sure you want to delete ALL events for this Agent?'}, :tabindex => "-1" %>
-                  </li>
+          <li class="dropdown">
+            <a class="dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-th-list"></i> Actions <b class="caret"></b></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+              <% if @agent.can_be_scheduled? && !@agent.disabled? %>
+                <li>
+                  <%= link_to '<i class="icon-refresh"></i> Run'.html_safe, run_agent_path(@agent, :return => "show"), method: :post, :tabindex => "-1" %>
+                </li>
+              <% end %>
+
+              <li><%= link_to '<i class="icon-pencil"></i> Edit'.html_safe, edit_agent_path(@agent) %></li>
+              <li><%= link_to '<i class="icon-plus"></i> Clone'.html_safe, new_agent_path(id: @agent) %></li>
+
+              <li>
+                <% if !@agent.disabled? %>
+                  <%= link_to '<i class="icon-pause"></i> Disable agent'.html_safe, agent_path(@agent, :agent => { :disabled => true }, :return => "show"), :method => :put %>
+                <% else %>
+                  <%= link_to '<i class="icon-play"></i> Enable agent'.html_safe, agent_path(@agent, :agent => { :disabled => false }, :return => "show"), :method => :put %>
                 <% end %>
-              </ul>
-            </li>
-          <% end %>
+              </li>
+
+              <% if @agent.can_create_events? && @agent.events.count > 0 %>
+                <li>
+                  <%= link_to '<i class="icon-trash"></i> Delete all events'.html_safe, remove_events_agent_path(@agent), method: :delete, data: {confirm: 'Are you sure you want to delete ALL events for this Agent?'}, :tabindex => "-1" %>
+                </li>
+              <% end %>
+            </ul>
+          </li>
         </ul>
 
         <div class="tab-content">

app/views/events/index.html.erb

@@ -25,7 +25,7 @@
             <div class="btn-group">
               <%= link_to 'Show', event_path(event), class: "btn btn-mini" %>
               <%= link_to 'Re-emit', reemit_event_path(event), method: :post, data: { confirm: 'Are you sure you want to duplicate this event and emit the new one now?' }, class: "btn btn-mini" %>
-              <%= link_to 'Delete', event_path(event), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-mini" %>
+              <%= link_to 'Delete', event_path(event), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-mini btn-danger" %>
             </div>
           </td>
         </tr>

db/migrate/20140403043556_add_disabled_to_agent.rb

@@ -0,0 +1,5 @@
+class AddDisabledToAgent < ActiveRecord::Migration
+  def change
+    add_column :agents, :disabled, :boolean, :default => false, :null => false
+  end
+end

db/schema.rb

@@ -41,6 +41,7 @@ ActiveRecord::Schema.define(:version => 20140408150825) do
     t.datetime "last_event_at"
     t.datetime "last_error_log_at"
     t.boolean  "propagate_immediately",                       :default => false, :null => false
+    t.boolean  "disabled",                                    :default => false, :null => false
   end
 
   add_index "agents", ["schedule"], :name => "index_agents_on_schedule"