backstage 0.1.9 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c718b48851548675ae86452a060e6b6c18a21e712e4ea9cfb3f68379ce2828c
-  data.tar.gz: ddc6fa00de9252402b7b4c5c86cac775f320d5ffd8d1457d07c909da72373575
+  metadata.gz: da942f19c113814d2f7a5e738b3b7f7ce1cc1e8b23beeaabe8e9ef7e1f0d1b50
+  data.tar.gz: 805dedf4003e77e48d6e9bf5eb426d3f24e91fe61297a97eebd3c1f8a858e8f1
 SHA512:
-  metadata.gz: 20732846dea13229b3c45c2dccea6b689401bf627031ca9da44774e9738421def5fdd4cb2a53d46783ec53185fedc76742246ea40123883ac1822ab114086286
-  data.tar.gz: fb271699d1ed51adf18b1891f0d9989d3660ab7cfeea1606f57cc882ef8bfbd73a6bc7a3613acff14c901413044c4476c348c4638b36c6bfe70afd4cd0582bb2
+  metadata.gz: 76d4dd10a000b8aeb880f7df124140c351553e44fd98ee3ab42b980cb7abb315297fc959c50a2f3770c48d289db77b28326d4073677046c43dc83cb12022d29d
+  data.tar.gz: 800c78a96cc7e9289edff896f5264d0aa73399c4ae30f1ad6557e100213a1c4975f6da1c823fc0f4842744952320f9fe18f3f6a5f1ebe7a3de9b964742c1999a

data/CHANGELOG.md

@@ -7,6 +7,20 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+## [0.1.11] — 2026-05-25
+
+### Fixed
+
+- Pagination window no longer generates links below page 1 or above the last page when there are fewer than 6 total pages; window is clamped to the valid inner range and skipped entirely when `total_pages <= 2`
+- Sidebar moved from the layout into the edit view, rendering to the right of the form in a two-column grid; links open in a new tab (`target="_blank"`) and blank URLs (e.g. from a proc returning `""`) are skipped silently
+
+## [0.1.10] — 2026-05-25
+
+### Fixed
+
+- Dashboard pages now use the same windowed pagination (5 pages around current + first/last links) as resource index pages; pagination logic extracted into a shared `backstage/shared/_pagination` partial
+- Sidebar no longer renders on index, dashboard, or new-record pages; proc-based sidebar links were crashing with `NoMethodError` when `@record` was nil — sidebar is now guarded with `record&.persisted?`
+
 ## [0.1.9] — 2026-05-24
 
 ### Fixed

data/app/assets/stylesheets/backstage/backstage.css

@@ -3,7 +3,8 @@ body { display: grid; grid-template-columns: 200px 1fr; grid-template-rows: auto
 header { grid-column: 1 / -1; }
 nav { padding: 1rem; grid-row: 2; grid-column: 1; }
 main { padding: 1rem; grid-row: 2; grid-column: 2; }
-aside { grid-column: 2; padding: 1rem; border-top: 1px solid var(--pico-muted-border-color); }
+.edit-layout { display: grid; grid-template-columns: 1fr 220px; gap: 2rem; align-items: start; }
+.edit-layout aside { border-left: 1px solid var(--pico-muted-border-color); padding-left: 1rem; }
 
 /* Override Pico's horizontal nav list */
 nav ul { flex-direction: column; }

data/app/views/backstage/dashboards/show.html.erb

@@ -27,10 +27,4 @@
   </tbody>
 </table>
 
-<% if @total_pages > 1 %>
-  <nav>
-    <% (1..@total_pages).each do |p| %>
-      <%= link_to p, url_for(page: p), class: (p == @page ? "current" : nil) %>
-    <% end %>
-  </nav>
-<% end %>
+<%= render "backstage/shared/pagination" %>

data/app/views/backstage/resources/edit.html.erb

@@ -1,18 +1,35 @@
 <h1>Edit <%= @resource_config.model_class.model_name.human %></h1>
 
-<%= form_with model: @record, url: resource_path(resource: params[:resource], id: @record.id), method: :patch do |f| %>
-  <% @resource_config.edit_fields.each do |field| %>
-    <div>
-      <%= f.label field.name %>
-      <%= render partial: field.partial_path, locals: { f: f, field: field, record: @record } %>
-    </div>
-  <% end %>
-  <%= f.submit "Save" %>
-<% end %>
+<% sidebar = @resource_config.sidebar_config %>
+<div class="<%= sidebar&.links&.any? ? "edit-layout" : "" %>">
+  <div>
+    <%= form_with model: @record, url: resource_path(resource: params[:resource], id: @record.id), method: :patch do |f| %>
+      <% @resource_config.edit_fields.each do |field| %>
+        <div>
+          <%= f.label field.name %>
+          <%= render partial: field.partial_path, locals: { f: f, field: field, record: @record } %>
+        </div>
+      <% end %>
+      <%= f.submit "Save" %>
+    <% end %>
+
+    <%= link_to "Cancel", resources_path(resource: params[:resource]) %>
 
-<%= link_to "Cancel", resources_path(resource: params[:resource]) %>
+    <%= button_to "Delete",
+          resource_path(resource: params[:resource], id: @record.id),
+          method: :delete,
+          data: { confirm_message: "Delete this #{@resource_config.model_class.model_name.human}?" } %>
+  </div>
 
-<%= button_to "Delete",
-      resource_path(resource: params[:resource], id: @record.id),
-      method: :delete,
-      data: { confirm_message: "Delete this #{@resource_config.model_class.model_name.human}?" } %>
+  <% if sidebar&.links&.any? %>
+    <aside>
+      <ul>
+        <% sidebar.links.each do |link| %>
+          <% url = link.url_or_proc.respond_to?(:call) ? link.url_or_proc.call(@record) : link.url_or_proc %>
+          <% next if url.blank? %>
+          <li><%= link_to link.label, url, target: "_blank" %></li>
+        <% end %>
+      </ul>
+    </aside>
+  <% end %>
+</div>

data/app/views/backstage/resources/index.html.erb

@@ -52,16 +52,4 @@
   </tbody>
 </table>
 
-<% if @total_pages > 1 %>
-  <% window_start = [[@page - 2, 2].max, @total_pages - 4].min
-     window_end   = [[@page + 2, @total_pages - 1].min, 5].max %>
-  <nav>
-    <%= link_to "1", url_for(page: 1), class: (@page == 1 ? "current" : nil) %>
-    <% if window_start > 2 %> &hellip;<% end %>
-    <% (window_start..window_end).each do |p| %>
-      &nbsp;<%= link_to p, url_for(page: p), class: (p == @page ? "current" : nil) %>
-    <% end %>
-    <% if window_end < @total_pages - 1 %> &hellip;<% end %>
-    &nbsp;<%= link_to @total_pages, url_for(page: @total_pages), class: (@page == @total_pages ? "current" : nil) %>
-  </nav>
-<% end %>
+<%= render "backstage/shared/pagination" %>

data/app/views/backstage/shared/_pagination.html.erb

@@ -0,0 +1,15 @@
+<% if @total_pages > 1 %>
+  <nav>
+    <%= link_to "1", url_for(page: 1), class: (@page == 1 ? "current" : nil) %>
+    <% if @total_pages > 2 %>
+      <% window_start = [[@page - 2, 2].max, @total_pages - 4].min.clamp(2, @total_pages - 1)
+         window_end   = [[@page + 2, @total_pages - 1].min, 5].max.clamp(2, @total_pages - 1) %>
+      <% if window_start > 2 %> &hellip;<% end %>
+      <% (window_start..window_end).each do |p| %>
+        &nbsp;<%= link_to p, url_for(page: p), class: (p == @page ? "current" : nil) %>
+      <% end %>
+      <% if window_end < @total_pages - 1 %> &hellip;<% end %>
+    <% end %>
+    &nbsp;<%= link_to @total_pages, url_for(page: @total_pages), class: (@page == @total_pages ? "current" : nil) %>
+  </nav>
+<% end %>

data/app/views/layouts/backstage/backstage.html.erb

@@ -44,17 +44,5 @@
     <main>
       <%= yield %>
     </main>
-    <% sidebar = defined?(@resource_config) && @resource_config&.sidebar_config
-       record  = defined?(@record) ? @record : nil %>
-    <% if sidebar&.links&.any? %>
-      <aside>
-        <ul>
-          <% sidebar.links.each do |link| %>
-            <% url = link.url_or_proc.respond_to?(:call) ? link.url_or_proc.call(record) : link.url_or_proc %>
-            <li><%= link_to link.label, url %></li>
-          <% end %>
-        </ul>
-      </aside>
-    <% end %>
   </body>
 </html>

data/lib/backstage/version.rb

@@ -1,3 +1,3 @@
 module Backstage
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backstage
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.11
 platform: ruby
 authors:
 - Gareth James
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-24 00:00:00.000000000 Z
+date: 2026-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -58,6 +58,7 @@ files:
 - app/views/backstage/resources/edit.html.erb
 - app/views/backstage/resources/index.html.erb
 - app/views/backstage/resources/new.html.erb
+- app/views/backstage/shared/_pagination.html.erb
 - app/views/layouts/backstage/backstage.html.erb
 - config/routes.rb
 - lib/backstage.rb