rocketjob_mission_control 5.0.1 → 6.0.2

data/app/views/rocket_job_mission_control/jobs/_retryable.html.erb

@@ -0,0 +1,16 @@
+<div class='lead'>Retryable:</div>
+<div class='row'>
+  <div class='col-md-12'>
+    <table>
+      <tr>
+        <td><label>Retry Limit</label></td>
+        <td><%= @job.retry_limit %></td>
+      </tr>
+      <tr>
+        <td><label>Failures</label></td>
+        <td><%= @job.failed_at_list.ai(html: true, plain: true) %></td>
+      </tr>
+    </table>
+  </div>
+</div>
+<br/>

data/app/views/rocket_job_mission_control/jobs/_status.html.erb

@@ -1,58 +1,30 @@
-<% status = job.status(Time.zone) %>
-
-<div class='id'>
-  <label>ID:</label> <%= status.delete('_id') %>
-</div>
-
-<% if description = status.delete('description') %>
-  <div class='status-message'><label>Description:</label> <%= description %></div>
+<%= render partial: 'details', locals: {job: @job} %>
+<%= render partial: 'dates', locals: {job: @job} %>
+<% if @job.respond_to?(:failed_at_list) && @job.failed_at_list.present? %>
+  <%= render partial: 'retryable', locals: {job: @job} %>
 <% end %>
-
-<% if duration = status.delete('duration') %>
-  <div class='status-message'><label>Duration:</label> <%= duration %></div>
+<% @attributes = job_custom_fields(@job) %>
+<% if @attributes.present? %>
+  <%= render partial: 'attributes', locals: {attributes: @attributes} %>
 <% end %>
-
-<% if record_count = status.delete('record_count') %>
-  <div class='status-message'><label>Record Count:</label> <%= record_count %></div>
-<% end %>
-
-<div class='created_at'>
-  <label>Created At:</label> <%= status.delete('created_at') %>
-</div>
-
-<% if started_at = status.delete('started_at') %>
-  <div class='status-message'><label>Started At:</label> <%= started_at %></div>
-<% end %>
-
-<% if percent_complete = status.delete('percent_complete') %>
-  <div class='status-message'><label>% Complete:</label> <%= percent_complete %></div>
-<% end %>
-
-<%
-  remaining = {}
-  status.each_pair do |key, value|
-    next if ((value != false) && value.blank?) || ['state', '_type', 'sub_state'].include?(key)
-    if value.kind_of?(Hash) || value.kind_of?(Array)
-      remaining[key] = value
-      next
-    end
-%>
-  <div class='status-message'><label><%= key.to_s.titleize %>:</label> <%= value %></div>
-<% end %>
-
-<div class='clearfix'></div>
-
-<% if job.respond_to?('input') && job.input.failed.count.positive? %>
-  <% status.delete('exception') %>
+<% if @job.respond_to?(:input) && @job.input.failed.count.positive? %>
   <div class='status-message'>
     <label><%= 'Exceptions' %>:</label>
     <%= render partial: 'exceptions', locals: {job: @job} %>
   </div>
+<% elsif @job.exception.present? %>
+  <%= render partial: 'exception', locals: {job: @job} %>
 <% end %>
-
-<% remaining.each_pair do |key, value| %>
+<% if @job.respond_to?(:statistics) && @job.statistics.present? %>
   <div class='status-message'>
-    <label><%= key.to_s.titleize %>:</label>
-    <pre><code><%= pretty_print_array_or_hash(value) %></code></pre>
+    <label>Statistics:</label>
+    <td><%= @job.statistics.ai(html: true, plain: true, sort_keys: true) %></td>
   </div>
+  <br/>
+<% end %>
+<% if @job.respond_to?(:input_categories) && @job.input_categories.present? %>
+  <%= render partial: 'input_categories', locals: {job: @job} %>
+<% end %>
+<% if @job.respond_to?(:output_categories) && @job.output_categories.present?  %>
+  <%= render partial: 'output_categories', locals: {job: @job} %>
 <% end %>

data/app/views/rocket_job_mission_control/jobs/edit.html.erb

@@ -24,6 +24,34 @@
             <% end %>
           </div>
         </div>
+
+        <% if @job.class.respond_to?(:defined_input_categories) && @job.class.respond_to?(:defined_output_categories) %>
+          <div class="row">
+            <div class="col-sm-6">
+              <div class="panel panel-primary">
+                <div class="panel-body">
+                  <div class='lead'>Input Categories</div>
+
+                  <%= f.fields_for :input_categories do |i| %>
+                    <%= render "input_category_fields.html", f: i %>
+                  <% end %>
+                </div>
+              </div>
+            </div>
+
+            <div class="col-sm-6">
+              <div class="panel panel-success">
+                <div class="panel-body">
+                  <div class='lead'>Output Categories</div>
+
+                  <%= f.fields_for :output_categories do |o| %>
+                    <%= render "output_category_fields.html", f: o %>
+                  <% end %>
+                </div>
+              </div>
+            </div>
+          </div>
+        <% end %>
       </div>
     </div>
 

data/app/views/rocket_job_mission_control/jobs/edit_slice.html.erb

@@ -6,9 +6,9 @@
     <%= form_for(:job, url: update_slice_job_path(@job, offset: @offset, error_type: @failure_exception.class_name), method: :patch) do |f| %>
       <% @lines.each_with_index do |line, index| %>
         <% if @line_index == index %>
-          <%= f.text_area :records, :value => line, class: 'input_slices', id: index, multiple: true %>
+          <%= f.text_area :records, value: line, class: 'input_slices', id: index, multiple: true, rows: 14, cols: 10, wrap: "soft" %>
         <% else %>
-          <%= f.hidden_field :records, :value => line, class: 'input_slices', id: index, multiple: true %>
+          <%= f.hidden_field :records, value: line, class: 'input_slices', id: index, multiple: true %>
         <% end %>
       <% end %>
 

data/app/views/rocket_job_mission_control/jobs/exception.html.erb

@@ -11,7 +11,7 @@
         <div class='clearfix'></div>
 
         <div class='message'>
-          <pre><code><%= @failure_exception.message %></code></pre>
+          <pre><code class="language-html"><%= @failure_exception.message %></code></pre>
         </div>
 
         <div class='error'>

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

@@ -1,28 +1,34 @@
 <div class='job-list'>
   <div class='list'>
-    <div class='row'>
-      <div class='col-sm-10'>
-        <h2><%= @description %> Jobs</h2>
-      </div>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <div class='row'>
+          <div class='col-sm-10'>
+            <h2><%= @description %> Jobs</h2>
+          </div>
 
-      <div class='col-sm-2'>
-        <div class='btn btn-default pull-right dt-reload' data-behavior='reload'>
-          <i class='fas fa-sync'></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>
       </div>
-    </div>
 
-    <table class='table datatable jobs-datatable' data-source='<%= @data_table_url %>' style='width: 100%'>
-      <thead>
-        <tr>
-          <% @columns.each do |column| %>
-            <th><%= column[:display] %></th>
-          <% end %>
-        </tr>
-      </thead>
+      <div class="panel-body">
+        <table class='table datatable jobs-datatable' data-source='<%= @data_table_url %>' style='width: 100%'>
+          <thead>
+            <tr>
+              <% @columns.each do |column| %>
+                <th><%= column[:display] %></th>
+              <% end %>
+            </tr>
+          </thead>
 
-      <tbody></tbody>
-    </table>
+          <tbody></tbody>
+        </table>
+      </div>
+    </div>
   </div>
 </div>
 

data/app/views/rocket_job_mission_control/jobs/show.html.erb

@@ -1,70 +1,44 @@
 <div class='row'>
-  <div class='col-md-12 job-status'>
-    <div id='job'>
-      <div class='lead'><%= @job.class.name %></div>
+  <div id='job'>
+    <div class='lead'><%= image_tag('rocket_job_mission_control/rocket-icon-64x64.png') %><%= @job.class.name %>
 
-      <div class='job-state inline-block'>
-        <div class='left'>State</div>
-        <div class="<%= job_state(@job) %> right"><%= job_state(@job) %></div>
-      </div>
-
-      <% if sub_state = @job['sub_state'] %>
-        <div class='job-state inline-block'>
-          <div class='left'>Batch</div>
-          <div class='running right'><%= @job.sub_state %></div>
+    <div class='btn-toolbar job-actions'>
+      <% if @job.scheduled? && can?(:run_now, @job) %>
+        <div class='btn-group'>
+          <%= job_action_links_for_show('Run', rocket_job_mission_control.run_now_job_path(@job), :patch) %>
         </div>
       <% end %>
 
-      <div class='btn-toolbar job-actions pull-right'>
-
-        <% if @job.scheduled? && can?(:run_now, @job) %>
+      <div class='left-margin'>
+        <% valid_events = @job.aasm.events.collect { |e| e.name } %>
+        <% if valid_events.include?(:pause) && @job.pausable? && can?(:pause, @job) %>
+          <%= job_action_links_for_show('Pause', rocket_job_mission_control.pause_job_path(@job), :patch) %>
+        <% end %>
+        <% if valid_events.include?(:resume) && can?(:resume, @job) %>
+          <%= job_action_links_for_show('Resume', rocket_job_mission_control.resume_job_path(@job), :patch) %>
+        <% end %>
+        <% if valid_events.include?(:retry) && can?(:retry, @job) %>
+          <%= job_action_links_for_show('Retry', rocket_job_mission_control.retry_job_path(@job), :patch) %>
+        <% end %>
+        <% if valid_events.include?(:fail) && can?(:fail, @job) %>
+          <%= job_action_links_for_show('Fail', rocket_job_mission_control.fail_job_path(@job), :patch) %>
+        <% end %>
+        <% if valid_events.include?(:abort) && can?(:abort, @job) %>
+          <%= job_action_links_for_show('Abort', rocket_job_mission_control.abort_job_path(@job), :patch) %>
+        <% end %>
+        <% if can?(:destroy, @job) %>
+          <%= job_action_links_for_show('Destroy', rocket_job_mission_control.job_path(@job), :delete) %>
+        <% end %>
+        <% unless @job.completed? || @job.aborted? %>
           <div class='btn-group'>
-            <%= job_action_links_for_show('Run', rocket_job_mission_control.run_now_job_path(@job), :patch) %>
+            <% if can?(:edit, @job) %>
+              <%= link_to 'Edit', edit_job_path(@job), class: 'btn btn-primary' %>
+            <% end %>
           </div>
         <% end %>
-
-        <div class='left-margin'>
-          <% valid_events = @job.aasm.events.collect { |e| e.name } %>
-
-          <% if valid_events.include?(:pause) && @job.pausable? && can?(:pause, @job) %>
-            <%= job_action_links_for_show('Pause', rocket_job_mission_control.pause_job_path(@job), :patch) %>
-          <% end %>
-
-          <% if valid_events.include?(:resume) && can?(:resume, @job) %>
-            <%= job_action_links_for_show('Resume', rocket_job_mission_control.resume_job_path(@job), :patch) %>
-          <% end %>
-
-          <% if valid_events.include?(:retry) && can?(:retry, @job) %>
-            <%= job_action_links_for_show('Retry', rocket_job_mission_control.retry_job_path(@job), :patch) %>
-          <% end %>
-
-          <% if valid_events.include?(:fail) && can?(:fail, @job) %>
-            <%= job_action_links_for_show('Fail', rocket_job_mission_control.fail_job_path(@job), :patch) %>
-          <% end %>
-
-          <% if valid_events.include?(:abort) && can?(:abort, @job) %>
-            <%= job_action_links_for_show('Abort', rocket_job_mission_control.abort_job_path(@job), :patch) %>
-          <% end %>
-
-          <% if can?(:destroy, @job) %>
-            <%= job_action_links_for_show('Destroy', rocket_job_mission_control.job_path(@job), :delete) %>
-          <% end %>
-
-          <% unless @job.completed? || @job.aborted? %>
-            <div class='btn-group'>
-              <% if can?(:edit, @job) %>
-                <%= link_to 'Edit', edit_job_path(@job), class: 'btn btn-primary' %>
-              <% end %>
-            </div>
-          <% end %>
-        </div>
       </div>
     </div>
+    </div>
   </div>
 </div>
-
-<div class='row'>
-  <div class='col-md-12'>
-    <%= render partial: 'status', locals: {job: @job} %>
-  </div>
-</div>
+<%= render partial: 'status', locals: {job: @job} %>

data/app/views/rocket_job_mission_control/jobs/view_slice.html.erb

@@ -11,7 +11,7 @@
         <div class='clearfix'></div>
 
         <div class='message'>
-          <pre><code><%= @failure_exception.message %></code></pre>
+          <pre><code class="language-html"><%= @failure_exception.message %></code></pre>
         </div>
 
       </div>
@@ -23,7 +23,9 @@
           <%= render partial: 'layouts/rocket_job_mission_control/partials/flash' %>
           <br>
         <% end %>
+
         <div class='message' tabindex="<%= index + 1 %>" id="<%= index + 1 %>">
+
         <pre><span>Line: <%= index + 1 %></span><br><br><code><%= line %></code><br><br>
           <% if can?(:edit_slice, @job) %><div class='edit_button'><%= link_to "Edit", edit_slice_job_path(@job, offset: @offset, error_type: @failure_exception.class_name, line_index: index), class: 'btn btn-primary' %></div><% end %><div class='edit_button'> <%= link_to "Back", job_path(@job), class: 'btn btn-warning' %></div>
         </pre>
@@ -41,7 +43,7 @@
 </div>
 
 <script>
-    $(document).ready(function () {
-        document.getElementById(<%= @view_slice_pagination[:record_number] %>).focus();
-    });
+  $(document).ready(function () {
+    document.getElementById(<%= @view_slice_pagination[:record_number] %>).focus();
+  });
 </script>

data/config/initializers/assets.rb

@@ -1,8 +1,7 @@
-Rails.application.config.assets.precompile << proc do |path|
-  true if path =~ /\.(eot|svg|ttf|woff)\z/
-end
-
+Rails.application.config.assets.precompile << ["*.svg", "*.eot", "*.woff", "*.ttf"]
 Rails.application.config.assets.precompile += %w[
+  rocket_job_mission_control/application.css
+  rocket_job_mission_control/application.js
   rocket_job_mission_control/favicon.png
   rocket_job_mission_control/safari-pinned-tab.svg
   rocket_job_mission_control/favicon-16x16.png

data/lib/rocket_job_mission_control/engine.rb

@@ -8,9 +8,9 @@ module RocketJobMissionControl
     isolate_namespace RocketJobMissionControl
 
     require "rocketjob"
-    require "jquery-rails"
-    require "sass-rails"
     require "access-granted"
+    require "turbolinks"
+
     begin
       require "rocketjob_enterprise"
     rescue LoadError

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = "5.0.1".freeze
+  VERSION = "6.0.2".freeze
 end

data/test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb

@@ -60,7 +60,7 @@ module RocketJobMissionControl
           end
 
           it "alerts the user" do
-            assert_equal I18n.t(:failure, scope: %i[dirmon_entry enable]), flash[:alert]
+            assert_equal I18n.t(:failure, scope: %i[dirmon_entry enable]), flash[:danger]
           end
         end
       end
@@ -91,7 +91,7 @@ module RocketJobMissionControl
           end
 
           it "alerts the user" do
-            assert_equal I18n.t(:failure, scope: %i[dirmon_entry disable]), flash[:alert]
+            assert_equal I18n.t(:failure, scope: %i[dirmon_entry disable]), flash[:danger]
           end
         end
       end
@@ -277,7 +277,7 @@ module RocketJobMissionControl
           end
 
           it "adds a flash alert message" do
-            assert_equal I18n.t(:failure, scope: %i[dirmon_entry find], id: 42), flash[:alert]
+            assert_equal I18n.t(:failure, scope: %i[dirmon_entry find], id: 42), flash[:danger]
           end
         end
 

data/test/controllers/rocket_job_mission_control/jobs_controller_test.rb

@@ -26,7 +26,8 @@ module RocketJobMissionControl
       end
 
       let :failed_job do
-        job = KaboomBatchJob.new(slice_size: 1)
+        job = KaboomBatchJob.new
+        job.input_category.slice_size = 1
         job.upload do |stream|
           stream << "first record"
           stream << "second record"
@@ -64,7 +65,7 @@ module RocketJobMissionControl
             end
 
             it "adds a flash alert message" do
-              assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:alert]
+              assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:danger]
             end
           end
 
@@ -120,7 +121,7 @@ module RocketJobMissionControl
           end
 
           it "adds a flash alert message" do
-            assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:alert]
+            assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:danger]
           end
         end
 
@@ -158,7 +159,7 @@ module RocketJobMissionControl
           end
 
           it "adds a flash alert message" do
-            assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:alert]
+            assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:danger]
           end
         end
 
@@ -188,7 +189,7 @@ module RocketJobMissionControl
           end
 
           it "adds a flash alert message" do
-            assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:alert]
+            assert_equal I18n.t(:failure, scope: %i[job find], id: 42), flash[:danger]
           end
         end
 
@@ -203,7 +204,7 @@ module RocketJobMissionControl
             end
 
             it "notifies the user" do
-              assert_equal I18n.t(:no_errors, scope: %i[job failures]), flash[:notice]
+              assert_equal I18n.t(:no_errors, scope: %i[job failures]), flash[:warning]
             end
           end
 

data/test/controllers/rocket_job_mission_control/servers_controller_test.rb

@@ -65,7 +65,7 @@ module RocketJobMissionControl
             end
 
             it "does not display an error message" do
-              assert_nil flash[:alert]
+              assert_nil flash[:danger]
             end
           end
         end
@@ -90,7 +90,7 @@ module RocketJobMissionControl
           end
 
           it "displays a flash message" do
-            assert_equal I18n.t(:success, scope: %i[server destroy]), flash[:notice]
+            assert_equal I18n.t(:success, scope: %i[server destroy]), flash[:success]
           end
 
           it "destroys the server" do
@@ -108,7 +108,7 @@ module RocketJobMissionControl
           end
 
           it "displays a flash message" do
-            assert_equal I18n.t(:failure, scope: %i[server find], id: 999_999), flash[:alert]
+            assert_equal I18n.t(:failure, scope: %i[server find], id: 999_999), flash[:danger]
           end
         end
       end

data/test/models/rocket_job_mission_control/dirmon_sanitizer_test.rb

@@ -0,0 +1,146 @@
+require_relative "../../test_helper"
+
+class DirmonSanitizerTest < Minitest::Test
+  describe RocketJobMissionControl::DirmonSanitizer do
+    class SampleJob < RocketJob::Job
+      include RocketJob::Batch
+
+      input_category format: :csv
+      output_category format: :csv
+      output_category name: :errors, format: :csv
+
+      field :client_name, type: String, user_editable: true
+      field :zip_code, type: Integer, user_editable: true
+
+      self.destroy_on_complete = false
+
+      def perform(record)
+        record
+      end
+    end
+
+    let :sample_job do
+      SampleJob.new
+    end
+
+    let :job_class_name do
+      SampleJob.name
+    end
+
+    let :properties do
+      {
+        client_name:                  "Jack",
+        zip_code:                     12345,
+        input_categories_attributes:  {0 => {format: :json}},
+        output_categories_attributes: {0 => {name: :errors, format: :json}}
+      }
+    end
+
+    let :sanitized_properties do
+      {
+        client_name:       "Jill",
+        zip_code:          45673,
+        input_categories:  [{name: "main", format: "json", slice_size: 100, skip_unknown: "false"}],
+        output_categories: [{name: "errors", format: "json"}]
+      }
+    end
+
+    let :dirmon_entry do
+      RocketJob::DirmonEntry.new(
+        name:           "Test",
+        job_class_name: job_class_name,
+        pattern:        "the_path",
+        properties:     properties
+      )
+    end
+
+    describe ".sanitize" do
+      it "passes permissible fields" do
+        params   = {
+          name:              "Test2",
+          job_class_name:    job_class_name,
+          pattern:           "another/path",
+          archive_directory: "archive/path",
+          properties:        properties
+        }
+        cleansed = RocketJobMissionControl::DirmonSanitizer.sanitize(params, SampleJob, dirmon_entry)
+        assert_equal 0, dirmon_entry.errors.count
+        expected = {:archive_directory => "archive/path", :job_class_name => "DirmonSanitizerTest::SampleJob", :name => "Test2", :pattern => "another/path", :properties => {:client_name => "Jack", :zip_code => 12345, :input_categories => [{:format => :json}], :output_categories => [{:name => :errors, :format => :json}]}}
+        assert_equal expected, cleansed
+      end
+
+      it "strips blank values" do
+        params   = {
+          name:              "",
+          job_class_name:    "",
+          pattern:           "",
+          archive_directory: "",
+          bad_field:         "Not permissible",
+          properties:        {
+            client_name:                  "",
+            zip_code:                     "",
+            input_categories_attributes:  {0 => {format: ""}},
+            output_categories_attributes: {0 => {name: "", format: ""}}
+          }
+        }
+        cleansed = RocketJobMissionControl::DirmonSanitizer.sanitize(params, SampleJob, dirmon_entry)
+        assert_equal 0, dirmon_entry.errors.count
+        expected = {}
+        assert_equal expected, cleansed
+      end
+    end
+
+    describe ".diff_category" do
+      it "returns only different values" do
+        default_category = sample_job.input_category
+        properties       = {
+          name:         "main",
+          format:       "psv",
+          slice_size:   100,
+          skip_unknown: false
+        }
+        updated_category = RocketJob::Category::Input.new(properties)
+
+        diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
+
+        expected = {:format => "psv", :name => "main"}
+        assert_equal expected, diff
+      end
+
+      it "is empty with no changes" do
+        default_category = sample_job.input_category
+        properties       = {
+          name:         "main",
+          format:       "csv",
+          slice_size:   100,
+          skip_unknown: false
+        }
+        updated_category = RocketJob::Category::Input.new(properties)
+
+        diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
+
+        expected = {}
+        assert_equal expected, diff
+      end
+
+      it "empty" do
+        default_category = sample_job.input_category
+        properties       = {}
+        updated_category = RocketJob::Category::Input.new(properties)
+
+        diff = RocketJobMissionControl::DirmonSanitizer.diff_category(properties, updated_category, default_category)
+
+        expected = {}
+        assert_equal expected, diff
+      end
+    end
+
+    describe ".diff_properties" do
+      it "returns only different values" do
+        diff     = RocketJobMissionControl::DirmonSanitizer.diff_properties(sanitized_properties, dirmon_entry)
+        expected = {:client_name => "Jill", :zip_code => 45673, :input_categories => [{:format => "json", :name => "main"}], :output_categories => [{:format => "json", :name => "errors"}]}
+        assert_equal expected, diff
+      end
+    end
+  end
+end

data/test/models/rocket_job_mission_control/job_sanitizer_test.rb

@@ -81,7 +81,7 @@ class JobSanitizerTest < Minitest::Test
           assert_equal error.first, :properties
           assert error.second.include?("unexpected token"), error
         end
-        assert_equal({hash_field: "{ bad json }", string: "hello"}, cleansed)
+        assert_equal({string: "hello"}, cleansed)
       end
 
       it "Keeps empty JSON Hash" do