rocketjob_mission_control 6.0.0.beta → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d421e76cdd7a629d0f28598e52f2d6321bcdb0f062d50cf99b0e3ac791c0c823
-  data.tar.gz: fa9f46ebbb28043994c98d42efc368973b57cf243ff793447c3985e6f56f152e
+  metadata.gz: b0ec59a8f1d7a5fe9cc19b916680252c9305da5541c483fe7d1d330329a89fee
+  data.tar.gz: 62c0a4f49640e726eedeebd27436d6c6190e1327c60e6ab51cd7c805c5b0c290
 SHA512:
-  metadata.gz: 4cd18b8160af0cfa244403d522f4aa98d3e18c945f2e2fcc03001adb29e27a47c5dbcab50384b8e89630aa9a0302320d779307376fcfa720deb7535ff2201020
-  data.tar.gz: 42b3d18cfa224ea50b25fd5eaeab7f4409a8452e4791dd91edf49358359e02b1418cecaf132710abca86d2f32d6198fc8e2ff3497e9273648f7ea11f755b4442
+  metadata.gz: 02c715b0419264397e74d1c76c3d3020488e6e7616f786aa1d84cd5c887a5b037c82bb8d1d952b794e8f66756b09319d83ce48c83bf2cedd184aaa2019c70012
+  data.tar.gz: 7ed5080f3b4470a2796240364cb6669dc5a1f9b334c0c26a3ea704e7fce0cdf2f792ab0ed1f10ea06196089098ae6295e2d0116d26e2b2d020e1c13dc3df5630

data/app/assets/javascripts/rocket_job_mission_control/application.js

@@ -10,8 +10,8 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery3
-//= require jquery_ujs
+//= require jquery-3.5.1.min.js
+//= require rails-ujs
 //= require datatables.min.js
 //= require bootstrap.min
 //

data/app/assets/stylesheets/rocket_job_mission_control/jobs.css

@@ -43,7 +43,6 @@
 	 line-height: 2;
 	 resize: none;
 	 width: 100%;
-	 height: 20em;
 	 padding-top: 5px;
 	 padding-bottom: 5px;
 	 margin-bottom: 4px;

data/app/controllers/rocket_job_mission_control/application_controller.rb

@@ -25,6 +25,8 @@ module RocketJobMissionControl
     end
 
     def login
+      return unless Config.authorization_callback
+
       @login ||= begin
         args = instance_exec(&Config.authorization_callback)
         args[:login]

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -115,7 +115,7 @@ module RocketJobMissionControl
         @dirmon_entry.enable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
-        flash[:alert] = t(:failure, scope: %i[dirmon_entry enable])
+        flash[:danger] = t(:failure, scope: %i[dirmon_entry enable])
         render(:show)
       end
     end
@@ -127,7 +127,7 @@ module RocketJobMissionControl
         @dirmon_entry.disable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
-        flash[:alert] = t(:failure, scope: %i[dirmon_entry disable])
+        flash[:danger] = t(:failure, scope: %i[dirmon_entry disable])
         render(:show)
       end
     end
@@ -149,7 +149,7 @@ module RocketJobMissionControl
 
     def find_entry_or_redirect
       unless @dirmon_entry = RocketJob::DirmonEntry.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: %i[dirmon_entry find], id: params[:id])
+        flash[:danger] = t(:failure, scope: %i[dirmon_entry find], id: ActionController::Base.helpers.sanitize(params[:id]))
         redirect_to(dirmon_entries_path)
       end
     end

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -182,6 +182,9 @@ module RocketJobMissionControl
       # Finds specific slice [Array]
       slice = @job.input.failed.skip(offset).first
 
+      # Converts \r\n line breaks to \n
+      updated_records.each { |record| record.gsub(/\r\n/, "\n") }
+
       # Assings modified slice (from the form) back to slice
       slice.records = updated_records
 
@@ -228,14 +231,14 @@ module RocketJobMissionControl
       offset     = params.fetch(:offset, 0).to_i
 
       unless error_type.present?
-        flash[:notice] = t(:no_errors, scope: %i[job failures])
+        flash[:warning] = t(:no_errors, scope: %i[job failures])
         redirect_to(job_path(@job))
       end
 
       scope = @job.input.failed.where("exception.class_name" => error_type)
       count = scope.count
       unless count.positive?
-        flash[:notice] = t(:no_errors, scope: %i[job failures])
+        flash[:warning] = t(:no_errors, scope: %i[job failures])
         redirect_to(job_path(@job))
       end
 
@@ -278,7 +281,7 @@ module RocketJobMissionControl
 
     def find_job_or_redirect
       unless @job = RocketJob::Job.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: %i[job find], id: params[:id])
+        flash[:danger] = t(:failure, scope: %i[job find], id: ActionController::Base.helpers.sanitize(params[:id]))
 
         redirect_to(jobs_path)
       end

data/app/controllers/rocket_job_mission_control/servers_controller.rb

@@ -62,9 +62,9 @@ module RocketJobMissionControl
         RocketJob::Server.destroy_zombies
       elsif VALID_ACTIONS.include?(server_action)
         RocketJob::Subscribers::Server.publish(server_action)
-        flash[:notice] = t(:success, scope: %i[server update_all], action: server_action.to_s)
+        flash[:success] = t(:success, scope: %i[server update_all], action: server_action.to_s)
       else
-        flash[:alert] = t(:invalid, scope: %i[server update_all])
+        flash[:danger] = t(:invalid, scope: %i[server update_all])
       end
 
       # TODO: Refresh the same page it was on
@@ -76,7 +76,7 @@ module RocketJobMissionControl
     def stop
       authorize! :stop, @server
       RocketJob::Subscribers::Server.publish(:stop, server_id: @server.id)
-      flash[:notice] = t(:success, scope: %i[server update_one], action: "stop", name: @server.name)
+      flash[:success] = t(:success, scope: %i[server update_one], action: "stop", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -86,7 +86,7 @@ module RocketJobMissionControl
     def destroy
       authorize! :destroy, @server
       @server.destroy
-      flash[:notice] = t(:success, scope: %i[server destroy])
+      flash[:success] = t(:success, scope: %i[server destroy])
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -96,7 +96,7 @@ module RocketJobMissionControl
     def pause
       authorize! :pause, @server
       RocketJob::Subscribers::Server.publish(:pause, server_id: @server.id)
-      flash[:notice] = t(:success, scope: %i[server update_one], action: "pause", name: @server.name)
+      flash[:success] = t(:success, scope: %i[server update_one], action: "pause", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -106,7 +106,7 @@ module RocketJobMissionControl
     def resume
       authorize! :resume, @server
       RocketJob::Subscribers::Server.publish(:resume, server_id: @server.id)
-      flash[:notice] = t(:success, scope: %i[server update_one], action: "resume", name: @server.name)
+      flash[:success] = t(:success, scope: %i[server update_one], action: "resume", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -140,7 +140,7 @@ module RocketJobMissionControl
 
     def find_server_or_redirect
       unless @server = RocketJob::Server.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: %i[server find], id: params[:id])
+        flash[:danger] = t(:failure, scope: %i[server find], id: params[:id])
 
         redirect_to(servers_path)
       end

data/app/datatables/rocket_job_mission_control/dirmon_entries_datatable.rb

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

data/app/helpers/rocket_job_mission_control/application_helper.rb

@@ -56,6 +56,14 @@ module RocketJobMissionControl
       values
     end
 
+    def escape(s)
+      s.dump[1..-2]
+    end
+
+    def unescape(s)
+      "\"#{s}\"".undump
+    end
+
     # Returns the editable field as html for use in editing dynamic fields from a Job class.
     def editable_field_html(klass, field_name, value, f)
       # When editing a job the values are of the correct type.
@@ -75,7 +83,7 @@ module RocketJobMissionControl
         if options
           f.select(field_name, options, {include_blank: options.include?(nil), selected: value}, {class: "selectize form-control"})
         else
-          f.text_field(field_name, value: value, class: "form-control", placeholder: placeholder)
+          f.text_area(field_name, value: value ? value : "", class: "form-control", placeholder: placeholder)
         end
       when "Boolean", "Mongoid::Boolean"
         options = extract_inclusion_values(klass, field_name) || [nil, "true", "false"]

data/app/helpers/rocket_job_mission_control/dirmon_entries_helper.rb

@@ -11,5 +11,9 @@ module RocketJobMissionControl
       categories.each { |category| return category if category_name == (category["name"] || :main).to_sym }
       nil
     end
+    
+    def rocket_job_mission_control
+      @@rocket_job_mission_control_engine_url_helpers ||= RocketJobMissionControl::Engine.routes.url_helpers
+    end
   end
 end

data/app/helpers/rocket_job_mission_control/servers_helper.rb

@@ -26,5 +26,9 @@ module RocketJobMissionControl
         map[server.state] || "callout-info"
       end
     end
+    
+    def rocket_job_mission_control
+      @@rocket_job_mission_control_engine_url_helpers ||= RocketJobMissionControl::Engine.routes.url_helpers
+    end
   end
 end

data/app/models/rocket_job_mission_control/dirmon_sanitizer.rb

@@ -42,8 +42,8 @@ module RocketJobMissionControl
             categories << props unless props.empty?
           end
           properties[:output_categories] = categories unless categories.empty?
-        else
-          properties[name] = value unless default_job.public_send(name) == updated_job.public_send(name)
+        elsif default_job.public_send(name) != updated_job.public_send(name)
+          properties[name] = value.is_a?(String) ? value.gsub(/\r\n/, "\n") : value
         end
       end
       properties

data/app/models/rocket_job_mission_control/job_sanitizer.rb

@@ -27,6 +27,8 @@ module RocketJobMissionControl
         next unless field&.type
 
         case field.type.name
+        when "String"
+          value.gsub(/\r\n/, "\n")
         when "Hash"
           begin
             value = value.blank? ? nil : JSON.parse(value)

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

@@ -1,13 +1,13 @@
 <% if flash.present? %>
-  <div class='flash text-center'>
+  <div class="flash text-center">
     <% flash.each do |key, msg| %>
-      <div class='alert alert-<%=key%> alert-dismissable' role='alert'>
-        <button class='close' data-dismiss='alert'>
+      <div class="alert alert-<%=key%> 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/rocket_job_mission_control/jobs/_attributes.html.erb

@@ -2,87 +2,26 @@
 <div class='row'>
   <div class='col-md-12'>
     <table>
-      <% @attributes.each_pair do |key, value| %>
-        <% next if value.is_a?(Array) || value.is_a?(Hash) %>
-        <% key = key.to_s.titleize %>
+      <% @attributes.keys.sort.each do |key| %>
+        <%
+          value = @attributes[key]
+          key = key.to_s.titleize
+        %>
         <tr>
           <td><label><%= key %>:</label></td>
           <% if value.nil? %>
             <td><label>nil</label></td>
           <% else %>
-            <td><%= value %></td>
+            <td>
+              <% if value.is_a?(String) %>
+                <pre><code><%= simple_format(value) %></code></pre>
+              <% else %>
+                <%= value.ai(html: true, plain: true) %>
+              <% end %>
+            </td>
           <% end %>
         </tr>
       <% end %>
-      <% @attributes.each_pair do |key, value| %>
-        <% next unless value.is_a?(Array) %>
-        <% key = key.to_s.titleize %>
-        <% if value.empty? %>
-          <tr>
-            <td><label><%= key %>:</label></td>
-            <td><label>[]</label></td>
-          </tr>
-        <% else %>
-          <% first = true %>
-          <% value.each do |item| %>
-            <% if first %>
-              <tr>
-                <td><label><%= key %>:</label></td>
-                <% if item.is_a?(Hash) || item.is_a?(Array) %>
-                  <td>
-                    <pre><code><%= pretty_print_array_or_hash(item) %></code></pre>
-                  </td>
-                <% else %>
-                  <td><%= item %></td>
-                <% end %>
-              </tr>
-              <% first = false %>
-            <% else %>
-              <tr>
-                <td></td>
-                <% if item.is_a?(Hash) || item.is_a?(Array) %>
-                  <td>
-                    <pre><code><%= pretty_print_array_or_hash(item) %></code></pre>
-                  </td>
-                <% else %>
-                  <td><%= item %></td>
-                <% end %>
-              </tr>
-            <% end %>
-          <% end %>
-        <% end %>
-      <% end %>
-      <% @attributes.each_pair do |key, value| %>
-        <% next unless value.is_a?(Hash) %>
-        <% key = key.to_s.titleize %>
-        <tr>
-          <th valign="top"><label><%= key %>:</label></th>
-          <td>
-            <% if value.empty? %>
-              <label>{}</label>
-            <% else %>
-              <div class='row'>
-                <div class='col-md-12'>
-                  <table>
-                    <% value.each_pair do |key2, value2| %>
-                      <tr>
-                        <td><label><%= key2.to_s.titleize %>:</label></td>
-                        <% if value2.is_a?(Hash) || value2.is_a?(Array) %>
-                          <td>
-                            <pre><code><%= pretty_print_array_or_hash(value2) %></code></pre>
-                          </td>
-                        <% else %>
-                          <td><%= value2 %></td>
-                        <% end %>
-                      </tr>
-                    <% end %>
-                  </table>
-                </div>
-              </div>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
     </table>
   </div>
 </div>

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

@@ -3,33 +3,29 @@
   <div class='col-md-12'>
     <table>
       <tr>
-        <td><label>Created:</label></td>
+        <td><label>Created at:</label></td>
         <td><%= job_time(@job.created_at) %></td>
       </tr>
-      <% if !@job.queued? %>
+      <% unless @job.queued? %>
         <tr>
-          <td><label><%= job_state_name(@job) %>:</label></td>
+          <td><label><%= job_state_name(@job) %> at:</label></td>
           <td>
             <%= job_state_time(@job) %>
             <% unless @job.scheduled? %>
-              , <%= RocketJob.seconds_as_duration(Time.now - (@job.completed_at || @job.started_at || @job.created_at)) %> ago
+              (<%= RocketJob.seconds_as_duration(Time.now - (@job.completed_at || @job.started_at || @job.created_at)) %> ago)
             <% end %>
           </td>
         </tr>
       <% end %>
       <% if @job.scheduled? %>
         <tr>
-          <td><label>Run At:</label></td>
-          <td><%= job_time(@job.run_at) %></td>
-        </tr>
-        <tr>
-          <td><label>Runs In:</label></td>
-          <td><%= RocketJob.seconds_as_duration(@job.run_at - Time.now) %></td>
+          <td><label>Scheduled to run at:</label></td>
+          <td><%= job_time(@job.run_at) %> (<%= RocketJob.seconds_as_duration(@job.run_at - Time.now) %> from now)</td>
         </tr>
       <% end %>
       <% if @job.expires_at %>
         <tr>
-          <td><label>Expires At:</label></td>
+          <td><label>Expires at:</label></td>
           <td><%= job_time(@job.expires_at) %></td>
         </tr>
       <% end %>

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

@@ -46,10 +46,43 @@
           <td><%= @job.failure_count %></td>
         </tr>
       <% end %>
-      <% if @job.log_level %>
+      <% if @job.respond_to?(:input_category) %>
         <tr>
-          <td><label>Log Level</label></td>
-          <td><%= @job.log_level %></td>
+          <td><label>Record Count:</label></td>
+          <td><%= @job.record_count %></td>
+        </tr>
+        <% if @job.completed? %>
+          <tr>
+            <td><label>Records Per Hour:</label></td>
+            <td><%= job_records_per_hour(@job) %></td>
+          </tr>
+        <% elsif @job.running? || @job.paused? || @job.failed? %>
+          <tr>
+            <td><label>Progress:</label></td>
+            <td><%= @job.percent_complete %> %</td>
+          </tr>
+          <% if @job.running? %>
+            <tr>
+              <td><label>Est. Time Remaining:</label></td>
+              <td><%= job_estimated_time_left(@job) %></td>
+            </tr>
+          <% end %>
+          <tr>
+            <td><label>Queued Slices:</label></td>
+            <td><%= @job.input.queued.count %></td>
+          </tr>
+          <tr>
+            <td><label>Active Slices:</label></td>
+            <td><%= @job.input.running.count %></td>
+          </tr>
+          <tr>
+            <td><label>Failed Slices:</label></td>
+            <td><%= @job.input.failed.count %></td>
+          </tr>
+        <% end %>
+        <tr>
+          <td><label>Slice Size:</label></td>
+          <td><%= @job.input_category.slice_size %></td>
         </tr>
       <% end %>
       <% if @job.respond_to?(:throttle_group) && @job.throttle_group %>
@@ -64,6 +97,12 @@
           <td><%= @job.throttle_running_workers %></td>
         </tr>
       <% end %>
+      <% if @job.log_level %>
+        <tr>
+          <td><label>Log Level</label></td>
+          <td><%= @job.log_level %></td>
+        </tr>
+      <% end %>
       <% if @job.worker_name %>
         <tr>
           <td><label>Worker Name:</label></td>