rocketjob_mission_control 3.0.3 → 3.1.0

data/app/assets/stylesheets/rocket_job_mission_control/callout.scss

@@ -4,9 +4,9 @@
   border-left-width: 0.5em;
 }
 .callout-queued {
-  border-left-color: darkgrey;
+  border-left-color: #A29F00;
   a {
-    color: darkgrey;
+    color: #A29F00;
   }
 }
 .callout-running {
@@ -15,6 +15,18 @@
     color: #337ab7;
   }
 }
+.callout-sleeping {
+  border-left-color: darkcyan;
+  a {
+    color: darkcyan;
+  }
+}
+.callout-scheduled {
+  border-left-color: #92001B;
+  a {
+    color: #92001B;
+  }
+}
 .callout-completed {
   border-left-color: green;
   a {

data/app/datatables/rocket_job_mission_control/active_workers_datatable.rb

@@ -21,7 +21,7 @@ module RocketJobMissionControl
     def worker_name_with_icon(active_worker, job)
       state = active_worker.zombie? ? :zombie : job.state
       <<-EOS
-        <i class="fa #{state_icon(state)}" style="font-size: 75%" title="#{state}"></i>
+        <i class="#{state_icon(state)}" style="font-size: 75%" title="#{state}"></i>
         #{active_worker.name}
       EOS
     end

data/app/datatables/rocket_job_mission_control/dirmon_entries_datatable.rb

@@ -16,7 +16,7 @@ module RocketJobMissionControl
     def name_with_link(dirmon)
       <<-EOS
         <a href="#{dirmon_entry_path(dirmon.id)}">
-          <i class="fa #{state_icon(dirmon.state)}" style="font-size: 75%" title="#{dirmon.state}"></i>
+          <i class="#{state_icon(dirmon.state)}" style="font-size: 75%" title="#{dirmon.state}"></i>
           #{dirmon.name}
         </a>
       EOS

data/app/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -1,10 +1,10 @@
 module RocketJobMissionControl
   class JobsDatatable < AbstractDatatable
-    delegate :job_path, :job_icon, :edit_job_path,
+    delegate :job_path, :job_icon, :edit_job_path, :state_icon, :job_state,
              :abort_job_path, :job_path, :fail_job_path, :run_now_job_path, :pause_job_path,
              :resume_job_path, :retry_job_path, :exception_job_path, :job_action_link, :exceptions_job_path, to: :@view
 
-    COMMON_FIELDS = [:id, :_type, :description, :completed_at, :created_at, :started_at, :state].freeze
+    COMMON_FIELDS = [:id, :_type, :description, :completed_at, :created_at, :started_at, :state, :worker_name].freeze
 
     ABORTED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type', width: '30%'},
@@ -13,15 +13,6 @@ module RocketJobMissionControl
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
 
-    ALL_COLUMNS = [
-      {display: 'Class', value: :class_with_link, field: '_type'},
-      {display: 'Description', value: :description, field: 'description'},
-      {display: 'Created', value: :created_at, field: 'created_at'},
-      {display: 'Duration', value: :duration, field: 'duration', orderable: false},
-      {display: 'Actions', value: :action_buttons, orderable: false}
-    ]
-    ALL_FIELDS  = COMMON_FIELDS + [:run_at].freeze
-
     COMPLETED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type', width: '30%'},
       {display: 'Description', value: :description, field: 'description', width: '30%'},
@@ -43,17 +34,18 @@ module RocketJobMissionControl
       {display: 'Queued For', value: :duration, field: 'duration', orderable: false},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
-    QUEUED_FIELDS  = COMMON_FIELDS + [:run_at, :priority].freeze
+    QUEUED_FIELDS  = (COMMON_FIELDS + [:run_at, :priority]).freeze
 
     RUNNING_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type'},
       {display: 'Description', value: :description, field: 'description'},
       {display: 'Progress', value: :progress, field: 'percent_complete', orderable: false},
+      {display: 'Workers', value: :worker_count, field: 'worker_count', orderable: false},
       {display: 'Priority', value: :priority, field: 'priority'},
       {display: 'Started', value: :started, field: 'started_at'},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
-    RUNNING_FIELDS  = COMMON_FIELDS + [:record_count, :collect_output, :input_categories, :output_categories, :encrypt, :compress, :slice_size, :priority, :sub_state, :percent_complete].freeze
+    RUNNING_FIELDS  = (COMMON_FIELDS + [:record_count, :collect_output, :input_categories, :output_categories, :encrypt, :compress, :slice_size, :priority, :sub_state, :percent_complete]).freeze
 
     SCHEDULED_COLUMNS = [
       {display: 'Class', value: :class_with_link, field: '_type'},
@@ -62,7 +54,16 @@ module RocketJobMissionControl
       {display: 'Cron Schedule', value: :cron_schedule, field: 'cron_schedule'},
       {display: 'Actions', value: :action_buttons, orderable: false}
     ]
-    SCHEDULED_FIELDS  = COMMON_FIELDS + [:run_at, :cron_schedule].freeze
+    SCHEDULED_FIELDS  = (COMMON_FIELDS + [:run_at, :cron_schedule]).freeze
+
+    ALL_COLUMNS = [
+      {display: 'Class', value: :class_with_link, field: '_type'},
+      {display: 'Description', value: :description, field: 'description'},
+      {display: 'Created', value: :created_at, field: 'created_at'},
+      {display: 'Duration', value: :duration, field: 'duration', orderable: false},
+      {display: 'Actions', value: :action_buttons, orderable: false}
+    ]
+    ALL_FIELDS  = (QUEUED_FIELDS + RUNNING_FIELDS + SCHEDULED_FIELDS).uniq.freeze
 
     def initialize(view, query, columns)
       @columns = columns
@@ -83,7 +84,7 @@ module RocketJobMissionControl
         h[index.to_s] = send(column[:value], job)
         index         += 1
       end
-      h['DT_RowClass'] = "card callout callout-#{job.state}"
+      h['DT_RowClass'] = "card callout callout-#{job_state(job)}"
       h
     end
 
@@ -91,7 +92,7 @@ module RocketJobMissionControl
     def class_with_link(job)
       <<-EOS
         <a class='job-link' href="#{job_path(job.id)}">
-          <i class="fa #{job_icon(job)}" style="font-size: 75%" title="#{job.state}"></i>
+          <i class="#{job_icon(job)}" style="font-size: 75%" title="#{job_state(job)}"></i>
           #{job.class.name}
         </a>
       EOS
@@ -113,6 +114,10 @@ module RocketJobMissionControl
       h(job.priority)
     end
 
+    def worker_count(job)
+      h(job.worker_count)
+    end
+
     def started(job)
       "#{RocketJob.seconds_as_duration(Time.now - (job.started_at || Time.now))} ago" if job.started_at
     end

data/app/datatables/rocket_job_mission_control/servers_datatable.rb

@@ -23,7 +23,7 @@ module RocketJobMissionControl
 
     def name_with_icon(server)
       <<-EOS
-        <i class="fa #{server_icon(server)}" style="font-size: 75%" title="#{server.state}"></i>
+        <i class="#{server_icon(server)}" style="font-size: 75%" title="#{server.state}"></i>
         #{server.name}
       EOS
     end

data/app/helpers/rocket_job_mission_control/application_helper.rb

@@ -1,19 +1,20 @@
 module RocketJobMissionControl
   module ApplicationHelper
     STATE_ICON_MAP = {
-      aborted:   'fa-stop',
-      completed: 'fa-check',
-      disabled:  'fa-stop',
-      enabled:   'fa-check',
-      failed:    'fa-exclamation-triangle',
-      paused:    'fa-pause',
-      pending:   'fa-inbox',
-      queued:    'fa-inbox',
-      running:   'fa-play',
-      scheduled: 'fa-clock-o',
-      starting:  'fa-cogs',
-      stopping:  'fa-stop',
-      zombie:    'fa-hourglass-o'
+      aborted:   'fas fa-stop',
+      completed: 'fas fa-check',
+      disabled:  'fas fa-stop',
+      enabled:   'fas fa-check',
+      failed:    'fas fa-exclamation-triangle',
+      paused:    'fas fa-pause',
+      pending:   'fas fa-inbox',
+      queued:    'fas fa-inbox',
+      running:   'fas fa-play',
+      sleeping:  'fas fa-hourglass',
+      scheduled: 'fas fa-clock',
+      starting:  'fas fa-cogs',
+      stopping:  'fas fa-stop',
+      zombie:    'fas fa-hourglass'
     }
 
     def state_icon(state)
@@ -43,12 +44,14 @@ module RocketJobMissionControl
     # Returns nil when there are no inclusion values for this attribute.
     def extract_inclusion_values(klass, attribute)
       values = nil
+
       klass.validators_on(attribute).each do |validator|
         case validator
         when ActiveModel::Validations::InclusionValidator
           values = validator.options[:in]
         end
       end
+
       values
     end
 
@@ -67,7 +70,7 @@ module RocketJobMissionControl
         options = extract_inclusion_values(klass, field_name)
         str     = "[#{field.type.name}]\n".html_safe
         if options
-          str + f.select(field_name, options, {include_blank: options.include?(nil) || include_nil_selectors, selected: value}, {class: 'form-control'})
+          str + f.select(field_name, options, { include_blank: options.include?(nil) || include_nil_selectors, selected: value }, { class: 'selectize form-control' })
         else
           if field.type.name == 'Integer'
             str + f.number_field(field_name, value: value, class: 'form-control', placeholder: placeholder)
@@ -81,7 +84,7 @@ module RocketJobMissionControl
       when 'Array'
         options = Array(value)
         "[Array]\n".html_safe +
-          f.select(field_name, options_for_select(options, options), {include_hidden: false}, {class: 'selectize', multiple: true})
+          f.select(field_name, options_for_select(options, options), { include_hidden: false }, { class: 'selectize form-control', multiple: true })
       when 'Mongoid::Boolean'
         name = "#{field_name}_true".to_sym
         value = value.to_s
@@ -102,6 +105,5 @@ module RocketJobMissionControl
           f.text_field(field_name, value: value, class: 'form-control', placeholder: placeholder)
       end
     end
-
   end
 end

data/app/helpers/rocket_job_mission_control/jobs_helper.rb

@@ -1,15 +1,20 @@
 module RocketJobMissionControl
   module JobsHelper
     def job_icon(job)
-      state =
-        if job.scheduled?
-          :scheduled
-        else
-          job.state
-        end
+      state = job_state(job)
       state_icon(state)
     end
 
+    def job_state(job)
+      if job.scheduled?
+        :scheduled
+      elsif job.sleeping?
+        :sleeping
+      else
+        job.state
+      end
+    end
+
     def job_states
       @job_states ||= RocketJob::Job.aasm.states.map { |state| state.name.to_s }
     end

data/app/views/layouts/rocket_job_mission_control/application.html.erb

@@ -1,43 +1,45 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title><%= title %></title>
+  <head>
+    <title><%= title %></title>
 
-  <link href="/assets/favicon.png" rel="icon" type="image/png">
-  <link href="/assets/apple-touch-icon.png" rel="apple-touch-icon-precomposed">
+    <link rel="icon" type="image/png" sizes="16x16" href="<%= image_path('rocket_job_mission_control/favicon-16x16.png') %>">
+    <link rel="icon" type="image/png" sizes="32x32" href="<%= image_path('rocket_job_mission_control/favicon-32x32.png') %>">
+    <link rel="apple-touch-icon" sizes="180x180" href="<%= image_path('rocket_job_mission_control/apple-touch-icon.png') %>">
+    <link rel="mask-icon" href="<%= image_path('rocket_job_mission_control/safari-pinned-tab.svg') %>" color="#5bbad5">
 
-  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-  <meta content="text/javascript" http-equiv="Content-Script-Type">
-  <meta content="IE=edge" http-equiv="X-UA-Compatible">
-  <meta content="width=device-width, initial-scale=1" name="viewport">
-  <%= yield :meta %>
+    <meta content="#da532c" name="msapplication-TileColor">
+    <meta content="#ffffff" name="theme-color">
+    <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
+    <meta content='text/javascript' http-equiv='Content-Script-Type'>
+    <meta content='IE=edge' http-equiv='X-UA-Compatible'>
+    <meta content='width=device-width, initial-scale=1' name='viewport'>
 
-  <%= stylesheet_link_tag "rocket_job_mission_control/application", :media => "all" %>
-  <%= javascript_include_tag "rocket_job_mission_control/application" %>
+    <%= yield :meta %>
 
-  <%= csrf_meta_tag %>
+    <%= stylesheet_link_tag 'rocket_job_mission_control/application', media: 'all' %>
+    <%= javascript_include_tag 'rocket_job_mission_control/application' %>
 
-  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">
-</head>
+    <%= csrf_meta_tag %>
+  </head>
 
-<body class="rocket_job">
-<div id="wrapper">
-  <div class="container-fluid">
-    <div class="row row-offcanvas row-offcanvas-left">
-      <%= render partial: 'layouts/rocket_job_mission_control/partials/sidebar' %>
+  <body class='rocket_job'>
+    <div id='wrapper'>
+      <div class='container-fluid'>
+        <div class='row row-offcanvas row-offcanvas-left'>
+          <%= render partial: 'layouts/rocket_job_mission_control/partials/sidebar' %>
 
-      <div class="col-sm-10 col-xs-11 white-background" id="main">
-        <%= render partial: 'layouts/rocket_job_mission_control/partials/header' %>
+          <div class='col-sm-10 col-xs-11 white-background' id='main'>
+            <%= render partial: 'layouts/rocket_job_mission_control/partials/header' %>
 
-        <div id="content">
-          <%= render partial: 'layouts/rocket_job_mission_control/partials/flash' %>
+            <div id='content'>
+              <%= render partial: 'layouts/rocket_job_mission_control/partials/flash' %>
 
-          <%= yield %>
+              <%= yield %>
+            </div>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-</div>
-
-</body>
+  </body>
 </html>

data/app/views/layouts/rocket_job_mission_control/partials/_flash.html.erb

@@ -1,12 +1,13 @@
 <% if flash.present? %>
-  <div class="flash text-center">
+  <div class='flash text-center'>
     <% flash.each do |key, msg| %>
-      <div class="alert alert-alert alert-dismissable" role="alert">
-        <button class="close" data-dismiss="alert">
+      <div class='alert alert-alert alert-dismissable' role='alert'>
+        <button class='close' data-dismiss='alert'>
           <span>&times;</span>
         </button>
+
         <% if msg.kind_of? Array %>
-          <ul class="list-unstyled margin-bottom-0">
+          <ul class='list-unstyled margin-bottom-0'>
             <% msg.each do |m| %>
               <li><%= m.html_safe %></li>
             <% end %>

data/app/views/layouts/rocket_job_mission_control/partials/_header.html.erb

@@ -1,44 +1,48 @@
-<nav class="navbar navbar-default" id="header">
-  <div class="container-fluid">
-    <div class="navbar-header">
-      <button aria-expanded="false" class="navbar-toggle collapsed" data-target=".navbar-collapse" data-toggle="collapse" type="button">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
+<nav class='navbar navbar-default' id='header'>
+  <div class='container-fluid'>
+    <div class='navbar-header'>
+      <button aria-expanded='false' class='navbar-toggle collapsed' data-target='.navbar-collapse' data-toggle='collapse' type='button'>
+        <span class='sr-only'>Toggle navigation</span>
+        <span class='icon-bar'></span>
+        <span class='icon-bar'></span>
+        <span class='icon-bar'></span>
       </button>
-      <a class="navbar-brand brand" href="http://rocketjob.io" target="_blank">
+
+      <a class='navbar-brand brand' href='http://rocketjob.io' target='_blank'>
         <%= image_tag('rocket_job_mission_control/rocket-icon-64x64.png') %>
         Rocket Job
       </a>
     </div>
-    <div class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
+
+    <div class='navbar-collapse collapse'>
+      <ul class='nav navbar-nav'>
         <li>
           <%= link_to running_jobs_path, class: active_page(running_jobs_path) do %>
-            <i class="fa fa-home"></i> Jobs
+            <i class='fas fa-home'></i> Jobs
           <% end %>
         </li>
+
         <li>
           <%= link_to servers_path, class: active_page(servers_path) do %>
-            <i class="fa fa-database"></i> Servers
+            <i class='fas fa-database'></i> Servers
           <% end %>
         </li>
+
         <li>
           <%= link_to active_workers_path, class: active_page(active_workers_path) do %>
-            <i class="fa fa-circle-o-notch"></i> Workers
+            <i class='fas fa-circle-notch'></i> Workers
           <% end %>
         </li>
+
         <li>
           <%= link_to enabled_dirmon_entries_path, class: active_page(enabled_dirmon_entries_path) do %>
-            <i class="fa fa-folder-o"></i> Directory Monitoring
+            <i class='fas fa-folder'></i> Directory Monitoring
           <% end %>
         </li>
       </ul>
-      <ul class="nav navbar-nav navbar-right">
-        <li>
-          <a href="/">Home</a>
-        </li>
+
+      <ul class='nav navbar-nav navbar-right'>
+        <li><a href='/'><i class='fas fa-home'></i> Home</a></li>
       </ul>
     </div>
   </div>

data/app/views/layouts/rocket_job_mission_control/partials/_sidebar.html.erb

@@ -1,11 +1,12 @@
-<div class="col-sm-2 col-xs-1 sidebar-offcanvas" id="sidebar">
-  <ul class="nav">
+<div class='col-sm-2 col-xs-1 sidebar-offcanvas' id='sidebar'>
+  <ul class='nav'>
     <li>
-      <a class="visible-xs" data-toggle="offcanvas" href="#">
-        <i class="fa fa-chevron-right"></i>
+      <a class='visible-xs' data-toggle='offcanvas' href='#'>
+        <i class='fas fa-chevron-right'></i>
       </a>
     </li>
   </ul>
+
   <%= render partial: 'rocket_job_mission_control/jobs/sidebar' if @jobs_sidebar %>
   <%= render partial: 'rocket_job_mission_control/dirmon_entries/sidebar' if @dirmon_sidebar %>
   <%= render partial: 'rocket_job_mission_control/servers/sidebar' if @servers_sidebar %>

data/app/views/rocket_job_mission_control/active_workers/index.html.erb

@@ -1,21 +1,25 @@
-<div class="job-list">
-  <div class="list">
-    <div class="row">
-      <div class="col-sm-10">
+<div class='job-list'>
+  <div class='list'>
+    <div class='row'>
+      <div class='col-sm-10'>
         <h2>Active Workers</h2>
+
         <% if @server_name %>
           <h4><%= " For Server: #{@server_name}" %></h4>
         <% end %>
+
         <% if @job %>
           <h4> For Job: <%= link_to(@job.class.name, job_path(@job)) %> ID:<%= link_to(@job.id, job_path(@job)) %></h4>
         <% end %>
       </div>
-      <div class="col-sm-2">
-        <div class="btn btn-default pull-right dt-reload" data-behavior="reload">
-          <i class="fa fa-refresh"></i>
+
+      <div class='col-sm-2'>
+        <div class='btn btn-default pull-right dt-reload' data-behavior='reload'>
+          <i class='fas fa-sync'></i>
         </div>
       </div>
     </div>
+
     <table class='table datatable active-workers-datatable' data-source='<%= active_workers_url(format: 'json') %>' style='width: 100%'>
       <thead>
         <tr>
@@ -25,6 +29,7 @@
           <th>Started</th>
         </tr>
       </thead>
+
       <tbody></tbody>
     </table>
   </div>
@@ -35,6 +40,6 @@
     new RjmcDatatable(
       $('.active-workers-datatable'),
       [{data: '0'}, {data: '1'}, {data: '2'}, {data: '3'}],
-      {ordering: false, searching: false});
+      { ordering: false, searching: false });
   });
 </script>