rocketjob_mission_control 5.0.0.beta1 → 6.0.0

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/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -47,7 +47,7 @@ module RocketJobMissionControl
       {display: "Started", value: :started, field: "started_at"},
       {display: "Actions", value: :action_buttons, orderable: false}
     ].freeze
-    RUNNING_FIELDS = (COMMON_FIELDS + %i[record_count collect_output input_categories output_categories encrypt compress slice_size priority sub_state percent_complete]).freeze
+    RUNNING_FIELDS = (COMMON_FIELDS + %i[record_count input_categories output_categories priority sub_state percent_complete]).freeze
 
     SCHEDULED_COLUMNS = [
       {display: "Class", value: :class_with_link, field: "_type"},

data/app/helpers/rocket_job_mission_control/application_helper.rb

@@ -56,8 +56,16 @@ 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, include_nil_selectors = false)
+    def editable_field_html(klass, field_name, value, f)
       # When editing a job the values are of the correct type.
       # When editing a dirmon entry values are strings.
       field = klass.fields[field_name.to_s]
@@ -67,44 +75,61 @@ module RocketJobMissionControl
       placeholder = nil if placeholder.is_a?(Proc)
 
       case field.type.name
-      when "Symbol", "String", "Integer"
+      when "Integer"
+        options = extract_inclusion_values(klass, field_name)
+        f.number_field(field_name, in: options, include_blank: false, value: value, class: "form-control", placeholder: placeholder)
+      when "String", "Symbol", "Mongoid::StringifiedSymbol"
         options = extract_inclusion_values(klass, field_name)
-        str     = "[#{field.type.name}]\n".html_safe
         if options
-          str + f.select(field_name, options, {include_blank: options.include?(nil) || include_nil_selectors, selected: value}, {class: "selectize form-control"})
+          f.select(field_name, options, {include_blank: options.include?(nil), selected: value}, {class: "selectize form-control"})
         else
-          if field.type.name == "Integer"
-            str + f.number_field(field_name, value: value, class: "form-control", placeholder: placeholder)
-          else
-            str + f.text_field(field_name, value: value, class: "form-control", placeholder: placeholder)
-          end
+          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"]
+        f.select(field_name, options, {include_blank: options.include?(nil), selected: value}, {class: "selectize form-control"})
       when "Hash"
         "[JSON Hash]\n".html_safe +
           f.text_field(field_name, value: value ? value.to_json : "", class: "form-control", placeholder: '{"key1":"value1", "key2":"value2", "key3":"value3"}')
       when "Array"
         options = Array(value)
-        "[Array]\n".html_safe +
-          f.select(field_name, options_for_select(options, options), {include_hidden: false}, {class: "selectize form-control", multiple: true})
-      when "Mongoid::Boolean"
-        name = "#{field_name}_true".to_sym
-        value = value.to_s
-        str = '<div class="radio-buttons">'.html_safe
-        str << f.radio_button(field_name, "true", checked: value == "true")
-        str << " ".html_safe + f.label(name, "true")
-        str << " ".html_safe + f.radio_button(field_name, "false", checked: value == "false")
-        str << " ".html_safe + f.label(name, "false")
-        # Allow this field to be unset (nil).
-        if include_nil_selectors
-          str << " ".html_safe + f.radio_button(field_name, "", checked: value == "")
-          str << " ".html_safe + f.label(name, "nil")
-        end
-
-        str << "</div>".html_safe
+        f.select(field_name, options_for_select(options, options), {include_hidden: false}, {class: "selectize form-control", multiple: true})
       else
         "[#{field.type.name}]".html_safe +
           f.text_field(field_name, value: value, class: "form-control", placeholder: placeholder)
       end
     end
+
+    # This method creates a link with `data-id` `data-fields` attributes. These attributes are used to create new instances of the nested fields through Javascript.
+    def link_to_add_fields(name, f, association, option)
+      # Takes an object (@job) and creates a new instance of its associated model (:properties)
+      new_object = f.object.send(association).klass.new
+
+      # Saves the unique ID of the object into a variable.
+      # This is needed to ensure the key of the associated array is unique. This is makes parsing the content in the `data-fields` attribute easier through Javascript.
+      # We could use another method to achive this.
+      id = new_object.object_id
+
+      # https://api.rubyonrails.org/ fields_for(record_name, record_object = nil, fields_options = {}, &block)
+      # record_name = :addresses
+      # record_object = new_object
+      # fields_options = { child_index: id }
+      # child_index` is used to ensure the key of the associated array is unique, and that it matched the value in the `data-id` attribute.
+      # `person[addresses_attributes][child_index_value][_destroy]`
+      fields = f.fields_for(association, new_object, child_index: id) do |builder|
+        # `association.to_s.singularize + "_fields"` ends up evaluating to `address_fields`
+        # The render function will then look for `views/people/_address_fields.html.erb`
+        # The render function also needs to be passed the value of 'builder', because `views/dirmon_entries/_input_categories.html.erb` needs this to render the form tags.
+        render(association.to_s.singularize + "_fields", f: builder)
+      end
+
+      # This renders a simple link, but passes information into `data` attributes.
+      # This info can be named anything we want, but in this case we chose `data-id:` and `data-fields:`.
+      # The `id:` is from `new_object.object_id`.
+      # The `fields:` are rendered from the `fields` blocks.
+      # We use `gsub("\n", "")` to remove anywhite space from the rendered partial.
+      # The `id:` value needs to match the value used in `child_index: id`.
+      link_to(name, '#', class: "add_fields btn btn-#{option}", data: { id: id, fields: fields.gsub("\n", "") })
+    end
   end
 end

data/app/helpers/rocket_job_mission_control/dirmon_entries_helper.rb

@@ -3,5 +3,17 @@ module RocketJobMissionControl
     def dirmon_counts_by_state(state)
       RocketJob::DirmonEntry.counts_by_state.fetch(state.downcase.to_sym, 0)
     end
+
+
+    def dirmon_entry_find_category(categories, category_name = :main)
+      return unless categories
+
+      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/jobs_helper.rb

@@ -1,5 +1,23 @@
 module RocketJobMissionControl
   module JobsHelper
+    # The fields that RJMC already displays, all other will be rendered under the custom section.
+    DISPLAYED_FIELDS = %w[
+      _id _type
+      completed_at created_at cron_schedule
+      description destroy_on_complete download_encryption
+      exception expires_at
+      failed_at_list failure_count
+      input_categories
+      log_level
+      output_categories output_path
+      percent_complete priority
+      record_count retry_limit run_at
+      started_at state statistics sub_state
+      throttle_group throttle_running_workers
+      upload_file_name
+      worker_name
+    ]
+
     def job_icon(job)
       state = job_state(job)
       state_icon(state)
@@ -15,6 +33,47 @@ module RocketJobMissionControl
       end
     end
 
+    def job_state_name(job)
+      job_state(@job).to_s.camelcase
+    end
+
+    def job_time(time)
+      return "" unless time
+      time.in_time_zone(Time.zone)
+    end
+
+    def job_state_time(job)
+      return job_time(job.run_at) if job.scheduled?
+
+      job_time(job.completed_at || job.started_at || job.created_at )
+      # job_time(job.running? ? job.started_at : job.completed_at)
+    end
+
+    def job_estimated_time_left(job)
+      if job.record_count && job.running? && job.record_count.positive?
+        percent = job.percent_complete
+        if percent >= 5
+          secs = job.seconds.to_f
+          RocketJob.seconds_as_duration((((secs / percent) * 100) - secs))
+        end
+      end
+    end
+
+    def job_records_per_hour(job)
+      return unless job.completed?
+
+      secs = job.seconds.to_f
+      ((job.record_count.to_f / secs) * 60 * 60).round if job.record_count&.positive? && (secs > 0.0)
+    end
+
+    def job_custom_fields(job)
+      attrs = job.attributes.dup
+      DISPLAYED_FIELDS.each { |key| attrs.delete(key) }
+      # Convert time zones for any custom time fields
+      attrs.keys { |key| attrs[key] = attrs[key].in_time_zone(Time.zone) if attrs[key].is_a?(Time) }
+      attrs
+    end
+
     def job_states
       @job_states ||= RocketJob::Job.aasm.states.map { |state| state.name.to_s }
     end
@@ -25,10 +84,10 @@ module RocketJobMissionControl
 
     def job_counts_by_state(state)
       @job_counts ||= begin
-        counts          = RocketJob::Job.counts_by_state
-        counts[:queued] = counts[:queued_now] || 0
-        counts
-      end
+                        counts          = RocketJob::Job.counts_by_state
+                        counts[:queued] = counts[:queued_now] || 0
+                        counts
+                      end
       @job_counts.fetch(state.downcase.to_sym, 0)
     end
 
@@ -38,8 +97,9 @@ module RocketJobMissionControl
         path,
         method: http_method,
         title:  "#{action} job",
-        class:  "btn btn-default",
-        data:   {confirm: t(:confirm, scope: %i[job action], action: action)}
+        class:  "btn btn-default btn-group",
+        role:   "group",
+        data:   { confirm: t(:confirm, scope: %i[job action], action: action) }
       )
     end
 
@@ -49,8 +109,9 @@ module RocketJobMissionControl
         path,
         method: http_method,
         title:  "#{action} job",
-        class:  "btn btn-primary",
-        data:   {confirm: t(:confirm, scope: %i[job action], action: action)}
+        class:  "btn btn-default btn-group",
+        role:   "group",
+        data:   { confirm: t(:confirm, scope: %i[job action], action: action) }
       )
     end
 
@@ -61,5 +122,12 @@ module RocketJobMissionControl
         ""
       end
     end
+
+    def job_find_category(categories, category_name = :main)
+      return unless categories
+
+      categories.each { |category| return category if category_name == (category["name"] || :main).to_sym }
+      nil
+    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/access_policy.rb

@@ -25,9 +25,9 @@ module RocketJobMissionControl
         can %i[edit pause resume retry abort fail update run_now], RocketJob::Job
       end
 
-      # Create, Destroy, Enable, Disable, Edit Dirmon Entries
+      # Create, Destroy, Enable, Disable, Edit, Copy, Replicate Dirmon Entries
       role :dirmon, {dirmon: true} do
-        can %i[create enable disable update edit], RocketJob::DirmonEntry
+        can %i[create enable disable update edit copy replicate], RocketJob::DirmonEntry
       end
 
       # A User can only edit their own jobs

data/app/models/rocket_job_mission_control/dirmon_sanitizer.rb

@@ -0,0 +1,68 @@
+module RocketJobMissionControl
+  module DirmonSanitizer
+    DIRMON_FIELDS = %i(archive_directory job_class_name name pattern).freeze
+
+    def self.sanitize(params, job_class, target)
+      permissible_params = {}
+
+      DIRMON_FIELDS.each do |field_name|
+        value = params[field_name]
+        next if value.blank?
+
+        permissible_params[field_name] = value
+      end
+
+      if params.key?(:properties)
+        properties                      = JobSanitizer.sanitize(params[:properties], job_class, target, false)
+        permissible_params[:properties] = properties unless properties.blank?
+      end
+
+      permissible_params
+    end
+
+    # Returns [Hash] the difference between the supplied params and those already set in the job itself
+    def self.diff_properties(sanitized_properties, dirmon_entry)
+      default_job = dirmon_entry.job_class.new
+      updated_job = dirmon_entry.job_class.from_properties(sanitized_properties)
+      properties  = {}
+      sanitized_properties&.each_pair do |name, value|
+        if name == :input_categories
+          categories = []
+          value.each do |category_properties|
+            category_name = category_properties[:name].to_sym
+            props         = diff_category(category_properties, updated_job.input_category(category_name), default_job.input_category(category_name))
+            categories << props unless props.empty?
+          end
+          properties[:input_categories] = categories unless categories.empty?
+        elsif name == :output_categories
+          categories = []
+          value.each do |category_properties|
+            category_name = category_properties[:name].to_sym
+            props         = diff_category(category_properties, updated_job.output_category(category_name), default_job.output_category(category_name))
+            categories << props unless props.empty?
+          end
+          properties[:output_categories] = categories unless categories.empty?
+        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
+    end
+
+    def self.diff_category(properties, updated_category, default_category)
+      diff = {}
+      name = nil
+      properties&.each_pair do |key, value|
+        if key == :name
+          name = value
+          next
+        end
+        next if updated_category.public_send(key) == default_category.public_send(key)
+
+        diff[key] = value
+      end
+      diff[:name] = name unless diff.empty?
+      diff
+    end
+  end
+end

data/app/models/rocket_job_mission_control/job_sanitizer.rb

@@ -1,5 +1,7 @@
 module RocketJobMissionControl
   module JobSanitizer
+    CATEGORIES_FIELDS = %i[id name format format_options mode skip_unknown slice_size columns].freeze
+
     # Returns [Hash] the permissible params for the specified job class, after sanitizing.
     # Parameters
     #   properties [Hash]
@@ -17,6 +19,7 @@ module RocketJobMissionControl
     #     Default: true
     def self.sanitize(properties, job_class, target, nil_blank = true)
       permissible_params = {}
+
       job_class.user_editable_fields.each do |field_name|
         next unless value = properties[field_name]
 
@@ -24,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)
@@ -38,7 +43,39 @@ module RocketJobMissionControl
           permissible_params[field_name] = value
         end
       end
+
+      if properties.key?(:input_categories_attributes)
+        categories                            = sanitize_categories(properties[:input_categories_attributes])
+        permissible_params[:input_categories] = categories unless categories == [{}]
+      end
+
+      if properties.key?(:output_categories_attributes)
+        categories                             = sanitize_categories(properties[:output_categories_attributes])
+        permissible_params[:output_categories] = categories unless categories == [{}]
+      end
+
       permissible_params
     end
+
+    def self.sanitize_categories(properties)
+      categories = []
+
+      properties.each_pair do |_, category|
+        hash = {}
+        CATEGORIES_FIELDS.each do |key|
+          next unless category.key?(key)
+
+          value = category[key]
+          next if value.blank?
+          next if (key == :columns) && value == [""]
+
+          value     = JSON.parse(value) if key == :format_options
+          hash[key] = value
+        end
+        categories << hash
+      end
+
+      categories
+    end
   end
 end