rocketjob_mission_control 5.0.0.beta1 → 6.0.0

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/config/routes.rb

@@ -59,6 +59,10 @@ RocketJobMissionControl::Engine.routes.draw do
     member do
       put :enable
       put :disable
+      # Create the path: copy_dirmon_entry GET    /dirmon_entries/:id/copy(.:format)
+      get :copy
+      # Create the path:                        PATCH  /dirmon_entries/:id/replicate(.:format) rocket_job_mission_control/dirmon_entries#replicate
+      patch :replicate
     end
   end
 

data/lib/rocket_job_mission_control/engine.rb

@@ -8,9 +8,6 @@ module RocketJobMissionControl
     isolate_namespace RocketJobMissionControl
 
     require "rocketjob"
-    require "jquery-rails"
-    require "sass-rails"
-    require "jquery-datatables-rails"
     require "access-granted"
     begin
       require "rocketjob_enterprise"

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = "5.0.0.beta1".freeze
+  VERSION = "6.0.0".freeze
 end

data/test/controllers/rocket_job_mission_control/application_controller_test.rb

@@ -13,22 +13,14 @@ module RocketJobMissionControl
     describe TestController do
       describe "#with_time_zone" do
         it "uses correct timezone with session and time_zone set" do
-          if Rails.version.to_i >= 5
-            session["time_zone"] = "America/Los_Angeles"
-            get :index
-          else
-            get :index, {}, {"time_zone" => "America/Los_Angeles"}
-          end
+          session["time_zone"] = "America/Los_Angeles"
+          get :index
           assert_equal "America/Los_Angeles", assigns(:time_zone).name
         end
 
         it "uses correct timezone with session, but no time_zone set" do
-          if Rails.version.to_i >= 5
-            session["user_id"] = "42"
-            get :index
-          else
-            get :index, {}, {"user_id" => "42"}
-          end
+          session["user_id"] = "42"
+          get :index
           assert_equal "UTC", assigns(:time_zone).name
         end
 

data/test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb

@@ -37,9 +37,7 @@ module RocketJobMissionControl
       describe "PATCH #enable" do
         describe "when transition is allowed" do
           before do
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :enable, params
+            patch :enable, params: {id: existing_dirmon_entry.id}
           end
 
           it do
@@ -54,9 +52,7 @@ module RocketJobMissionControl
         describe "when transition is not allowed" do
           before do
             existing_dirmon_entry.enable!
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :enable, params
+            patch :enable, params: {id: existing_dirmon_entry.id}
           end
 
           it "succeeds" do
@@ -64,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
@@ -73,9 +69,7 @@ module RocketJobMissionControl
         describe "when transition is allowed" do
           before do
             existing_dirmon_entry.enable!
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :disable, params
+            patch :disable, params: {id: existing_dirmon_entry.id}
           end
 
           it do
@@ -89,9 +83,7 @@ module RocketJobMissionControl
 
         describe "when transition is not allowed" do
           before do
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :disable, params
+            patch :disable, params: {id: existing_dirmon_entry.id}
           end
 
           it "succeeds" do
@@ -99,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
@@ -108,9 +100,7 @@ module RocketJobMissionControl
         let(:entry_params) { {} }
 
         before do
-          params = entry_params
-          params = {params: entry_params} if Rails.version.to_i >= 5
-          get :new, params
+          get :new, params: entry_params
         end
 
         it "succeeds" do
@@ -163,8 +153,7 @@ module RocketJobMissionControl
         describe "with valid parameters" do
           before do
             params = {id: existing_dirmon_entry.id, rocket_job_dirmon_entry: {pattern: "the_path2", job_class_name: job_class_name}}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :update, params
+            patch :update, params: params
           end
 
           it "redirects to the updated entry" do
@@ -179,8 +168,7 @@ module RocketJobMissionControl
         describe "with invalid parameters" do
           before do
             params = {id: existing_dirmon_entry.id, rocket_job_dirmon_entry: {job_class_name: "FakeAndBadJob"}}
-            params = {params: params} if Rails.version.to_i >= 5
-            patch :update, params
+            patch :update, params: params
           end
 
           it "renders the edit template" do
@@ -209,9 +197,7 @@ module RocketJobMissionControl
           end
 
           before do
-            params = {rocket_job_dirmon_entry: dirmon_params}
-            params = {params: params} if Rails.version.to_i >= 5
-            post :create, params
+            post :create, params: {rocket_job_dirmon_entry: dirmon_params}
           end
 
           it "creates the entry" do
@@ -250,9 +236,7 @@ module RocketJobMissionControl
           end
 
           before do
-            params = {rocket_job_dirmon_entry: dirmon_params}
-            params = {params: params} if Rails.version.to_i >= 5
-            post :create, params
+            post :create, params: {rocket_job_dirmon_entry: dirmon_params}
           end
 
           describe "on model attributes" do
@@ -270,9 +254,7 @@ module RocketJobMissionControl
 
       describe "GET #edit" do
         before do
-          params = {id: existing_dirmon_entry.id}
-          params = {params: params} if Rails.version.to_i >= 5
-          get :edit, params
+          get :edit, params: {id: existing_dirmon_entry.id}
         end
 
         it "succeeds" do
@@ -287,9 +269,7 @@ module RocketJobMissionControl
       describe "GET #show" do
         describe "with an invalid id" do
           before do
-            params = {id: 42}
-            params = {params: params} if Rails.version.to_i >= 5
-            get :show, params
+            get :show, params: {id: 42}
           end
 
           it "redirects" do
@@ -297,15 +277,13 @@ 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
 
         describe "with a valid id" do
           before do
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            get :show, params
+            get :show, params: {id: existing_dirmon_entry.id}
           end
 
           it "succeeds" do
@@ -321,9 +299,7 @@ module RocketJobMissionControl
       describe "DELETE #destroy" do
         describe "with a valid id" do
           before do
-            params = {id: existing_dirmon_entry.id}
-            params = {params: params} if Rails.version.to_i >= 5
-            delete :destroy, params
+            delete :destroy, params: {id: existing_dirmon_entry.id}
           end
 
           it "redirects to index" do
@@ -464,9 +440,7 @@ module RocketJobMissionControl
             %i[admin editor operator manager dirmon].each do |role|
               it "allows role #{role} to access #{method}" do
                 set_role(role)
-                params = {id: existing_dirmon_entry.id}
-                params = {params: params} if Rails.version.to_i >= 5
-                patch :enable, params
+                patch :enable, params: {id: existing_dirmon_entry.id}
 
                 assert_response(:redirect)
               end
@@ -478,9 +452,7 @@ module RocketJobMissionControl
         %i[admin editor operator manager dirmon].each do |role|
           it "creates dirmon entry" do
             set_role(role)
-            params = {rocket_job_dirmon_entry: dirmon_params}
-            params = {params: params} if Rails.version.to_i >= 5
-            post :create, params
+            post :create, params: {rocket_job_dirmon_entry: dirmon_params}
 
             assert_response(:redirect)
           end
@@ -488,9 +460,7 @@ module RocketJobMissionControl
 
         it "deletes dirmon entry" do
           set_role(:admin)
-          params = {id: existing_dirmon_entry.id}
-          params = {params: params} if Rails.version.to_i >= 5
-          delete :destroy, params
+          delete :destroy, params: {id: existing_dirmon_entry.id}
 
           assert_response(:redirect)
         end
@@ -499,9 +469,7 @@ module RocketJobMissionControl
           it "raises authentication error for #{role}" do
             set_role(role)
             assert_raises AccessGranted::AccessDenied do
-              params = {id: existing_dirmon_entry.id}
-              params = {params: params} if Rails.version.to_i >= 5
-              delete :destroy, params
+              delete :destroy, params: {id: existing_dirmon_entry.id}
             end
           end
         end