rocketjob_mission_control 5.0.1 → 6.0.0.beta

data/app/assets/stylesheets/rocket_job_mission_control/{callout.scss → callout.css}

@@ -4,74 +4,72 @@
   border-left-width: 0.5em;
 }
 .callout-queued {
-  border-left-color: #A29F00;
-  a {
-    color: #A29F00;
-  }
+  border-left-color: #a29f00;
+}
+.callout-queued a {
+  color: #a29f00;
 }
 .callout-running {
   border-left-color: #337ab7;
-  a {
-    color: #337ab7;
-  }
+}
+.callout-running a {
+  color: #337ab7;
 }
 .callout-sleeping {
   border-left-color: darkcyan;
-  a {
-    color: darkcyan;
-  }
+}
+.callout-sleeping a {
+  color: darkcyan;
 }
 .callout-scheduled {
-  border-left-color: #92001B;
-  a {
-    color: #92001B;
-  }
+  border-left-color: purple;
+}
+.callout-scheduled a {
+  color: purple;
 }
 .callout-completed {
   border-left-color: green;
-  a {
-    color: green;
-  }
+}
+.callout-completed a {
+  color: green;
 }
 .callout-paused {
   border-left-color: orange;
-  a {
-    color: orange;
-  }
+}
+.callout-paused a {
+  color: orange;
 }
 .callout-failed {
   border-left-color: red;
-  a {
-    color: red;
-  }
+}
+.callout-failed a {
+  color: red;
 }
 .callout-aborted {
   border-left-color: darkorange;
-  a {
-    color: darkorange;
-  }
 }
-
+.callout-aborted a {
+  color: darkorange;
+}
 /* Used by Dirmon Entries */
 .callout-pending {
   border-color: orange;
-  a {
-    color: orange;
-  }
+}
+.callout-pending a {
+  color: orange;
 }
 .callout-enabled {
   border-left-color: green;
-  a {
-    color: green;
-  }
+}
+.callout-enabled a {
+  color: green;
 }
 .callout-disabled {
   border-left-color: grey;
-  a {
-    color: grey;
-  }
 }
-
+.callout-disabled a {
+  color: grey;
+}
 /* Used by Servers */
 .callout-top {
   border: 1px solid #eee;
@@ -79,31 +77,31 @@
 }
 .callout-info {
   border-left-color: #1b809e;
-  .title {
-    color: #1b809e;
-  }
+}
+.callout-info .title {
+  color: #1b809e;
 }
 .callout-success {
   border-left-color: #3c763d;
-  .title {
-    color: #3c763d;
-  }
+}
+.callout-success .title {
+  color: #3c763d;
 }
 .callout-warning {
   border-left-color: #aa6708;
-  .title {
-    color: #aa6708;
-  }
+}
+.callout-warning .title {
+  color: #aa6708;
 }
 .callout-alert {
   border-left-color: #ce4844;
-  .title {
-    color: #ce4844;
-  }
+}
+.callout-alert .title {
+  color: #ce4844;
 }
 .callout-zombie {
   border-left-color: darkred;
-  .title {
-    color: darkred;
-  }
+}
+.callout-zombie .title {
+  color: darkred;
 }

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

@@ -0,0 +1,57 @@
+.job-list {
+	/*padding: 1px 1px 1px 1px;
+	*/
+}
+ .job-list .breadcrumb {
+	 margin-bottom: 0px;
+}
+ .job-list .breadcrumb {
+	 padding: 2px;
+}
+ .job-list .breadcrumb > li {
+	 margin: 5px 0 0 5px;
+}
+ .job-list .list .progress {
+	 width: 10em;
+	 height: 1em;
+	 margin: 5px 0px 0px 10px;
+	 display: inline-block;
+	 -webkit-border-radius: 0 !important;
+	 -moz-border-radius: 0 !important;
+	 border-radius: 0 !important;
+}
+ .job-list .list .progress-bar {
+	 min-width: 0em;
+}
+ .error pre {
+	 margin: 0px 0px 0px 0px;
+	 border-bottom: 0;
+	 border-radius: 0;
+	 word-wrap: normal;
+}
+ .error pre:last-child {
+	 border: 1px solid #ccc;
+}
+ .pagination {
+	 margin-top: 1em;
+}
+ .pagination .btn {
+	 border-radius: 0;
+}
+ .input_slices {
+	 font-size: 14px;
+	 line-height: 2;
+	 resize: none;
+	 width: 100%;
+	 height: 20em;
+	 padding-top: 5px;
+	 padding-bottom: 5px;
+	 margin-bottom: 4px;
+}
+ .edit_button {
+	 float: right;
+	 margin-left: 3px;
+}
+ .edit_input {
+	 margin-left: 80px;
+}

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

@@ -0,0 +1,7 @@
+#servers .server-collection-actions {
+  margin: 1em 0;
+}
+#servers .actions > a {
+  display: inline;
+  margin: 5px;
+}

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -1,18 +1,11 @@
 module RocketJobMissionControl
   class DirmonEntriesController < RocketJobMissionControl::ApplicationController
-    if Rails.version.to_i < 5
-      before_filter :find_entry_or_redirect, except: %i[index disabled enabled failed pending new create]
-      before_filter :authorize_read, only: %i[index disabled enabled failed pending]
-      before_filter :show_sidebar
-    else
-      before_action :find_entry_or_redirect, except: %i[index disabled enabled failed pending new create]
-      before_action :authorize_read, only: %i[index disabled enabled failed pending]
-      before_action :show_sidebar
-    end
+    before_action :find_entry_or_redirect, except: %i[index disabled enabled failed pending new create]
+    before_action :authorize_read, only: %i[index disabled enabled failed pending]
+    before_action :show_sidebar
 
     rescue_from AccessGranted::AccessDenied do |exception|
       raise exception if Rails.env.development? || Rails.env.test?
-
       redirect_to :back, alert: "Access not authorized."
     end
 
@@ -56,6 +49,7 @@ module RocketJobMissionControl
     def create
       authorize! :create, RocketJob::DirmonEntry
       @dirmon_entry = RocketJob::DirmonEntry.new(dirmon_params)
+
       if properties = params[:rocket_job_dirmon_entry][:properties]
         @dirmon_entry.properties = JobSanitizer.sanitize(properties, @dirmon_entry.job_class, @dirmon_entry, false)
       end
@@ -76,19 +70,23 @@ module RocketJobMissionControl
     def edit
       authorize! :edit, @dirmon_entry
     end
-    # When you click on the Copy button, 
+
+    # 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)
+        dirmon_entry_replicate.properties = JobSanitizer.sanitize(properties, dirmon_entry_replicate.job_class, @dirmon_entry, 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
@@ -98,10 +96,12 @@ module RocketJobMissionControl
 
     def update
       authorize! :update, @dirmon_entry
-      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.update_attributes(dirmon_params)
+      sanitized_params = DirmonSanitizer.sanitize(params[:rocket_job_dirmon_entry], @dirmon_entry.job_class, @dirmon_entry)
+      properties       = DirmonSanitizer.diff_properties(sanitized_params[:properties], @dirmon_entry)
+
+      sanitized_params[:properties] = properties
+
+      if @dirmon_entry.errors.empty? && @dirmon_entry.valid? && @dirmon_entry.update_attributes(sanitized_params)
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
         render :edit
@@ -110,6 +110,7 @@ module RocketJobMissionControl
 
     def enable
       authorize! :enable, @dirmon_entry
+
       if @dirmon_entry.may_enable?
         @dirmon_entry.enable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
@@ -121,6 +122,7 @@ module RocketJobMissionControl
 
     def disable
       authorize! :disable, @dirmon_entry
+
       if @dirmon_entry.may_disable?
         @dirmon_entry.disable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
@@ -148,15 +150,12 @@ 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])
-
         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, :properties)
     end
 
     def render_datatable(entries, description)
@@ -165,6 +164,7 @@ module RocketJobMissionControl
           @description = description
           render :index
         end
+
         format.json do
           query                 = RocketJobMissionControl::Query.new(entries, name: :asc)
           query.search_columns  = %i[job_class_name name pattern]

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -74,8 +74,11 @@ module RocketJobMissionControl
 
     def update
       authorize! :update, @job
-      permitted_params = JobSanitizer.sanitize(params[:job], @job.class, @job)
-      if @job.errors.empty? && @job.valid? && @job.update_attributes(permitted_params)
+      permitted_params = JobSanitizer.sanitize(job_params, @job.class, @job)
+
+      assign_job_values(@job, permitted_params)
+
+      if @job.errors.empty? && @job.valid? && @job.save
         redirect_to job_path(@job)
       else
         render :edit
@@ -247,6 +250,24 @@ module RocketJobMissionControl
 
     private
 
+    def assign_job_values(target, hash)
+      hash.each_pair do |attribute, value|
+        if attribute == :input_categories
+          value.each do |category_hash|
+            h = category_hash.dup
+            assign_job_values(target.input_category(h.delete(:name)), h)
+          end
+        elsif attribute == :output_categories
+          value.each do |category_hash|
+            h = category_hash.dup
+            assign_job_values(target.output_category(h.delete(:name)), h)
+          end
+        elsif attribute != :id
+          target.send("#{attribute}=", value)
+        end
+      end
+    end
+
     def authorize_read
       authorize! :read, RocketJob::Job
     end
@@ -264,7 +285,26 @@ module RocketJobMissionControl
     end
 
     def job_params
-      params.require(:job).permit(@job.class.user_editable_fields)
+      params.require(:job).permit(
+        @job.class.user_editable_fields,
+        input_categories_attributes: [
+          :id,
+          :name,
+          :format,
+          :format_options,
+          :mode,
+          :skip_unknown,
+          :slice_size,
+          columns: []
+        ],
+        output_categories_attributes: [
+          :id,
+          :name,
+          :format,
+          :format_options,
+          columns: []
+        ]
+      )
     end
 
     def error_occurred(exception)
@@ -308,7 +348,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

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

@@ -57,7 +57,7 @@ module RocketJobMissionControl
     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 +67,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_field(field_name, 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