rocketjob_mission_control 3.0.0.rc1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70e693d49e4ca57ddb518fbd75c3b66facbe134d
-  data.tar.gz: f2d480f5f2f19fdb8106f5d258173b05b66e6d11
+  metadata.gz: 841a844611078eb6e374b46c7da8026adb5e1af4
+  data.tar.gz: 810b1f18daf8ebf333a5cace7771f97294aaaee9
 SHA512:
-  metadata.gz: 6e040ed3c8d00608471dc4c55e07b4b28f17731ed07ab2c6309663993f91323e8f348816d4b2de37e9f9290ccc5c3bec7eda905227a76ac29bff082e4fc6abd4
-  data.tar.gz: f6871621fb675475d9733cd181c108a6d7ad3877b65a8a47128f68ef5b8eaaedb26859df81a511c4fb37a4487a4ca465339f5bb044b903736e95e84fa79d5367
+  metadata.gz: 53d73b5170970540fb19bc514cb319b3f3924799f5a0fec97f1d4a0a83da57d93b97d53197f7ea3fc544e9fcc4ad7102bd5c461d42eab8215b1536ff7bfe3d9b
+  data.tar.gz: 9c869b611740289e4fc9743bd80980e297d72324cca4c0cb4dc578bfcd3cfc5cd0c26f0c6d7a9492d390977938ac98f5d69edcda64e909b83bbbbfa9aa976828

data/Rakefile

@@ -1,12 +1,8 @@
-APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+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 'rspec/core'
-require 'rspec/core/rake_task'
-
-task spec: 'app:spec'
-task default: :spec
 
 task :gem do
   system 'gem build rocketjob_mission_control.gemspec'
@@ -18,3 +14,11 @@ task publish: :gem do
   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.verbose = true
+  t.warning = false
+end
+
+task default: :test

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

@@ -15,10 +15,11 @@
 //= require dataTables/jquery.dataTables
 //= require dataTables/extras/dataTables.responsive
 //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
+//
+// Selectize is used by Array builder in application_helper#editable_field_html
 //= require microplugin
 //= require sifter
 //= require selectize
-//= require jquery.bootstrap-touchspin
-//= require bootstrap-sprockets
-//= require prism
+// End selectize dependencies
+//
 //= require_tree .

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

@@ -0,0 +1,12 @@
+$(document).ready(() => toggleCanvas());
+
+var toggleCanvas = () =>
+  $('[data-toggle=offcanvas]').click(function () {
+    $(this).toggleClass('visible-xs text-center');
+    $(this).find('i').toggleClass('fa-chevron-right fa-chevron-left');
+    $('.row-offcanvas').toggleClass('active');
+    $('#lg-menu').toggleClass('hidden-xs').toggleClass('visible-xs');
+    $('#xs-menu').toggleClass('visible-xs').toggleClass('hidden-xs');
+    return $('#btnShow').toggle();
+  })
+;

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

@@ -0,0 +1,40 @@
+var RjmcDatatable = class RjmcDatatable {
+  constructor(table, columns, opts) {
+    this.reloadTable = this.reloadTable.bind(this);
+    if (opts == null) { opts = {}; }
+    this.table = $(table);
+    this.columns = columns;
+    this.ordering = opts.ordering != null ? opts.ordering : true;
+    this.searching = opts.searching != null ? opts.searching : true;
+    this.pageLength = opts.pageLength != null ? opts.pageLength : 100;
+    this.order = opts.order != null ? opts.order : [];
+    this.reload = $("[data-behavior='reload']");
+    this.initializeTable();
+    this.setEvents();
+  }
+
+  initializeTable() {
+    return this.data = this.table.DataTable({
+      pagingType: 'full_numbers',
+      pageLength: this.pageLength,
+      responsive: true,
+      ajax: this.table.data('source'),
+      processing: true,
+      serverSide: true,
+      columns: this.columns,
+      ordering: this.ordering,
+      searching: this.searching,
+      order: this.order
+    });
+  }
+
+  setEvents() {
+    return this.reload.on('click', this.reloadTable);
+  }
+
+  reloadTable() {
+    let icon = this.reload.find('i');
+    icon.addClass('fa-spin');
+    return this.data.ajax.reload(() => icon.removeClass('fa-spin'));
+  }
+};

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

@@ -0,0 +1,16 @@
+$(document).on('ready', function() {
+  $('.filter .state-toggle').on('change', function() {
+    let active_states = $('.filter :checked');
+    let param_string = "?";
+    active_states.each((_, state) => param_string += `states[]=${$(state).attr('id')}&`);
+    return window.location.href = window.location.href.replace( /[\?#].*|$/, param_string );
+  });
+
+  if ($('#properties').length) {
+    return $('#properties').on('click', function() {
+      let params = $('#new_rocket_job_dirmon_entry').serialize();
+      let new_dirmon_path = $('#properties').data('url') + `?${params}`;
+      return window.location = new_dirmon_path;
+    });
+  }
+});

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

@@ -0,0 +1,6 @@
+$(document).on('ready', () =>
+  $('select.selectize').selectize({
+    create:       true,
+    hideSelected: true
+  })
+);

data/app/controllers/rocket_job_mission_control/active_workers_controller.rb

@@ -1,14 +1,25 @@
 module RocketJobMissionControl
   class ActiveWorkersController < RocketJobMissionControl::ApplicationController
-    # The list of workers actively processing jobs
-    # [Array[Array<server_name [String], job [RocketJob::Job], slice_id [String]]]
     def index
-      @active_workers = RocketJob::ActiveWorker.all
-      @query          = RocketJobMissionControl::Query.new(@active_workers, name: :asc)
+      @server_name = params[:server_name]
+      if job_id = params[:job_id]
+        @job = RocketJob::Job.find(job_id)
+      end
 
       respond_to do |format|
         format.html
-        format.json { render(json: ActiveWorkersDatatable.new(view_context, @query)) }
+        format.json do
+          # The list of workers actively processing jobs. Sorted by longest running workers first.
+          active_workers =
+            if @job
+              @job.rocket_job_active_workers
+            else
+              RocketJob::ActiveWorker.all(@server_name).sort { |a, b| b.duration_s <=> a.duration_s }
+            end
+
+          query = RocketJobMissionControl::Query.new(active_workers)
+          render(json: ActiveWorkersDatatable.new(view_context, query))
+        end
       end
     end
   end

data/app/controllers/rocket_job_mission_control/application_controller.rb

@@ -1,5 +1,7 @@
 module RocketJobMissionControl
   class ApplicationController < ActionController::Base
+    protect_from_forgery with: :exception
+
     around_action :with_time_zone
 
     private

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -1,16 +1,31 @@
-require 'csv'
 module RocketJobMissionControl
   class DirmonEntriesController < RocketJobMissionControl::ApplicationController
-    before_filter :find_entry_or_redirect, except: [:index, :new, :create]
-    before_filter :clean_values, only: [:create, :update]
+    before_filter :find_entry_or_redirect, except: [:index, :disabled, :enabled, :failed, :pending, :new, :create]
     before_filter :show_sidebar
 
     def index
-      @query = RocketJobMissionControl::Query.new(RocketJob::DirmonEntry.all, name: :asc)
-      respond_to do |format|
-        format.html
-        format.json { render(json: DirmonEntriesDatatable.new(view_context, @query)) }
-      end
+      @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')
+    end
+
+    def 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')
+    end
+
+    def pending
+      @data_table_url = pending_dirmon_entries_url(format: 'json')
+      render_datatable(RocketJob::DirmonEntry.pending, 'Pending')
     end
 
     def show
@@ -27,11 +42,11 @@ module RocketJobMissionControl
 
     def create
       @dirmon_entry = RocketJob::DirmonEntry.new(dirmon_params)
-
-      parse_and_assign_properties
+      if properties = params[:rocket_job_dirmon_entry][:properties]
+        @dirmon_entry.properties = JobSanitizer.sanitize(properties, @dirmon_entry.job_class, @dirmon_entry, false)
+      end
 
       if @dirmon_entry.errors.empty? && @dirmon_entry.save
-        flash[:success] = t(:success, scope: [:dirmon_entry, :create])
         redirect_to(dirmon_entry_path(@dirmon_entry))
       else
         render :new
@@ -40,8 +55,6 @@ module RocketJobMissionControl
 
     def destroy
       @dirmon_entry.destroy
-      flash[:success] = t(:success, scope: [:dirmon_entry, :destroy])
-
       redirect_to(dirmon_entries_path)
     end
 
@@ -49,10 +62,11 @@ module RocketJobMissionControl
     end
 
     def update
-      @dirmon_entry.attributes = dirmon_params
-      parse_and_assign_properties
-      if @dirmon_entry.errors.empty? && @dirmon_entry.save
-        flash[:success] = t(:success, scope: [:dirmon_entry, :update])
+      if properties = params[:rocket_job_dirmon_entry][:properties]
+        @dirmon_entry.properties = JobSanitizer.sanitize(properties, @dirmon_entry.job_class, @dirmon_entry, false)
+      end
+
+      if @dirmon_entry.errors.empty? && @dirmon_entry.valid? && @dirmon_entry.save
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
         render :edit
@@ -62,7 +76,6 @@ module RocketJobMissionControl
     def enable
       if @dirmon_entry.may_enable?
         @dirmon_entry.enable!
-        flash[:success] = t(:success, scope: [:dirmon_entry, :enable])
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
         flash[:alert] = t(:failure, scope: [:dirmon_entry, :enable])
@@ -73,7 +86,6 @@ module RocketJobMissionControl
     def disable
       if @dirmon_entry.may_disable?
         @dirmon_entry.disable!
-        flash[:success] = t(:success, scope: [:dirmon_entry, :disable])
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
         flash[:alert] = t(:failure, scope: [:dirmon_entry, :disable])
@@ -92,65 +104,33 @@ module RocketJobMissionControl
       @dirmon_sidebar = true
     end
 
-    def parse_and_assign_properties
-      properties = params[:rocket_job_dirmon_entry].fetch(:properties, {})
-      properties.each_pair do |property, value|
-        if key = @dirmon_entry.job_class.fields[property]
-          if key.type == Hash
-            begin
-              @dirmon_entry.properties[property] = JSON.parse(value)
-            rescue JSON::ParserError => e
-              @dirmon_entry.errors.add(:properties, e.message)
-            end
-          else
-            @dirmon_entry.properties[property] = value
-          end
-        end
-      end
-    end
-
-    # Returns [Array<String>] an array from the supplied string
-    # String can also be in JSON format
-    def parse_array_element(value, attribute, could_be_singleton = false)
-      return if value.blank?
-      begin
-        JSON.parse(value)
-      rescue JSON::ParserError => e
-        begin
-          values = CSV.parse(value).first.collect { |col| JSON.parse("[#{col.to_s.strip}]").first }
-          could_be_singleton && (values.size == 1) ? values.first : values
-        rescue Exception => exc
-          @dirmon_entry.errors.add(attribute, e.message)
-          @dirmon_entry.errors.add(attribute, exc.message)
-          value
-        end
-      end
-    end
-
-    def clean_values
-      params[:rocket_job_dirmon_entry].fetch(:properties, {}).each_pair do |param, value|
-        params[:rocket_job_dirmon_entry][:properties].delete(param) if value.blank?
-      end
-    end
-
     def find_entry_or_redirect
-      @dirmon_entry = RocketJob::DirmonEntry.find(params[:id])
-
-      if @dirmon_entry.nil?
+      unless @dirmon_entry = RocketJob::DirmonEntry.where(id: params[:id]).first
         flash[:alert] = t(:failure, scope: [:dirmon_entry, :find], id: params[:id])
 
         redirect_to(dirmon_entries_path)
       end
     end
 
-    def dirmons_params
-      params.fetch(:states, [])
-    end
-
     def dirmon_params
       params
         .fetch(:rocket_job_dirmon_entry, {})
         .permit(:name, :archive_directory, :pattern, :job_class_name)
     end
+
+    def render_datatable(entries, description)
+      respond_to do |format|
+        format.html do
+          @description = description
+          render :index
+        end
+        format.json do
+          query                 = RocketJobMissionControl::Query.new(entries, name: :asc)
+          query.search_columns  = [:job_class_name, :name, :pattern]
+          query.display_columns = %w[name _type pattern]
+          render(json: DirmonEntriesDatatable.new(view_context, query))
+        end
+      end
+    end
   end
 end

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -1,20 +1,68 @@
 module RocketJobMissionControl
   class JobsController < RocketJobMissionControl::ApplicationController
-    before_filter :find_job_or_redirect, except: [:index]
+    before_filter :find_job_or_redirect, except: [:index, :aborted, :completed, :failed, :paused, :queued, :running, :scheduled]
     before_filter :show_sidebar
     rescue_from StandardError, with: :error_occurred
 
     def index
-      @query = RocketJobMissionControl::Query.new(RocketJob::Job.all, id: :desc)
-      respond_to do |format|
-        format.html
-        format.json { render(json: JobsDatatable.new(view_context, @query)) }
-      end
+      jobs            = RocketJob::Job.all.only(JobsDatatable::ALL_FIELDS)
+      @data_table_url = jobs_url(format: 'json')
+
+      render_datatable(jobs, 'All', JobsDatatable::ALL_COLUMNS, id: :desc)
+    end
+
+    def running
+      jobs            = RocketJob::Job.running.only(JobsDatatable::RUNNING_FIELDS)
+      @data_table_url = running_jobs_url(format: 'json')
+
+      render_datatable(jobs, 'Running', JobsDatatable::RUNNING_COLUMNS, started_at: :desc)
+    end
+
+    def paused
+      jobs            = RocketJob::Job.paused.only(JobsDatatable::COMMON_FIELDS)
+      @data_table_url = paused_jobs_url(format: 'json')
+
+      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')
+
+      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')
+
+      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')
+
+      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')
+
+      render_datatable(jobs, 'Queued', JobsDatatable::QUEUED_COLUMNS, completed_at: :desc)
+    end
+
+    def scheduled
+      jobs            = RocketJob::Job.scheduled.only(JobsDatatable::SCHEDULED_FIELDS)
+      @data_table_url = scheduled_jobs_url(format: 'json')
+
+      render_datatable(jobs, 'Scheduled', JobsDatatable::SCHEDULED_COLUMNS, run_at: :asc)
     end
 
     def update
-      JobSanitizer.new(params).sanitize
-      if @job.update_attributes(job_params)
+      permitted_params = JobSanitizer.sanitize(params[:job], @job.class, @job)
+      if @job.errors.empty? && @job.valid? && @job.update_attributes(permitted_params)
         redirect_to job_path(@job)
       else
         render :edit
@@ -23,7 +71,6 @@ module RocketJobMissionControl
 
     def abort
       @job.abort!
-
       redirect_to(job_path(@job))
     end
 
@@ -34,25 +81,22 @@ module RocketJobMissionControl
 
     def retry
       @job.retry!
-
       redirect_to(job_path(@job))
     end
 
     def pause
       @job.pause!
-
       redirect_to(job_path(@job))
     end
 
     def resume
       @job.resume!
-
       redirect_to(job_path(@job))
     end
 
     def run_now
       @job.unset(:run_at) if @job.scheduled?
-      redirect_to scheduled_jobs_path
+      redirect_to(job_path(@job))
     end
 
     def fail
@@ -71,6 +115,31 @@ module RocketJobMissionControl
       @exceptions = @job.input.group_exceptions
     end
 
+    def exception
+      error_type = params[:error_type]
+      offset     = params.fetch(:offset, 0).to_i
+
+      unless error_type.present?
+        flash[:notice] = t(:no_errors, scope: [:job, :failures])
+        redirect_to(job_path(@job))
+      end
+
+      scope = @job.input.failed.where('exception.class_name' => error_type)
+      count = scope.count
+      unless count > 0
+        flash[:notice] = t(:no_errors, scope: [:job, :failures])
+        redirect_to(job_path(@job))
+      end
+
+      current_failure    = scope.order(_id: 1).limit(1).skip(offset).first
+      @failure_exception = current_failure.try!(:exception)
+
+      @pagination = {
+        offset: offset,
+        total:  (count - 1),
+      }
+    end
+
     private
 
     def show_sidebar
@@ -85,12 +154,8 @@ module RocketJobMissionControl
       end
     end
 
-    def jobs_params
-      params.fetch(:states, [])
-    end
-
     def job_params
-      params.require(:job).permit(RocketJob::Job.user_editable_fields)
+      params.require(:job).permit(@job.class.user_editable_fields)
     end
 
     def error_occurred(exception)
@@ -100,8 +165,37 @@ module RocketJobMissionControl
         logger.error "Error loading a job. #{exception.class}: #{exception.message}\n#{(exception.backtrace || []).join("\n")}"
       end
       flash[:danger] = 'Error loading jobs.'
-      raise exception if Rails.env.development?
+      raise exception if Rails.env.development? || Rails.env.test?
       redirect_to :back
     end
+
+    def render_datatable(jobs, description, columns, sort_order)
+      respond_to do |format|
+        format.html do
+          @description  = description
+          @columns      = columns
+          @table_layout = build_table_layout(columns)
+          render :index
+        end
+        format.json do
+          query                 = RocketJobMissionControl::Query.new(jobs, sort_order)
+          query.search_columns  = [:_type, :description]
+          query.display_columns = columns.collect { |c| c[:field] }.compact
+          render(json: JobsDatatable.new(view_context, query, columns))
+        end
+      end
+    end
+
+    def build_table_layout(columns)
+      index = 0
+      columns.collect do |column|
+        h             = {data: index.to_s}
+        h[:width]     = column[:width] if column.has_key?(:width)
+        h[:orderable] = column[:orderable] if column.has_key?(:orderable)
+        index         += 1
+        h
+      end
+    end
+
   end
 end