rocketjob_mission_control 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 304c034afa2db7c0db432bc35a23cf61a98bb0ea
-  data.tar.gz: af4d336900d12e6f2aa7b3913e024ff7bd3dec8b
+  metadata.gz: 77e3e2d84930ed4d9f4f02099057948af722ee7c
+  data.tar.gz: 6ff14b67a5c4855d0c66d41d684a633f3a94c6d4
 SHA512:
-  metadata.gz: 322c4304792cba14b21561dbea0e3f33e7bcbe44db1dd4a21ae5598b9e9e8af4ae32a7e02419cc37344e3a687ac5e8089694d790ee00345cb3470a8b9026d0bb
-  data.tar.gz: 8c512bd2504b5f0dfd1acff972d661219a45d8ec53c4dd7c43696f62e10b94acb7d0c4301dbab2ec2831e8b38d3647b46203de897014d18644690e9e424eac8e
+  metadata.gz: 18bc9dfc4e06fdd0f0a1d4b49ce6a9bfbb130c8e38402bdc8f124f3e322e7fb94dd240a46e3b6a286e067d69c393d7e71abcfca62fcac49839798b670d5dbd19
+  data.tar.gz: f50ac9b5b4dea01e2bbe28b21586970e981e5a69e52bc6c381af54f78d945e21ac8dcf30236136e47b69a432666026523fa29d38f91b38a1fa4595204e309db4

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

@@ -15,4 +15,5 @@
 //= require jquery.bootstrap-touchspin
 //= require bootstrap-sprockets
 //= require prism
+//= require selectize
 //= require_tree .

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

@@ -7,12 +7,9 @@ $(document).on 'ready', ->
     window.location.href = window.location.href.replace( /[\?#].*|$/, param_string );
 
   if $('#properties').length
-    $('#expand').on 'click', ->
-      $(this).hide()
-      $('#collapse').show()
-      $('#properties').show()
-    $('#collapse').on 'click', ->
-      $(this).hide()
-      $('#expand').show()
-      $('#properties').hide()
+    $('#properties').on 'click', ->
+      job_class_name  = $('#rocket_job_dirmon_entry_job_class_name').val()
+      perform_method  = $('#rocket_job_dirmon_entry_perform_method').val()
+      new_dirmon_path = $('#properties').data('url') + "?job_class_name=#{job_class_name}&perform_method=#{perform_method}"
+      window.location = new_dirmon_path
 

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

@@ -0,0 +1,5 @@
+$(document).on 'ready', ->
+  $('select.selectize').selectize(
+    create: true
+    hideSelected: true
+  )

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

@@ -10,6 +10,8 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
+ *= require selectize
+ *= require selectize.default
  *= require_self
  *= require_tree .
  */

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -1,3 +1,4 @@
+require 'csv'
 module RocketJobMissionControl
   class DirmonEntriesController < RocketJobMissionControl::ApplicationController
     before_filter :find_entry_or_redirect, except: [:index, :new, :create]
@@ -11,13 +12,21 @@ module RocketJobMissionControl
     end
 
     def new
-      @dirmon_entry = RocketJob::DirmonEntry.new(arguments: nil)
+      job_class_name            = params[:job_class_name]
+      perform_method            = params[:perform_method] || :perform
+      @dirmon_entry             = RocketJob::DirmonEntry.new(arguments: nil, job_class_name: job_class_name, perform: perform_method)
+      @previous_job_class_names = RocketJob::DirmonEntry.distinct(:job_class_name)
+
+      if job_class_name && !@dirmon_entry.job_class
+        @dirmon_entry.errors.add(:job_class_name, 'Invalid Job Class')
+      end
     end
 
     def create
       @dirmon_entry = RocketJob::DirmonEntry.new(dirmon_params)
 
       parse_and_assign_arguments
+      parse_and_assign_properties
 
       if @dirmon_entry.errors.empty? && @dirmon_entry.save
         flash[:success] = t(:success, scope: [:dirmon_entry, :create])
@@ -39,8 +48,10 @@ module RocketJobMissionControl
     end
 
     def update
+      @dirmon_entry.attributes = dirmon_params
       parse_and_assign_arguments
-      if @dirmon_entry.errors.empty? && @dirmon_entry.update_attributes(dirmon_params)
+      parse_and_assign_properties
+      if @dirmon_entry.errors.empty? && @dirmon_entry.save
         flash[:success] = t(:success, scope: [:dirmon_entry, :update])
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
@@ -55,7 +66,7 @@ module RocketJobMissionControl
         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])
+        flash[:alert] = t(:failure, scope: [:dirmon_entry, :enable])
         load_entries
         render(:show)
       end
@@ -67,22 +78,60 @@ module RocketJobMissionControl
         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])
+        flash[:alert] = t(:failure, scope: [:dirmon_entry, :disable])
         load_entries
         render(:show)
       end
     end
 
+    def properties
+      @dirmon_entry = RocketJob::DirmonEntry.new(dirmon_params)
+      render json: @dirmon_entry
+    end
+
     private
 
     def parse_and_assign_arguments
-      arguments = params[:rocket_job_dirmon_entry][:arguments]
-      arguments = arguments.blank? ? '[]' : arguments
+      arguments               = params[:rocket_job_dirmon_entry][:arguments] || []
+      @dirmon_entry.arguments = arguments.collect do |value|
+        cleansed = parse_array_element(value, :arguments, true)
+        @dirmon_entry.errors.add(:arguments, 'All arguments are mandatory') unless cleansed
+        cleansed
+      end
+    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.keys[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
-        arguments               = JSON.parse(arguments)
-        @dirmon_entry.arguments = arguments.kind_of?(Array) ? arguments : [arguments]
+        JSON.parse(value)
       rescue JSON::ParserError => e
-        @dirmon_entry.errors.add(:arguments, e.message)
+        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
 

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -88,7 +88,11 @@ module RocketJobMissionControl
     end
 
     def error_occurred(exception)
-      logger.error 'Error loading a job', exception
+      if defined?(SemanticLogger::Logger) && logger.is_a?(SemanticLogger::Logger)
+        logger.error 'Error loading a job', exception
+      else
+        logger.error "Error loading a job. #{log.exception.class}: #{log.exception.message}\n#{(log.exception.backtrace || []).join("\n")}"
+      end
       flash[:danger] = 'Error loading jobs.'
       raise exception if Rails.env.development?
       redirect_to :back

data/app/models/job_failures.rb

@@ -12,6 +12,9 @@ class JobFailures
   def list
     @slice_errors ||= job.input.collection.aggregate(
       [
+        {
+          '$match' => { state: 'failed' }
+        },
         {
           '$group' => {
             _id:      { error_class: '$exception.class_name' },

data/app/views/rocket_job_mission_control/dirmon_entries/_form.html.haml

@@ -1,7 +1,7 @@
 - action ||= :create
 - if @dirmon_entry.errors.present?
   .alert.alert-alert
-    Error saving entry!
+    Invalid Dirmon entry!
     - @dirmon_entry.errors.messages.each_pair do |field, message|
       .message
         = "#{field}: #{message}"
@@ -12,28 +12,25 @@
   .path.form-group
     = f.label :pattern
     = f.text_field :pattern, class: 'form-control'
-  .path.form-group
-    = f.label :archive_directory
-    = f.text_field :archive_directory, class: 'form-control'
   .job.form-group
     = f.label :job_class_name
-    = f.text_field :job_class_name, class: 'form-control'
+    = f.text_field :job_class_name, class: 'form-control', disabled: action != :create
   .job.form-group
     = f.label :perform_method
-    = f.text_field :perform_method, class: 'form-control'
-  .job_arguments.form-group
-    = f.label :arguments
-    = f.text_area :arguments,
-      value: @dirmon_entry.arguments.empty? ? nil : @dirmon_entry.arguments.to_json,
-      rows: 10,
-      placeholder: '{"argument1"":"value1", "argument2":"value2", "argument3":"value3"}',
-      class: 'form-control'
+    = f.text_field :perform_method, class: 'form-control', disabled: action != :create
+  .path.form-group
+    = f.label :archive_directory
+    = f.text_field :archive_directory, class: 'form-control'
   .row
-    .col-md-12#properties{ style: 'display:none;' }
+    .col-md-12
       = render partial: 'properties', locals: { f: f }
 
   .buttons
     = f.submit action, class: 'btn btn-primary'
     = link_to 'cancel', :back, class: 'btn btn-default'
-    = button_tag 'properties',type: 'button', class: 'btn btn-default', id: 'expand'
-    = button_tag 'collapse',type: 'button', class: 'btn btn-default', id: 'collapse', style: 'display:none;'
+    - if action == :create
+      = button_tag 'properties',
+          type: 'button',
+          class: 'btn btn-default',
+          id: 'properties',
+          data: { url: rocket_job_mission_control.new_dirmon_entry_path }

data/app/views/rocket_job_mission_control/dirmon_entries/_properties.html.haml

@@ -1,8 +1,38 @@
-.arguments
-  = f.fields_for :properties do |properties|
-    .form-group
-      = properties.label :description
-      = properties.text_field :description, value: @dirmon_entry.properties[:description], placeholder: "max length: 128", class: 'form-control'
-    .form-group
-      = properties.label :priority
-      = properties.text_field :priority, value: @dirmon_entry.properties[:priority], placeholder: "e.g 1..100", class: 'form-control'
+- if @dirmon_entry.job_class
+  .arguments
+    .job_arguments.form-group
+      - count = @dirmon_entry.job_class.argument_count(@dirmon_entry.perform_method)
+      - count.times do |counter|
+        - argument = @dirmon_entry.arguments[counter]
+        = f.label "Argument #{counter + 1}:"
+        = f.text_field :arguments,
+          value: argument.is_a?(Hash) || argument.is_a?(Array) ? argument.to_json : argument,
+          name: 'rocket_job_dirmon_entry[arguments][]',
+          rows: 10,
+          placeholder: '{"argument1":"value1", "argument2":"value2", "argument3":"value3"}',
+          class: 'form-control'
+    = f.fields_for :properties do |properties|
+      - @dirmon_entry.job_class.rocket_job_properties.each do |property_name|
+        - next if [:arguments, :perform_method].include?(property_name)
+        - key = @dirmon_entry.job_class.keys[property_name.to_s]
+        - next unless key
+        - placeholder = key.default? ? key.default : nil
+        .form-group
+          = properties.label property_name.to_s
+          - case key.type.name
+          - when 'Integer'
+            = properties.number_field property_name, value: @dirmon_entry.properties[property_name], class: 'form-control', placeholder: placeholder
+          - when 'Array'
+            - options = Array(@dirmon_entry.properties[property_name])
+            = properties.select property_name, options_for_select(options, options), {include_hidden: false}, {class: 'selectize', multiple: true}
+          - when 'Boolean'
+            - name = "#{property_name}_true".to_sym
+            .radio-buttons
+              = properties.label name, 'true'
+              = properties.radio_button(property_name, 'true', checked: @dirmon_entry.properties[property_name] == 'true')
+              = properties.label name, 'false'
+              = properties.radio_button(property_name, 'false', checked: @dirmon_entry.properties[property_name] == 'false')
+              = properties.label name, 'none'
+              = properties.radio_button(property_name, '', checked: @dirmon_entry.properties[property_name].blank?)
+          - else
+            = properties.text_field property_name, value: @dirmon_entry.properties[property_name], class: 'form-control', placeholder: placeholder

data/app/views/rocket_job_mission_control/dirmon_entries/_status.html.haml

@@ -13,14 +13,19 @@
 %div
   %label Archive Directory:
   = @dirmon_entry.archive_directory
-.parameters
-  %label Arguments:
-  %pre
-    %code= pretty_print_array_or_hash(@dirmon_entry.arguments)
-.parameters
-  %label Properties:
-  %pre
-    %code= pretty_print_array_or_hash(@dirmon_entry.properties)
+-if @dirmon_entry.arguments.size > 0
+  .parameters
+    %label Arguments:
+    %pre
+      %code= pretty_print_array_or_hash(@dirmon_entry.arguments)
+- @dirmon_entry.properties.each_pair do |name, value|
+  .parameters
+    %label= "#{name.to_s.titleize}:"
+    - if value.is_a?(Array) || value.is_a?(Hash)
+      %pre
+        %code= pretty_print_array_or_hash(value)
+    - else
+      = value
 .id
   %label ID:
   = @dirmon_entry.id

data/app/views/rocket_job_mission_control/jobs/running.html.haml

@@ -17,8 +17,7 @@
           - if job.kind_of?(RocketJob::SlicedJob)
             .slice_count
               %label Slices Running:
-              -#= job.input.find_all { |s| s.state == :running }.count
-              = job.input.collection.aggregate([{ '$match' => { state: 'queued' } },{ '$group' => { _id: nil, count: { '$sum' => 1 } } }] )
+              = job.input.find_all { |s| s.state == :running }.count
           - else
             .worker
               %label Worker:

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

@@ -46,7 +46,7 @@
         - if valid_events.include?(:retry)
           = job_action_link('retry', rocket_job_mission_control.retry_job_path(@job), :patch)
 
-        - if @job.failed? && @job.kind_of?(RocketJob::SlicedJob)
+        - if @job.failed? && @job.kind_of?(RocketJob::SlicedJob) && @job.input.failed_count > 0
           = link_to("view errors", job_failures_path(@job), class: 'btn btn-default')
 
       .clearfix

data/lib/rocket_job_mission_control/engine.rb

@@ -11,5 +11,6 @@ module RocketJobMissionControl
     require 'bootstrap-sass'
     require 'sass-rails'
     require 'coffee-rails'
+    require 'selectize-rails'
   end
 end

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end