katalyst-koi 5.10.0 → 5.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 319724f0fb3d95cdb522b2255aff29edd723b82d30a719b772e47ffcae3e4c98
-  data.tar.gz: fd2421bb764b29caf26567b5b41df493fb77083c6bff490db7b4c01eff1f08ad
+  metadata.gz: e72eb3c398c2692e5b4ee0a87c77c1d85399fa5a71602588876966814be1f694
+  data.tar.gz: 256b06cb43feea3ade848d16db55e8e375fecccb6a292286ac5751b966c16ba3
 SHA512:
-  metadata.gz: d558ecb83c1aaa9503a689c56af22c7000a0fb5ad9230f59ec8c8db02ed98e2f1883452893fbd556600cebee65e131913f63f728b8819dddd02d6b4f79b8474b
-  data.tar.gz: 2e1b7ad2aef1522792bf15f767b1500e6abfd8c718070c094b2fda2be93dce2ad0d5928f19214f401786f6848cdb482752e4c84c162799a8667c14a0b4b626ec
+  metadata.gz: e89c84958cfaaa097b9aaca8111b908b51dbf2632f9159bcd13f7b11eb045da70439cf7e5fba3b81c0fb077634db27552ab57fdb0e064d9b2f6a0ec10c76fd6a
+  data.tar.gz: 586601311014a48f8129562e8a37801ef82c9457a3e9fc836e8e7b148c725d0a4fc6c9d2351541948a3f015d5e5e3ca80e8939dc7c2bb0e3e1ccaf7bb3319c17

data/app/assets/stylesheets/koi/blocks/page-header.css

@@ -2,6 +2,10 @@
   background: var(--color-tint);
   color: var(--color-dark);
 
+  h1 {
+    font-size: var(--size-step-5);
+  }
+
   > .wrapper {
     padding-block: var(--gutter);
   }

data/app/assets/stylesheets/koi/blocks/prose.css

@@ -1,29 +1,52 @@
 .prose {
-  --flow-space: var(--space-l);
+  --flow-space: var(--space-m);
 }
 
 .prose :is(h1, h2, h3) {
   overflow-wrap: anywhere;
   hyphens: auto;
+  min-width: var(--prose-width);
+
+  /* key line */
+  box-shadow: inset 0 -2px 0 currentColor;
+  padding-block-end: var(--space-3xs-2xs);
+}
+
+.prose :is(h1, h2, h3) + table {
+  border-top: none;
+}
+
+.prose .repel:has(> :is(h1, h2, h3)) {
+  /* replace h1 keyline */
+  box-shadow: inset 0 -2px 0 currentColor;
+  padding-block-end: var(--space-3xs-2xs);
+
+  :is(h1, h2, h3) {
+    box-shadow: unset;
+    min-width: unset;
+    padding-block-end: unset;
+  }
 }
 
 .prose :is(p, li, dl, figcaption, blockquote) {
-  max-width: 60ch;
+  max-width: var(--measure);
   text-wrap: pretty;
 }
 
-.prose :is(h1, h2, h3, h4) + *:not([class]) {
+/* Set space between headings and their content */
+.prose :is(h1, h2, h3, h4, h5, h6) + *:not([class]) {
   --flow-space: var(--space-m);
 }
 
-/* Add more space on and around figures and tables */
-.prose :is(figure, table),
-.prose :is(figure, table) + * {
-  --flow-space: var(--space-2xl);
+/* Set space between sections */
+.prose * + :is(h1, h2, h3, h4, h5, h6):not([class]),
+.prose * + :has(> :is(h1, h2, h3, h4, h5, h6):first-child:not([class])) {
+  --flow-space: var(--space-xl);
 }
 
-/* Add more space to headings on block start */
-.prose * + :is(h1, h2, h3, h4):not([class]) {
+/* Add more space on and around figures and tables */
+.prose :is(figure, table):not([class]),
+.prose :is(figure, table):not([class]) + * {
   --flow-space: var(--space-xl);
 }
 
@@ -35,3 +58,7 @@
 .prose hr {
   --flow-space: var(--space-2xl);
 }
+
+.prose table:not([class]) {
+  --table-min-width: var(--prose-width);
+}

data/app/assets/stylesheets/koi/blocks/tables/table.css

@@ -2,6 +2,20 @@
   --tag-color: var(--color-primary);
   --on-tag-color: white;
 
+  th.type-link a[href]:not(:hover) {
+    text-decoration: none;
+  }
+
+  th:first-child,
+  td:first-child {
+    padding-inline-start: 0;
+  }
+
+  th:last-child,
+  td:last-child {
+    padding-inline-end: 0;
+  }
+
   td.type-enum small {
     color: var(--on-tag-color);
     font-size: small;
@@ -34,7 +48,10 @@
       cursor: pointer;
       margin-block-end: 0;
       min-height: 1.5rem;
-      transform: translateY(1px);
+      transform: translateY(0.2ch);
+      margin-inline-start: calc(
+        -1 * var(--space-s) + 2 * var(--stroke-input-width)
+      );
 
       &::before,
       &::after {
@@ -61,9 +78,9 @@
     }
   }
 
-  tbody [data-cell-type="selection"] {
+  thead [data-cell-type="selection"] {
     label {
-      transform: translateY(3px);
+      transform: translateY(0.4ch);
     }
   }
 
@@ -90,6 +107,35 @@
   }
 }
 
+.katalyst--summary-table {
+  --table-min-width: var(--prose-width);
+
+  border-block-start: var(--stroke);
+
+  th {
+    padding-inline-start: unset;
+    padding-inline-end: var(--space-s);
+  }
+}
+
+@container (width < 60ch) {
+  .katalyst--summary-table {
+    th,
+    td {
+      padding-inline: unset;
+    }
+
+    th {
+      box-shadow: none;
+      padding-block-end: 0;
+    }
+
+    td {
+      padding-block-start: var(--space-2xs);
+    }
+  }
+}
+
 .tables--selection--form {
   p {
     margin-bottom: var(--space-2xs);

data/app/assets/stylesheets/koi/forms/file-upload.css

@@ -27,6 +27,7 @@
   display: block;
   position: relative;
   z-index: 0;
+  container: govuk-file-upload / inline-size;
   border: var(--stroke-input);
   border-radius: var(--input-radius);
   padding: var(--space-xs-s);
@@ -121,6 +122,7 @@
 
   .preview {
     grid-area: preview;
+    align-self: center;
     max-width: 4rem;
     aspect-ratio: 1/1;
     object-fit: cover;
@@ -138,6 +140,7 @@
 
   .filename {
     font-weight: var(--font-bold);
+    word-break: break-all;
   }
 
   .size {
@@ -200,6 +203,23 @@
   }
 }
 
+/* Too narrow for a third column: the actions move to their own row. */
+@container govuk-file-upload (width < 20rem) {
+  .govuk-attachment {
+    grid-template-areas:
+      "preview caption"
+      "actions actions";
+    grid-template-columns: auto 1fr;
+
+    .actions {
+      flex-direction: row;
+      justify-content: flex-end;
+      flex-wrap: wrap;
+      gap: var(--space-2xs);
+    }
+  }
+}
+
 /* With JavaScript running the button is the figure's only interactive
 control; the select still carries the submitted value but leaves the
 display, tab order, and accessibility tree. */

data/app/assets/stylesheets/koi/global/global-styles.css

@@ -27,22 +27,22 @@ main {
 }
 
 h1 {
-  font-size: var(--size-step-5);
+  font-size: var(--size-step-4);
   max-width: 20ch;
 }
 
 h2 {
-  font-size: var(--size-step-4);
+  font-size: var(--size-step-3);
   max-width: 35ch;
 }
 
 h3 {
-  font-size: var(--size-step-3);
+  font-size: var(--size-step-2);
   max-width: 35ch;
 }
 
 :is(h4, h5, h6) {
-  font-size: var(--size-step-2);
+  font-size: var(--size-step-1);
 }
 
 small {
@@ -193,7 +193,7 @@ figcaption {
 
 table {
   border-collapse: collapse;
-  width: 100%;
+  min-width: var(--table-min-width, 100%);
 }
 
 th {

data/app/assets/stylesheets/koi/global/variables.css

@@ -18,6 +18,9 @@
 
 :root {
   --gutter: var(--space-m-l);
+  --measure: 60ch;
+  --wrapper-max-width: 85rem;
+  --prose-width: min(57rem, 100cqi); /* 2/3rds of wrapper */
   --transition-base: 250ms ease;
   --transition-movement: 200ms linear;
   --transition-fade: 300ms ease;

data/app/models/background_job.rb

@@ -5,10 +5,11 @@ class BackgroundJob
 
   module Scopes
     def admin_search(query)
-      where(
-        "solid_queue_jobs.class_name LIKE :query OR solid_queue_jobs.queue_name LIKE :query",
-        query: "%#{query}%",
-      )
+      pattern            = "%#{SolidQueue::Job.sanitize_sql_like(query)}%"
+      table              = SolidQueue::Job.arel_table
+      class_name_matches = table[:class_name].matches(pattern)
+      queue_name_matches = table[:queue_name].matches(pattern)
+      where(class_name_matches.or(queue_name_matches))
     end
   end
 
@@ -42,7 +43,7 @@ class BackgroundJob
 
   # Serialized as an ISO8601 string in the payload; parse so views can format it.
   def enqueued_at
-    job.arguments["enqueued_at"]&.then { |value| Time.iso8601(value) }
+    job.arguments["enqueued_at"]&.then { |value| Time.zone.iso8601(value) }
   end
 
   # The arguments the job was enqueued with, from the serialized payload.
@@ -76,6 +77,10 @@ class BackgroundJob
     "#{failure.exception_class}: #{failure.message}"
   end
 
+  def failure_class
+    failed_execution.exception_class
+  end
+
   def state
     if finished?
       :finished

data/app/models/recurring_task.rb

@@ -5,13 +5,11 @@ class RecurringTask
 
   module Scopes
     def admin_search(query)
-      where(
-        <<~SQL.squish,
-          solid_queue_recurring_tasks.key LIKE :query
-          OR solid_queue_recurring_tasks.class_name LIKE :query
-        SQL
-        query: "%#{query}%",
-      )
+      pattern            = "%#{SolidQueue::RecurringTask.sanitize_sql_like(query)}%"
+      table              = SolidQueue::RecurringTask.arel_table
+      key_matches        = table[:key].matches(pattern)
+      class_name_matches = table[:class_name].matches(pattern)
+      where(key_matches.or(class_name_matches))
     end
   end
 

data/app/views/admin/admin_roles/index.html.erb

@@ -7,7 +7,7 @@
 <%= table_query_with(collection:) %>
 
 <%= table_with(collection:) do |row| %>
-  <% row.link(:slug, url: :admin_admin_role_path) %>
+  <% row.link(:slug, heading: true, url: :admin_admin_role_path) %>
   <% row.date(:created_at, label: "Materialized") %>
   <% row.datetime(:last_authenticated_at, label: "Last authenticated") %>
   <% row.boolean(:orphaned?, label: "Orphaned") %>

data/app/views/admin/admin_users/archived.html.erb

@@ -15,7 +15,7 @@
 
 <%= table_with(collection:) do |row| %>
   <% row.select %>
-  <% row.link :name, url: :admin_admin_user_path %>
+  <% row.link(:name, heading: true, url: :admin_admin_user_path) %>
   <% row.text :email %>
 <% end %>
 

data/app/views/admin/admin_users/index.html.erb

@@ -17,7 +17,7 @@
 
 <%= table_with(collection:) do |row| %>
   <% row.select %>
-  <% row.link(:name, url: :admin_admin_user_path) %>
+  <% row.link(:name, heading: true, url: :admin_admin_user_path) %>
   <% row.text(:email) %>
   <% row.enum(:password_login, label: "Password") %>
   <% row.boolean(:credentials, label: "Passkey") do |cell| %>

data/app/views/admin/background_jobs/blocked.html.erb

@@ -9,7 +9,10 @@
 <%= table_query_with(collection:) %>
 
 <%= table_with(collection:) do |row, job| %>
-  <% row.link(:class_name, url: ->(record) { admin_background_job_path(record.active_job_id) }, label: "Job") %>
+  <% row.link(:class_name,
+              label:   "Job",
+              heading: true,
+              url:     ->(record) { admin_background_job_path(record.active_job_id) }) %>
   <% row.text(:queue_name, label: "Queue") %>
   <% row.datetime(:scheduled_at, label: "Scheduled") %>
 <% end %>

data/app/views/admin/background_jobs/completed.html.erb

@@ -9,7 +9,10 @@
 <%= table_query_with(collection:) %>
 
 <%= table_with(collection:) do |row, job| %>
-  <% row.link(:class_name, url: ->(record) { admin_background_job_path(record.active_job_id) }, label: "Job") %>
+  <% row.link(:class_name,
+              label:   "Job",
+              heading: true,
+              url:     ->(record) { admin_background_job_path(record.active_job_id) }) %>
   <% row.text(:queue_name, label: "Queue") %>
   <% row.datetime(:finished_at, label: "Finished") %>
 <% end %>

data/app/views/admin/background_jobs/failed.html.erb

@@ -15,11 +15,14 @@
 
 <%= table_with(collection:) do |row, job| %>
   <% row.select %>
-  <% row.link(:class_name, url: ->(record) { admin_background_job_path(record.active_job_id) }, label: "Job") %>
+  <% row.link(:class_name,
+              label:   "Job",
+              heading: true,
+              url:     ->(record) { admin_background_job_path(record.active_job_id) }) %>
   <% row.text(:queue_name, label: "Queue") %>
   <% row.datetime(:updated_at, label: "Last failed") %>
   <% row.text(:error, label: "Error") do %>
-    <%= BackgroundJob.new(job).failure_reason %>
+    <%= BackgroundJob.new(job).failure_class %>
   <% end %>
 <% end %>
 

data/app/views/admin/background_jobs/in_progress.html.erb

@@ -9,7 +9,10 @@
 <%= table_query_with(collection:) %>
 
 <%= table_with(collection:) do |row, job| %>
-  <% row.link(:class_name, url: ->(record) { admin_background_job_path(record.active_job_id) }, label: "Job") %>
+  <% row.link(:class_name,
+              label:   "Job",
+              heading: true,
+              url:     ->(record) { admin_background_job_path(record.active_job_id) }) %>
   <% row.text(:queue_name, label: "Queue") %>
   <% row.datetime(:scheduled_at, label: "Scheduled") %>
 <% end %>

data/app/views/admin/background_jobs/index.html.erb

@@ -14,7 +14,10 @@
 
 <%= table_with(collection:) do |row, job| %>
   <% row.select %>
-  <% row.link(:class_name, url: ->(record) { admin_background_job_path(record.active_job_id) }, label: "Job") %>
+  <% row.link(:class_name,
+              label:   "Job",
+              heading: true,
+              url:     ->(record) { admin_background_job_path(record.active_job_id) }) %>
   <% row.text(:queue_name, label: "Queue") %>
   <% row.datetime(:scheduled_at, label: "Scheduled") %>
 <% end %>

data/app/views/admin/background_jobs/scheduled.html.erb

@@ -9,7 +9,10 @@
 <%= table_query_with(collection:) %>
 
 <%= table_with(collection:) do |row, job| %>
-  <% row.link(:class_name, url: ->(record) { admin_background_job_path(record.active_job_id) }, label: "Job") %>
+  <% row.link(:class_name,
+              label:   "Job",
+              heading: true,
+              url:     ->(record) { admin_background_job_path(record.active_job_id) }) %>
   <% row.text(:queue_name, label: "Queue") %>
   <% row.datetime(:scheduled_at, label: "Scheduled") %>
 <% end %>

data/app/views/admin/feature_flags/index.html.erb

@@ -8,7 +8,10 @@
   <% end %>
 <% end %>
 
-<%= table_with(collection:) do |row, feature_flag| %>
-  <% row.link(:key, url: ->(record) { admin_feature_flag_path(record) }, label: "Name") %>
+<%= table_with(collection:) do |row| %>
+  <% row.link(:key,
+              label:   "Name",
+              heading: true,
+              url:     ->(record) { admin_feature_flag_path(record) }) %>
   <% row.text(:state, label: "Status") { |cell| cell.value.to_s.humanize } %>
 <% end %>

data/app/views/admin/recurring_tasks/index.html.erb

@@ -12,7 +12,10 @@
 <%= table_query_with(collection:) %>
 
 <%= table_with(collection:) do |row| %>
-  <% row.link(:key, url: ->(record) { admin_recurring_task_path(record.key) }, label: "Job name") %>
+  <% row.link(:key,
+              label:   "Job name",
+              heading: true,
+              url:     ->(record) { admin_recurring_task_path(record.key) }) %>
   <% row.text(:schedule, label: "Schedule") %>
   <% row.datetime(:last_enqueued_time, label: "Last enqueued") %>
 <% end %>

data/app/views/admin/recurring_tasks/show.html.erb

@@ -23,7 +23,10 @@
 <h2>Jobs</h2>
 
 <%= table_with(collection: jobs) do |row| %>
-  <% row.link(:job_id, url: ->(record) { admin_background_job_path(record.active_job_id) }, label: "Job") %>
+  <% row.link(:job_id,
+              label:   "Job",
+              heading: true,
+              url:     ->(record) { admin_background_job_path(record.active_job_id) }) %>
   <% row.datetime(:enqueued_at) %>
   <% row.datetime(:finished_at) %>
   <% row.number(:duration) %>

data/app/views/admin/well_knowns/index.html.erb

@@ -10,8 +10,8 @@
 
 <%= table_query_with(collection:) %>
 
-<%= table_with(collection:) do |row, well_known| %>
-  <% row.link :name %>
+<%= table_with(collection:) do |row| %>
+  <% row.link(:name, heading: true) %>
   <% row.text :purpose %>
 <% end %>
 

data/app/views/katalyst/navigation/menus/index.html.erb

@@ -7,6 +7,6 @@
 <% end %>
 
 <%= table_with(collection:) do |row, menu| %>
-  <%= row.link :title, url: (katalyst_navigation.menu_path(menu) if menu) %>
+  <%= row.link(:title, heading: true, url: (katalyst_navigation.menu_path(menu) if menu)) %>
   <%= row.text :slug %>
 <% end %>

data/app/views/layouts/koi/application.html.erb

@@ -60,8 +60,10 @@
       <%= yield(:roadblock) %>
     </div>
   </main>
+<% elsif content_for?(:main) %>
+  <%= yield(:main) %>
 <% else %>
-  <main class="flow wrapper">
+  <main class="flow prose wrapper">
     <% unless flash.empty? %>
       <!-- flash -->
       <%= render("layouts/koi/flash") %>

data/lib/generators/koi/admin_controller/templates/controller_spec.rb.tt

@@ -25,7 +25,7 @@ RSpec.describe <%= controller_class_name %>Controller do
 
       action
 
-      expect(response.parsed_body.css("tbody td a").pluck(:href))
+      expect(response.parsed_body.css("tbody th a").pluck(:href))
         .to eq([second, first].map { |<%= singular_name %>| <%= admin_show_helper %> })
     end
     <%- end -%>

data/lib/generators/koi/admin_views/templates/archived.html.erb.tt

@@ -20,7 +20,7 @@
   <%% row.select %>
   <%- index_attributes.each_with_index do |attribute, index| -%>
   <%- if index.zero? -%>
-  <%% row.link :<%= attribute.name %> %>
+  <%% row.link(:<%= attribute.name %>, heading: true) %>
   <%- else -%>
   <%= index_attribute_for attribute %>
   <%- end -%>

data/lib/generators/koi/admin_views/templates/index.html.erb.tt

@@ -32,7 +32,7 @@
   <%- end -%>
   <%- index_attributes.each_with_index do |attribute, index| -%>
   <%- if index.zero? -%>
-  <%% row.link :<%= attribute.name %> %>
+  <%% row.link(:<%= attribute.name %>, heading: true) %>
   <%- else -%>
   <%= index_attribute_for attribute %>
   <%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 5.10.0
+  version: 5.11.0
 platform: ruby
 authors:
 - Katalyst Interactive