good_job 2.12.2 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d56e35eff62e8575f9096bcbc763978c0803d675232bf7aa939a0603434f6c6
-  data.tar.gz: aec46224383849afe2b9ba93d245f70674f4af85765bfd804bb23f528229fd6d
+  metadata.gz: 1c154bb21bc4a390c8e7f488e3a110dace697b660585d67cf66fcc21a1ebbeeb
+  data.tar.gz: ba8d453f1eb4b9086534710a4bb7e5f29e2e497a1051e3be7aefa21b8c9a3164
 SHA512:
-  metadata.gz: 1f6d42db1f03b01f19eef705ff88acff1a93d5f1802df2c6240109c2178fe39f68733b3648799ebe186375166c39ec1fe04388c4fe61d06708d52c520023e685
-  data.tar.gz: 2b64a3237f6f77d3e1a890e040aa20daf48efc92c461960e0a005f27d734a3639b0a0a10cdc0b4793ec962bac0c68a988ddc89779a83e10210e977c901a30cd1
+  metadata.gz: f4344deb0fb76ad2ed78b1d0898aa7521fbab371c08ec6b59f2fd5dec4283723fc3cfe11d8af3acd891d7d6a44c586869c31e1f0106de6ca0ec09da1eee9e345
+  data.tar.gz: bfb185dc98b9cc33e4562b6b641f179a32d57dcedd92622ca2334e79566f4d6876d55771425a5760e9bb14f06bee6ddad37067f97df887659c12acb1f25d34fc

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v2.13.0](https://github.com/bensheldon/good_job/tree/v2.13.0) (2022-04-19)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.12.2...v2.13.0)
+
+**Implemented enhancements:**
+
+- Dashboard UI updates: sticky navbar, statuses as tabs [\#572](https://github.com/bensheldon/good_job/pull/572) ([bkeepers](https://github.com/bkeepers))
+
+**Closed issues:**
+
+- Internationalize/I18n the Dashboard Engine [\#408](https://github.com/bensheldon/good_job/issues/408)
+
+**Merged pull requests:**
+
+- Fix Russian translation linting [\#573](https://github.com/bensheldon/good_job/pull/573) ([bensheldon](https://github.com/bensheldon))
+
 ## [v2.12.2](https://github.com/bensheldon/good_job/tree/v2.12.2) (2022-04-18)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.12.1...v2.12.2)

data/engine/app/assets/style.css

@@ -24,7 +24,9 @@
   height: 200px;
 }
 
-body {
-  /* Make room for the sticky footer */
-  margin-bottom: 100px;
+/* Break out of a container */
+.break-out {
+  width:100vw;
+  position:relative;
+  left:calc(-1 * (100vw - 100%)/2);
 }

data/engine/app/views/good_job/cron_entries/show.html.erb

@@ -1,4 +1,6 @@
-<h1 class="mb-3">Cron Entry Key: <code><%= @cron_entry.id %></code></h1>
+<% title = capture do %>
+  Cron Entry Key: <code><%= @cron_entry.id %></code>
+<% end %>
 
-<%= render 'good_job/shared/filter', filter: @jobs_filter %>
+<%= render 'good_job/shared/filter', title: title, filter: @jobs_filter %>
 <%= render 'good_job/jobs/table', jobs: @jobs_filter.records %>

data/engine/app/views/good_job/executions/_table.erb

@@ -1,6 +1,6 @@
-<div class="card my-3" data-gj-poll-replace id="executions-table">
+<div class="my-3" data-gj-poll-replace id="executions-table">
   <div class="table-responsive">
-    <table class="table card-table table-bordered table-hover table-sm mb-0" id="executions_index_table">
+    <table class="table table-hover table-sm mb-0" id="executions_index_table">
       <thead>
         <tr>
           <th>ActiveJob ID</th>

data/engine/app/views/good_job/executions/index.html.erb

@@ -1,9 +1,5 @@
-<div class="card my-3 p-6" data-gj-poll-replace id="executions-chart">
-  <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
-</div>
-
-<%= render 'good_job/shared/filter', filter: @filter %>
-
+<%= render 'good_job/shared/filter', title: "Executions", filter: @filter %>
+<%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 <%= render 'good_job/executions/table', executions: @filter.records %>
 
 <% if @filter.records.present? %>

data/engine/app/views/good_job/jobs/_table.erb

@@ -1,6 +1,6 @@
-<div class="card my-3" data-gj-poll-replace id="jobs-table">
+<div class="my-3" data-gj-poll-replace id="jobs-table">
   <div class="table-responsive">
-    <table class="table card-table table-bordered table-hover table-sm mb-0">
+    <table class="table table-hover table-sm mb-0">
       <thead>
         <tr>
           <th>ActiveJob ID</th>

data/engine/app/views/good_job/jobs/index.html.erb

@@ -1,13 +1,5 @@
-<div class="my-3 flex">
-  <h2>All Jobs</h2>
-</div>
-
-<div class="card my-3 p-6" data-gj-poll-replace id="jobs-chart">
-  <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
-</div>
-
-<%= render 'good_job/shared/filter', filter: @filter %>
-
+<%= render 'good_job/shared/filter', title: "Jobs", filter: @filter %>
+<%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 <%= render 'good_job/jobs/table', jobs: @filter.records %>
 
 <% if @filter.records.present? %>

data/engine/app/views/good_job/shared/_chart.erb

@@ -1,3 +1,5 @@
-<div class="chart-wrapper">
-  <canvas class="chart" data-json="<%= chart_data.to_json %>"></canvas>
+<div class="py-4" data-gj-poll-replace id="chart">
+  <div class="chart-wrapper container-fluid">
+    <canvas class="chart" data-json="<%= chart_data.to_json %>"></canvas>
+  </div>
 </div>

data/engine/app/views/good_job/shared/_filter.erb

@@ -1,59 +1,67 @@
-<%= form_with(url: "", method: :get, local: true, id: "filter_form") do |form| %>
-  <%= hidden_field_tag :poll, value: params[:poll] %>
-  <div class="d-flex flex-row w-100">
-    <div class="me-2">
-      <label for="job_class_filter">Job class</label>
-      <select name="job_class" id="job_class_filter" class="form-select">
-        <option value="" <%= "selected='selected'" if params[:job_class].blank? %>>All jobs</option>
-
-        <% filter.job_classes.each do |name, count| %>
-          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:job_class] == name %>><%= name %> (<%= count %>)</option>
-        <% end %>
-      </select>
-    </div>
+<div data-gj-poll-replace id="filter">
+  <div class="bg-light break-out">
+    <h2 class="container-fluid pt-3 pb-2"><%= title %></h2>
 
-    <div class="me-2">
-      <label for="job_state_filter">State</label>
-      <select name="state" id="job_state_filter" class="form-select">
-        <option value="" <%= "selected='selected'" if params[:state].blank? %>>All states</option>
+    <ul class="nav nav-tabs bg-light px-3 mb-3">
+      <li class="nav-item">
+        <%= link_to "All", url_for(state: nil), class: "nav-link #{"active" unless params[:state]}" %>
+      </li>
 
-        <% filter.states.each do |name, count| %>
-          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:state] == name %>><%= name %> (<%= count %>)</option>
-        <% end %>
-      </select>
-    </div>
+      <% filter.states.each do |name, count| %>
+        <li class="nav-item">
+          <%= link_to url_for({state: name}), class: "nav-link #{"active" if params[:state] == name}" do %>
+            <%= name.titleize %>
+            <span class="badge bg-primary rounded-pill <%= "bg-secondary" if count == 0 %>"><%= count %></span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
 
-    <div class="me-2">
-      <label for="job_queue_filter">Queue</label>
-      <select name="queue_name" id="job_queue_filter" class="form-select">
-        <option value="" <%= "selected='selected'" if params[:queue_name].blank? %>>All queues</option>
+  <%= form_with(url: "", method: :get, local: true, id: "filter_form", class: "container-fluid") do |form| %>
+    <%= hidden_field_tag :poll, params[:poll] %>
+    <%= hidden_field_tag :state, params[:state] %>
+    <div class="d-flex flex-row w-100">
+      <div class="me-2">
+        <select name="job_class" id="job_class_filter" class="form-select form-select-sm">
+          <option value="" <%= "selected='selected'" if params[:job_class].blank? %>>All jobs</option>
 
-        <% filter.queues.each do |name, count| %>
-          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:queue_name] == name %>><%= name %> (<%= count %>)</option>
-        <% end %>
-      </select>
-    </div>
+          <% filter.job_classes.each do |name, count| %>
+            <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:job_class] == name %>><%= name %> (<%= count %>)</option>
+          <% end %>
+        </select>
+      </div>
 
-    <div class="me-2 flex-fill d-flex flex-col align-items-end">
-      <label class="visually-hidden" for="query" aria-label="Search by class, job id, job params, and error text.">Search by class, job id, job params, and error text.</label>
-      <%= search_field_tag "query", params[:query], class: "form-control", placeholder: "Search by class, job id, job params, and error text." %>
-    </div>
+      <div class="me-2">
+        <select name="queue_name" id="job_queue_filter" class="form-select form-select-sm">
+          <option value="" <%= "selected='selected'" if params[:queue_name].blank? %>>All queues</option>
 
-    <div class="d-flex flex-col align-items-end">
-      <div>
-        <%= form.submit "Search", name: nil, class: "btn btn-primary" %>
-        <%= link_to "Clear all", filter.to_params(job_class: nil, state: nil, queue_name: nil, query: nil), class: "btn btn-secondary" %>
+          <% filter.queues.each do |name, count| %>
+            <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:queue_name] == name %>><%= name %> (<%= count %>)</option>
+          <% end %>
+        </select>
+      </div>
+
+      <div class="me-2 flex-fill">
+        <%= search_field_tag "query", params[:query], class: "form-control form-control-sm", placeholder: "Search by class, job id, job params, and error text." %>
+      </div>
+
+      <div class="d-flex flex-col align-items-end">
+        <div>
+          <%= form.submit "Search", name: nil, class: "btn btn-primary btn-sm" %>
+          <%= link_to "Clear all", filter.to_params(job_class: nil, state: nil, queue_name: nil, query: nil), class: "btn btn-secondary btn-sm" %>
+        </div>
       </div>
     </div>
-  </div>
-<% end %>
-
-<%= javascript_tag nonce: true do %>
-  document.addEventListener("DOMContentLoaded", () => {
-    document.querySelectorAll("#job_class_filter, #job_state_filter, #job_queue_filter").forEach((filter) => {
-      filter.addEventListener("change", () => {
-        document.querySelector("#filter_form").submit();
-      });
+  <% end %>
+
+  <%= javascript_tag nonce: true do %>
+    document.addEventListener("DOMContentLoaded", () => {
+      document.querySelectorAll("#job_class_filter, #job_queue_filter").forEach((filter) => {
+        filter.addEventListener("change", () => {
+          document.querySelector("#filter_form").submit();
+        });
+      })
     })
-  })
-<% end %>
+  <% end %>
+</div>

data/engine/app/views/good_job/shared/_footer.erb

@@ -1,10 +1,8 @@
-<footer class="footer mt-auto py-3 bg-light fixed-bottom" id="footer" data-gj-poll-replace>
+<footer class="footer mt-auto py-3 bg-light border-top text-muted small" id="footer" data-gj-poll-replace>
   <div class="container-fluid">
     <div class="row">
       <div class="col-6">
-        <span class="text-muted">
-          <%= t(".last_update_html", time: Time.current.utc.iso8601) %>
-        </span>
+        <%= t(".last_update_html", time: Time.current.utc.iso8601) %>
       </div>
 
       <div class="col-6 text-end">

data/engine/app/views/good_job/shared/_navbar.erb

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
+<nav class="navbar navbar-expand-lg navbar-light border-bottom bg-white sticky-top shadow-sm">
   <div class="container-fluid">
     <%= link_to t(".name"), root_path, class: "navbar-brand mb-0 h1" %>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
@@ -8,16 +8,16 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav me-auto">
         <li class="nav-item">
-          <%= link_to t(".executions"), root_path, class: ["nav-link", ("active" if current_page?(root_path))] %>
+          <%= link_to t(".executions"), root_path, class: ["nav-link", ("active" if controller_name == 'executions')] %>
         </li>
         <li class="nav-item">
-          <%= link_to t(".jobs"), jobs_path, class: ["nav-link", ("active" if current_page?(jobs_path))] %>
+          <%= link_to t(".jobs"), jobs_path, class: ["nav-link", ("active" if controller_name == 'jobs')] %>
         </li>
         <li class="nav-item">
-          <%= link_to t(".cron_schedules"), cron_entries_path, class: ["nav-link", ("active" if current_page?(cron_entries_path))] %>
+          <%= link_to t(".cron_schedules"), cron_entries_path, class: ["nav-link", ("active" if controller_name == 'cron_entries')] %>
         </li>
         <li class="nav-item">
-          <%= link_to t(".processes"), processes_path, class: ["nav-link", ("active" if current_page?(processes_path))] %>
+          <%= link_to t(".processes"), processes_path, class: ["nav-link", ("active" if  controller_name == 'processes')] %>
         </li>
       </ul>
       <div class="nav-item pe-2">

data/engine/app/views/layouts/good_job/application.html.erb

@@ -18,14 +18,16 @@
   <%= javascript_include_tag rails_ujs_url(format: :js, v: GoodJob::VERSION), nonce: true %>
 </head>
 <body>
-  <%= render "good_job/shared/navbar" %>
+  <div class="d-flex flex-column min-vh-100">
+    <%= render "good_job/shared/navbar" %>
 
-  <div class="container-fluid">
-    <%= render "good_job/shared/alert" %>
+    <div class="container-fluid flex-grow-1">
+      <%= render "good_job/shared/alert" %>
 
-    <%= yield %>
-  </div>
+      <%= yield %>
+    </div>
 
     <%= render "good_job/shared/footer" %>
+  </div>
 </body>
 </html>

data/engine/config/locales/en.yml

@@ -45,9 +45,9 @@ en:
         last_update_html: Last updated <time id="page-updated-at" datetime="%{time}">%{time}</time>
         wording: Remember, you're doing a Good Job too!
       navbar:
-        cron_schedules: Cron Schedules
-        executions: All Executions
-        jobs: All Jobs
+        cron_schedules: Cron
+        executions: Executions
+        jobs: Jobs
         live_poll: Live Poll
         name: "GoodJob 👍"
         processes: Processes

data/engine/config/locales/es.yml

@@ -45,7 +45,7 @@ es:
         last_update_html: Última actualización <time id="page-updated-at" datetime="%{time}">%{time}</time>
         wording: "¡Recuerda, también tú estás haciendo un buen trabajo!"
       navbar:
-        cron_schedules: Tareas Programadas
+        cron_schedules: Cron
         executions: Ejecuciones
         jobs: Tareas
         live_poll: En vivo

data/engine/config/locales/nl.yml

@@ -45,9 +45,9 @@ nl:
         last_update_html: Laatst bijgewerkt <time id="page-updated-at" datetime="%{time}">%{time}</time>
         wording: 'Onthoud: jij levert ook goed werk!'
       navbar:
-        cron_schedules: Cron Schema
-        executions: Alle Uitvoeringen
-        jobs: Alle Taken
+        cron_schedules: Cron
+        executions: Uitvoeringen
+        jobs: Taken
         live_poll: Live Poll
         name: "GoodJob 👍"
         processes: Processen

data/engine/config/locales/ru.yml

@@ -3,40 +3,64 @@ ru:
   datetime:
     distance_in_words:
       about_x_hours:
+        few: около %{count} часов
+        many: около %{count} часов
         one: около 1 часа
-        other: около %{count} часов
+        other: около %{count} часа
       about_x_months:
+        few: около %{count} месяцев
+        many: около %{count} месяцев
         one: около 1 месяца
-        other: около %{count} месяцев
+        other: около %{count} месяца
       about_x_years:
+        few: около %{count} лет
+        many: около %{count} лет
         one: около 1 года
         other: около %{count} лет
       almost_x_years:
+        few: почти %{count} года
+        many: почти %{count} лет
         one: почти 1 год
-        other: почти %{count} года
-      half_a_minute: пол минуты
+        other: почти %{count} лет
+      half_a_minute: полминуты
       less_than_x_minutes:
+        few: меньше %{count} минут
+        many: меньше %{count} минут
         one: меньше 1 минуты
-        other: меньше %{count} минут
+        other: меньше %{count} минуты
       less_than_x_seconds:
+        few: меньше %{count} секунд
+        many: меньше %{count} секунд
         one: меньше 1 секунды
-        other: меньше %{count} секунд
+        other: меньше %{count} секунды
       over_x_years:
+        few: больше %{count} лет
+        many: больше %{count} лет
         one: больше 1 года
         other: больше %{count} лет
       x_days:
+        few: "%{count} дня"
+        many: "%{count} дней"
         one: 1 день
-        other: "%{count} дней"
+        other: "%{count} дня"
       x_minutes:
-        one: 1 минута
-        other: "%{count} минут"
+        few: "%{count} минуты"
+        many: "%{count} минут"
+        one: 1 минуту
+        other: "%{count} минуты"
       x_months:
+        few: "%{count} месяца"
+        many: "%{count} месяцев"
         one: 1 месяц
         other: "%{count} месяца"
       x_seconds:
-        one: 1 секунда
-        other: "%{count} секунд"
+        few: "%{count} секунды"
+        many: "%{count} секунд"
+        one: 1 секунду
+        other: "%{count} секунды"
       x_years:
+        few: "%{count} года"
+        many: "%{count} лет"
         one: 1 год
         other: "%{count} года"
   good_job:
@@ -45,9 +69,9 @@ ru:
         last_update_html: Последнее обновление <time id="page-updated-at" datetime="%{time}">%{time}</time>
         wording: Запомни, ты делаешь Good Job тоже!
       navbar:
-        cron_schedules: Cron Расписания
-        executions: Все Исполнения
-        jobs: Все Задачи
+        cron_schedules: Cron
+        executions: Исполнения
+        jobs: Задачи
         live_poll: Живой Опрос
         name: "GoodJob 👍"
         processes: Процессы

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.12.2'
+  VERSION = '2.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.13.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob