rocketjob_mission_control 5.0.0.beta1 → 6.0.0

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,56 @@
+.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%;
+	 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/application_controller.rb

@@ -20,11 +20,13 @@ module RocketJobMissionControl
           else
             {roles: %i[admin]}
           end
-        AccessPolicy.new(Authorization.new(@args))
+        AccessPolicy.new(Authorization.new(**@args))
       end
     end
 
     def login
+      return unless Config.authorization_callback
+
       @login ||= begin
         args = instance_exec(&Config.authorization_callback)
         args[:login]

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
@@ -77,12 +71,37 @@ module RocketJobMissionControl
       authorize! :edit, @dirmon_entry
     end
 
-    def update
-      authorize! :update, @dirmon_entry
+    # 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.properties = JobSanitizer.sanitize(properties, @dirmon_entry.job_class, @dirmon_entry, 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
+        render :copy
       end
-      if @dirmon_entry.errors.empty? && @dirmon_entry.valid? && @dirmon_entry.update_attributes(dirmon_params)
+    end
+
+    def update
+      authorize! :update, @dirmon_entry
+      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
@@ -91,22 +110,24 @@ 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))
       else
-        flash[:alert] = t(:failure, scope: %i[dirmon_entry enable])
+        flash[:danger] = t(:failure, scope: %i[dirmon_entry enable])
         render(:show)
       end
     end
 
     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))
       else
-        flash[:alert] = t(:failure, scope: %i[dirmon_entry disable])
+        flash[:danger] = t(:failure, scope: %i[dirmon_entry disable])
         render(:show)
       end
     end
@@ -128,16 +149,13 @@ 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])
-
+        flash[:danger] = t(:failure, scope: %i[dirmon_entry find], id: ActionController::Base.helpers.sanitize(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)
@@ -146,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
@@ -179,6 +182,9 @@ module RocketJobMissionControl
       # Finds specific slice [Array]
       slice = @job.input.failed.skip(offset).first
 
+      # Converts \r\n line breaks to \n
+      updated_records.each { |record| record.gsub(/\r\n/, "\n") }
+
       # Assings modified slice (from the form) back to slice
       slice.records = updated_records
 
@@ -225,14 +231,14 @@ module RocketJobMissionControl
       offset     = params.fetch(:offset, 0).to_i
 
       unless error_type.present?
-        flash[:notice] = t(:no_errors, scope: %i[job failures])
+        flash[:warning] = t(:no_errors, scope: %i[job failures])
         redirect_to(job_path(@job))
       end
 
       scope = @job.input.failed.where("exception.class_name" => error_type)
       count = scope.count
       unless count.positive?
-        flash[:notice] = t(:no_errors, scope: %i[job failures])
+        flash[:warning] = t(:no_errors, scope: %i[job failures])
         redirect_to(job_path(@job))
       end
 
@@ -247,6 +253,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
@@ -257,14 +281,33 @@ module RocketJobMissionControl
 
     def find_job_or_redirect
       unless @job = RocketJob::Job.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: %i[job find], id: params[:id])
+        flash[:danger] = t(:failure, scope: %i[job find], id: ActionController::Base.helpers.sanitize(params[:id]))
 
         redirect_to(jobs_path)
       end
     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 +351,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