mini_scheduler 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 777f9e6ead21883c1d387e2a0dde3385232ba427f815c4061bd2e458a67952a7
-  data.tar.gz: 70276e36f76000faa0754ab4c012adde2a4543c84e6ea6a53ed7c995baa14169
+  metadata.gz: 5245e51580c6faf50498bc135f734972487c05558a6896904bfafee834cc7693
+  data.tar.gz: 1b8642c7cd5e91dfc6b43defd1c3bc4656114bb7e8fe642c29bba41b74865010
 SHA512:
-  metadata.gz: 51c6d80f4f13168b7b1c268a54c8b73e52d116c60d6c6065f6e9d7776e4cb0bd1358665538c43d7df890da062a5254b52b2bd962403d2fa3d96640a1d97fed44
-  data.tar.gz: fa88eda9058769f2c60abb6b041f87fc8923e78b2c00a2685d5be0be4a245ce22bbf7cd1bb9784410c2a9de6881ac5b1b231a4c989c1abc5a3ac7140e9382bcc
+  metadata.gz: ca4d9476ead76bcf47fd9a97ae1ab4186f659cb910b112236d2932f5c13eafb47fa173ce4dbeb65693569086c063bc75713565f7dce4ca3b44398a182f41bcda
+  data.tar.gz: ac955352d65e1748e723b36691880c30cf4fa0db4198d4a2ecf58b7edf00fd23d6161d652c24b9409e793555399563845d82769cf6fe5443fc67e92d7ae3e38e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.12.2 - 11-09-2019
+
+- Allow sorting schedule history by schedule name
+
 # 0.12.1 - 30-08-2019
 
 - Jobs that change family from per host to non per host can cause a tight loop

data/lib/mini_scheduler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniScheduler
-  VERSION = "0.12.1"
+  VERSION = "0.12.2"
 end

data/lib/mini_scheduler/views/history.erb

@@ -2,7 +2,20 @@
   <div class="col-sm-12">
     <h3>Scheduler History</h3>
   </div>
+
+  <div class="col-sm-12">
+    <form>
+      <select name="filter">
+        <option value="All" <%= "selected" if !@filter %>>All</option>
+        <% @schedules.each do |schedule| %>
+          <option value="<%=schedule%>" <%= "selected" if @filter == schedule.to_s%>><%=schedule%></option>
+        <% end %>
+      </select>
+      <input type="submit" value="Filter">
+    </form>
+  </div>
 </header>
+<br>
 
 <div class="container">
   <div class="row">

data/lib/mini_scheduler/views/scheduler.erb

@@ -39,7 +39,7 @@
             <td>
               <%= sane_duration @info.prev_duration %>
             </td>
-            <td>
+            <td style="word-wrap: break-word">
               <%= @info.current_owner %>
             </td>
             <td>

data/lib/mini_scheduler/web.rb

@@ -4,6 +4,20 @@ module MiniScheduler
   module Web
     VIEWS = File.expand_path('views', File.dirname(__FILE__)) unless defined? VIEWS
 
+    def self.find_schedules_by_time
+      Manager.discover_schedules.sort do |a, b|
+        a_next = a.schedule_info.next_run
+        b_next = b.schedule_info.next_run
+        if a_next && b_next
+          a_next <=> b_next
+        elsif a_next
+          -1
+        else
+          1
+        end
+      end
+    end
+
     def self.registered(app)
 
       app.helpers do
@@ -24,23 +38,24 @@ module MiniScheduler
 
       app.get "/scheduler" do
         MiniScheduler.before_sidekiq_web_request&.call
-        @schedules = Manager.discover_schedules.sort do |a, b|
-          a_next = a.schedule_info.next_run
-          b_next = b.schedule_info.next_run
-          if a_next && b_next
-            a_next <=> b_next
-          elsif a_next
-            -1
-          else
-            1
-          end
-        end
+        @schedules = Web.find_schedules_by_time
         erb File.read(File.join(VIEWS, 'scheduler.erb')), locals: { view_path: VIEWS }
       end
 
       app.get "/scheduler/history" do
         MiniScheduler.before_sidekiq_web_request&.call
-        @scheduler_stats = Stat.order('started_at desc').limit(200)
+        @schedules = Manager.discover_schedules
+        @schedules.sort_by!(&:to_s)
+        @scheduler_stats = Stat.order('started_at desc')
+
+        @filter = params[:filter]
+        names = @schedules.map(&:to_s)
+        @filter = nil if !names.include?(@filter)
+        if @filter
+          @scheduler_stats = @scheduler_stats.where(name: @filter)
+        end
+
+        @scheduler_stats = @scheduler_stats.limit(200)
         erb File.read(File.join(VIEWS, 'history.erb')), locals: { view_path: VIEWS }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_scheduler
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Sam Saffron
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq