rocketjob_mission_control 4.2.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80f6b3973c176cdfe7a2f0d0f20b51fa066fc0013ad86e1f01b400e45b75466f
-  data.tar.gz: 7d781ed535a84e4783ad6bc8efb6c4dbc53e76d8baf9092498665d20ce675788
+  metadata.gz: 1a7a9ef0aac59fd6cb345b13c503922ea80232f0eedb8d4eb29ea1d535e04c8a
+  data.tar.gz: 360b3994feec93243b9b4cfadf8fa89416538aafb0fbc927b2db31399cc850e4
 SHA512:
-  metadata.gz: 5f3c5353ad000737226601f20e7fe2b287a3b942f97a1fce84cd40e6de70e0abbaca1f996557ee8933e2f450e4a5368d1b4ba4f6b3d9379b9565ef3437776b94
-  data.tar.gz: da41863c1b1e8668b2176cdca70331e519d194fc157638eff61cac5037c6e6f3d7ef07609204e88f1008d4e324ca654202200bf4f7843ff82a1757e07e340a4d
+  metadata.gz: c8782d8a249ee6de70705f806386d1f6fb3afbea4f33451ef7e0337641e87c3b88f0cbc804de35131ef46da8f85e3121a694cd79f4171a912809b0330d5e4e6d
+  data.tar.gz: f051ec5acb746f52c71924d757e35c955715838dfc994c82eb6d2cfaa630bb9b50d8b26c2d8fe7a34d392e06084cf9121906591f8951a0b7feae372093021d0b

data/Rakefile

@@ -1,36 +1,35 @@
 # Setup bundler to avoid having to run bundle exec all the time.
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-require 'rails/version'
-rakefile     = Rails.version.to_f >= 5.2 ? '../rjmc/Rakefile' : '../rjmc4/Rakefile'
-APP_RAKEFILE = File.expand_path(rakefile, __FILE__)
-load 'rails/tasks/engine.rake'
+require "rails/version"
+APP_RAKEFILE = File.expand_path("../rjmc/Rakefile", __FILE__)
+load "rails/tasks/engine.rake"
 
-require 'rake/testtask'
-require_relative 'lib/rocket_job_mission_control/version'
+require "rake/testtask"
+require_relative "lib/rocket_job_mission_control/version"
 
 task :gem do
-  system 'gem build rocketjob_mission_control.gemspec'
+  system "gem build rocketjob_mission_control.gemspec"
 end
 
 task publish: :gem do
   system "git tag -a v#{RocketJobMissionControl::VERSION} -m 'Tagging #{RocketJobMissionControl::VERSION}'"
-  system 'git push --tags'
+  system "git push --tags"
   system "gem push rocketjob_mission_control-#{RocketJobMissionControl::VERSION}.gem"
   system "rm rocketjob_mission_control-#{RocketJobMissionControl::VERSION}.gem"
 end
 
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = "test/**/*_test.rb"
   t.verbose = true
   t.warning = false
 end
 
 # By default run tests against all appraisals
 if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
-  require 'appraisal'
-  task default: 'app:appraisal'
+  require "appraisal"
+  task default: "app:appraisal"
 else
   task default: :test
 end

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

@@ -12,10 +12,8 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require dataTables/jquery.dataTables
-//= require dataTables/extras/dataTables.responsive
-//= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
-//= require bootstrap-sprockets
+//= require datatables.min.js
+//= require bootstrap.min
 //
 // Selectize is used by Array builder in application_helper#editable_field_html
 //= require microplugin

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

@@ -10,14 +10,12 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require dataTables/extras/dataTables.responsive
- *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
  *= require_self
  *= require_tree .
  */
 
-@import 'bootstrap-sprockets';
-@import 'bootstrap';
+@import 'bootstrap.min';
 @import 'fontawesome-all.min';
 @import 'selectize';
 @import 'selectize.bootstrap3';
+@import 'datatables.min';

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

@@ -473,8 +473,7 @@ $hr-border:                                 $gray-lighter;
 
 $component-offset-horizontal: 180px;
 
-@import "bootstrap-sprockets";
-@import "bootstrap";
+@import "bootstrap.min";
 
 .alert {
   margin-bottom: 0px;

data/app/controllers/rocket_job_mission_control/application_controller.rb

@@ -7,7 +7,7 @@ module RocketJobMissionControl
     private
 
     def with_time_zone(&block)
-      if time_zone = session['time_zone'] || 'UTC'
+      if time_zone = session["time_zone"] || "UTC"
         Time.use_zone(time_zone, &block)
       end
     end
@@ -20,7 +20,7 @@ module RocketJobMissionControl
           else
             {roles: %i[admin]}
           end
-        AccessPolicy.new(Authorization.new(@args))
+        AccessPolicy.new(Authorization.new(**@args))
       end
     end
 
@@ -30,6 +30,5 @@ module RocketJobMissionControl
         args[:login]
       end
     end
-
   end
 end

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -12,32 +12,33 @@ module RocketJobMissionControl
 
     rescue_from AccessGranted::AccessDenied do |exception|
       raise exception if Rails.env.development? || Rails.env.test?
-      redirect_to :back, alert: 'Access not authorized.'
+
+      redirect_to :back, alert: "Access not authorized."
     end
 
     def index
-      @data_table_url = dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.all, 'All')
+      @data_table_url = dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.all, "All")
     end
 
     def disabled
-      @data_table_url = disabled_dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.disabled, 'Disabled')
+      @data_table_url = disabled_dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.disabled, "Disabled")
     end
 
     def enabled
-      @data_table_url = enabled_dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.enabled, 'Enabled')
+      @data_table_url = enabled_dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.enabled, "Enabled")
     end
 
     def failed
-      @data_table_url = failed_dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.failed, 'Failed')
+      @data_table_url = failed_dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.failed, "Failed")
     end
 
     def pending
-      @data_table_url = pending_dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.pending, 'Pending')
+      @data_table_url = pending_dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.pending, "Pending")
     end
 
     def show
@@ -48,7 +49,7 @@ module RocketJobMissionControl
       @previous_job_class_names = RocketJob::DirmonEntry.distinct(:job_class_name)
 
       if dirmon_params[:job_class_name] && !@dirmon_entry.job_class
-        @dirmon_entry.errors.add(:job_class_name, 'Invalid Job Class')
+        @dirmon_entry.errors.add(:job_class_name, "Invalid Job Class")
       end
     end
 
@@ -75,6 +76,25 @@ module RocketJobMissionControl
     def edit
       authorize! :edit, @dirmon_entry
     end
+    # When you click on the Copy button, 
+    # the copy method loads the Dirmon Entity attributes in Copy Dirmon Entry Page
+    def copy
+      authorize! :copy, @dirmon_entry
+    end
+    # When you click on the replicate button,
+    # the replicate method clones the existing Dirmon Entity
+    def replicate
+      authorize! :replicate, @dirmon_entry
+      dirmon_entry_replicate = RocketJob::DirmonEntry.new(@dirmon_entry.dup.attributes.except("id"))
+      if properties = params[:rocket_job_dirmon_entry][:properties]
+        dirmon_entry_replicate.properties = JobSanitizer.sanitize(properties, dirmon_entry_replicate.job_class, dirmon_entry_replicate, false)
+      end
+      if dirmon_entry_replicate.errors.empty? && dirmon_entry_replicate.valid? && dirmon_entry_replicate.update_attributes(dirmon_params)
+        redirect_to(rocket_job_mission_control.dirmon_entry_path(dirmon_entry_replicate))
+      else
+        render :copy
+      end
+    end
 
     def update
       authorize! :update, @dirmon_entry
@@ -94,7 +114,7 @@ module RocketJobMissionControl
         @dirmon_entry.enable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
-        flash[:alert] = t(:failure, scope: [:dirmon_entry, :enable])
+        flash[:alert] = t(:failure, scope: %i[dirmon_entry enable])
         render(:show)
       end
     end
@@ -105,7 +125,7 @@ module RocketJobMissionControl
         @dirmon_entry.disable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
-        flash[:alert] = t(:failure, scope: [:dirmon_entry, :disable])
+        flash[:alert] = t(:failure, scope: %i[dirmon_entry disable])
         render(:show)
       end
     end
@@ -127,16 +147,16 @@ module RocketJobMissionControl
 
     def find_entry_or_redirect
       unless @dirmon_entry = RocketJob::DirmonEntry.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: [:dirmon_entry, :find], id: params[:id])
+        flash[:alert] = t(:failure, scope: %i[dirmon_entry find], id: params[:id])
 
         redirect_to(dirmon_entries_path)
       end
     end
 
     def dirmon_params
-      params
-        .fetch(:rocket_job_dirmon_entry, {})
-        .permit(:name, :archive_directory, :pattern, :job_class_name)
+      params.
+        fetch(:rocket_job_dirmon_entry, {}).
+        permit(:name, :archive_directory, :pattern, :job_class_name)
     end
 
     def render_datatable(entries, description)
@@ -147,7 +167,7 @@ module RocketJobMissionControl
         end
         format.json do
           query                 = RocketJobMissionControl::Query.new(entries, name: :asc)
-          query.search_columns  = [:job_class_name, :name, :pattern]
+          query.search_columns  = %i[job_class_name name pattern]
           query.display_columns = %w[name _type pattern]
           render(json: DirmonEntriesDatatable.new(view_context, query))
         end

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -14,62 +14,62 @@ module RocketJobMissionControl
 
     def index
       jobs            = RocketJob::Job.all.only(JobsDatatable::ALL_FIELDS)
-      @data_table_url = jobs_url(format: 'json')
+      @data_table_url = jobs_url(format: "json")
 
-      render_datatable(jobs, 'All', JobsDatatable::ALL_COLUMNS, id: :desc)
+      render_datatable(jobs, "All", JobsDatatable::ALL_COLUMNS, id: :desc)
     end
 
     def running
       # Prevent throttled jobs from displaying.
       jobs            = RocketJob::Job.
-        running.
-        where(:started_at.lte => (Time.now - 0.1)).
-        only(JobsDatatable::RUNNING_FIELDS)
-      @data_table_url = running_jobs_url(format: 'json')
+                        running.
+                        where(:started_at.lte => (Time.now - 0.1)).
+                        only(JobsDatatable::RUNNING_FIELDS)
+      @data_table_url = running_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Running', JobsDatatable::RUNNING_COLUMNS, priority: :asc, created_at: :asc)
+      render_datatable(jobs, "Running", JobsDatatable::RUNNING_COLUMNS, priority: :asc, created_at: :asc)
     end
 
     def paused
       jobs            = RocketJob::Job.paused.only(JobsDatatable::COMMON_FIELDS)
-      @data_table_url = paused_jobs_url(format: 'json')
+      @data_table_url = paused_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Paused', JobsDatatable::PAUSED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, "Paused", JobsDatatable::PAUSED_COLUMNS, completed_at: :desc)
     end
 
     def completed
       jobs            = RocketJob::Job.completed.only(JobsDatatable::COMMON_FIELDS)
-      @data_table_url = completed_jobs_url(format: 'json')
+      @data_table_url = completed_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Completed', JobsDatatable::COMPLETED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, "Completed", JobsDatatable::COMPLETED_COLUMNS, completed_at: :desc)
     end
 
     def aborted
       jobs            = RocketJob::Job.aborted.only(JobsDatatable::COMMON_FIELDS)
-      @data_table_url = aborted_jobs_url(format: 'json')
+      @data_table_url = aborted_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Aborted', JobsDatatable::ABORTED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, "Aborted", JobsDatatable::ABORTED_COLUMNS, completed_at: :desc)
     end
 
     def failed
       jobs            = RocketJob::Job.failed.only(JobsDatatable::COMMON_FIELDS)
-      @data_table_url = failed_jobs_url(format: 'json')
+      @data_table_url = failed_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Failed', JobsDatatable::FAILED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, "Failed", JobsDatatable::FAILED_COLUMNS, completed_at: :desc)
     end
 
     def queued
       jobs            = RocketJob::Job.queued_now.only(JobsDatatable::QUEUED_FIELDS)
-      @data_table_url = queued_jobs_url(format: 'json')
+      @data_table_url = queued_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Queued', JobsDatatable::QUEUED_COLUMNS, priority: :asc, created_at: :asc)
+      render_datatable(jobs, "Queued", JobsDatatable::QUEUED_COLUMNS, priority: :asc, created_at: :asc)
     end
 
     def scheduled
       jobs            = RocketJob::Job.scheduled.only(JobsDatatable::SCHEDULED_FIELDS)
-      @data_table_url = scheduled_jobs_url(format: 'json')
+      @data_table_url = scheduled_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Scheduled', JobsDatatable::SCHEDULED_COLUMNS, run_at: :asc)
+      render_datatable(jobs, "Scheduled", JobsDatatable::SCHEDULED_COLUMNS, run_at: :asc)
     end
 
     def update
@@ -138,7 +138,7 @@ module RocketJobMissionControl
       # Scope: [[slice1], [slice2], [slice(n)]
       authorize! :view_slice, @job
       error_type = params[:error_type]
-      scope      = @job.input.failed.where('exception.class_name' => error_type)
+      scope      = @job.input.failed.where("exception.class_name" => error_type)
 
       # Used by pagination to display the correct slice
       # Offset refers to the slice number from the array "scope".
@@ -149,7 +149,7 @@ module RocketJobMissionControl
       @lines                 = current_failure.records
       @failure_exception     = current_failure.try!(:exception)
       @view_slice_pagination = {
-        record_number: current_failure['exception']['record_number'],
+        record_number: current_failure.processing_record_number,
         offset:        @offset,
         total:         (scope.count - 1)
       }
@@ -162,7 +162,7 @@ module RocketJobMissionControl
       error_type         = params[:error_type]
       @line_index        = params[:line_index].to_i
       @offset            = params.fetch(:offset, 0).to_i
-      scope              = @job.input.failed.where('exception.class_name' => error_type)
+      scope              = @job.input.failed.where("exception.class_name" => error_type)
       current_failure    = scope.order(_id: 1).limit(1).skip(@offset).first
       @lines             = current_failure.records
       @failure_exception = current_failure.try!(:exception)
@@ -174,20 +174,20 @@ module RocketJobMissionControl
       # Params from the edit_slice form
       error_type      = params[:error_type]
       offset          = params[:offset]
-      updated_records = params['job']['records']
+      updated_records = params["job"]["records"]
 
       # Finds specific slice [Array]
-      slice         = @job.input.failed.skip(offset).first
+      slice = @job.input.failed.skip(offset).first
 
       # Assings modified slice (from the form) back to slice
       slice.records = updated_records
 
       if slice.save
         logger.info("Slice Updated By #{login}, job: #{@job.id}, file_name: #{@job.upload_file_name}")
-        flash[:success] = 'slice updated'
+        flash[:success] = "slice updated"
         redirect_to view_slice_job_path(@job, error_type: error_type)
       else
-        flash[:danger] = 'Error updating slice.'
+        flash[:danger] = "Error updating slice."
       end
     end
 
@@ -200,7 +200,7 @@ module RocketJobMissionControl
       line_index = params[:line_index].to_i
 
       # Finds specific slice [Array]
-      scope = @job.input.failed.where('exception.class_name' => error_type)
+      scope = @job.input.failed.where("exception.class_name" => error_type)
       slice = scope.order(_id: 1).limit(1).skip(offset).first
 
       # Finds and deletes line
@@ -213,9 +213,9 @@ module RocketJobMissionControl
       if slice.save
         logger.info("Line Deleted By #{login}, job: #{@job.id}, file_name: #{@job.upload_file_name}")
         redirect_to view_slice_job_path(@job, error_type: error_type)
-        flash[:success] = 'line removed'
+        flash[:success] = "line removed"
       else
-        flash[:danger] = 'Error removing line.'
+        flash[:danger] = "Error removing line."
       end
     end
 
@@ -229,9 +229,9 @@ module RocketJobMissionControl
         redirect_to(job_path(@job))
       end
 
-      scope = @job.input.failed.where('exception.class_name' => error_type)
+      scope = @job.input.failed.where("exception.class_name" => error_type)
       count = scope.count
-      unless count > 0
+      unless count.positive?
         flash[:notice] = t(:no_errors, scope: %i[job failures])
         redirect_to(job_path(@job))
       end
@@ -269,18 +269,19 @@ module RocketJobMissionControl
 
     def error_occurred(exception)
       if defined?(SemanticLogger::Logger) && logger.is_a?(SemanticLogger::Logger)
-        logger.error 'Error loading a job', exception
+        logger.error "Error loading a job", exception
       else
         logger.error "Error loading a job. #{exception.class}: #{exception.message}\n#{(exception.backtrace || []).join("\n")}"
       end
 
       flash[:danger] = if exception.is_a?(AccessGranted::AccessDenied)
-                         'Access not authorized.'
+                         "Access not authorized."
                        else
-                         'Error loading jobs.'
+                         "Error loading jobs."
                        end
 
       raise exception if Rails.env.development? || Rails.env.test?
+
       redirect_to :back
     end
 
@@ -307,7 +308,7 @@ module RocketJobMissionControl
         h             = {data: index.to_s}
         h[:width]     = column[:width] if column.key?(:width)
         h[:orderable] = column[:orderable] if column.key?(:orderable)
-        index         += 1
+        index += 1
         h
       end
     end