katalyst-koi 4.18.0 → 5.0.0.alpha.1

data/app/views/admin/url_rewrites/edit.html.erb

@@ -1,12 +1,16 @@
-<% content_for :header do %>
-  <%= render Koi::Header::EditComponent.new(resource: url_rewrite) %>
-<% end %>
+<%# locals: (url_rewrite:) %>
+
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Url Rewrites", admin_url_rewrites_path) %></li>
+    <li><%= link_to(url_rewrite, admin_url_rewrite_path(url_rewrite)) %></li>
+  <% end %>
 
-<%= form_with(model: url_rewrite, url: admin_url_rewrite_path(url_rewrite)) do |form| %>
-  <%= render "fields", form: %>
+  <h1>Edit url rewrite</h1>
 
-  <div class="actions">
-    <%= form.admin_save %>
-    <%= form.admin_delete %>
-  </div>
+  <%= actions_list do %>
+    <li><%= link_to_delete(url_rewrite) %></li>
+  <% end %>
 <% end %>
+
+<%= render("form", url_rewrite:) %>

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

@@ -1,16 +1,19 @@
-<%# locals: { table:, collection } %>
-<% content_for :header do %>
-  <%= render Koi::Header::IndexComponent.new(model: UrlRewrite) do |component| %>
-    <% component.with_action "New", new_admin_url_rewrite_path %>
+<%# locals: (collection:) %>
+
+<% content_for(:header) do %>
+  <h1>Url Rewrites</h1>
+
+  <%= actions_list do %>
+    <li><%= link_to("New", new_admin_url_rewrite_path) %></li>
   <% end %>
 <% end %>
 
 <%= table_query_with(collection:) %>
 
 <%= table_with(collection:) do |row, url_rewrite| %>
-  <%= row.link :from, url: [:admin, url_rewrite] %>
-  <%= row.text :to %>
-  <%= row.boolean :active %>
+  <% row.link :from %>
+  <% row.text :to %>
+  <% row.boolean :active %>
 <% end %>
 
 <%= table_pagination_with(collection:) %>

data/app/views/admin/url_rewrites/new.html.erb

@@ -1,11 +1,11 @@
-<% content_for :header do %>
-  <%= render Koi::Header::NewComponent.new(model: UrlRewrite) %>
-<% end %>
+<%# locals: (url_rewrite:) %>
 
-<%= form_with(model: url_rewrite, url: admin_url_rewrites_path) do |form| %>
-  <%= render "fields", form: %>
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Url Rewrites", admin_url_rewrites_path) %></li>
+  <% end %>
 
-  <div class="actions">
-    <%= form.admin_save %>
-  </div>
+  <h1>New url rewrite</h1>
 <% end %>
+
+<%= render("form", url_rewrite:) %>

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

@@ -1,16 +1,21 @@
-<% content_for :header do %>
-  <%= render Koi::Header::ShowComponent.new(resource: url_rewrite) do |component| %>
-    <%= component.with_action "Preview", url_rewrite.to, target: "_blank" %>
+<%# locals: (url_rewrite:) %>
+
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Url Rewrites", admin_url_rewrites_path) %></li>
   <% end %>
-<% end %>
 
-<%= definition_list(class: "item-table") do |builder| %>
-  <%= builder.items_with(model: url_rewrite, attributes: UrlRewrite.attribute_names.sort, skip_blank: true) %>
+  <h1><%= url_rewrite %></h1>
+
+  <%= actions_list do %>
+    <li><%= link_to("Edit", edit_admin_url_rewrite_path(url_rewrite)) %></li>
+    <li><%= link_to("Preview", url_rewrite.to, rel: "noopener", target: "_blank") %></li>
+  <% end %>
 <% end %>
 
-<div class="actions-group">
-  <%= button_to "Delete", admin_url_rewrite_path(url_rewrite),
-                class:  "button button--secondary",
-                method: :delete,
-                form:   { data: { turbo_confirm: "Are you sure?" } } %>
-</div>
+<%= summary_table_with(model: url_rewrite) do |row| %>
+  <% row.text :from %>
+  <% row.text :to %>
+  <% row.boolean :active %>
+  <% row.enum :status_code %>
+<% end %>

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

@@ -0,0 +1,9 @@
+<%# locals: (well_known:) %>
+
+<%= form_with(model: well_known) do |form| %>
+  <%= form.govuk_text_field :name %>
+  <%= form.govuk_text_field :purpose %>
+  <%= form.govuk_enum_select :content_type %>
+  <%= form.govuk_text_field :content %>
+  <%= form.button(type: :submit, class: "button") %>
+<% end %>

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

@@ -1,12 +1,16 @@
-<% content_for :header do %>
-  <%= render(Koi::Header::EditComponent.new(resource: well_known)) %>
-<% end %>
+<%# locals: (well_known:) %>
+
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Well Knowns", admin_well_knowns_path) %></li>
+    <li><%= link_to(well_known, admin_well_known_path(well_known)) %></li>
+  <% end %>
 
-<%= form_with(model: well_known, url: admin_well_known_path(well_known)) do |form| %>
-  <%= render "fields", form: %>
+  <h1>Edit well known</h1>
 
-  <div class="actions">
-    <%= form.admin_save %>
-    <%= form.admin_delete %>
-  </div>
+  <%= actions_list do %>
+    <li><%= link_to_delete(well_known) %></li>
+  <% end %>
 <% end %>
+
+<%= render("form", well_known:) %>

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

@@ -1,13 +1,16 @@
-<% content_for :header do %>
-  <%= render(Koi::Header::IndexComponent.new(model: WellKnown)) do |component| %>
-    <% component.with_action "New", new_admin_well_known_path %>
+<%# locals: (collection:) %>
+
+<% content_for(:header) do %>
+  <h1>Well Knowns</h1>
+
+  <%= actions_list do %>
+    <li><%= link_to("New", new_admin_well_known_path) %></li>
   <% end %>
 <% end %>
 
 <%= table_query_with(collection:) %>
 
-<%= table_with(collection:) do |row| %>
-  <% row.select %>
+<%= table_with(collection:) do |row, well_known| %>
   <% row.link :name %>
   <% row.text :purpose %>
 <% end %>

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

@@ -1,11 +1,11 @@
-<% content_for :header do %>
-  <%= render(Koi::Header::NewComponent.new(model: WellKnown)) %>
-<% end %>
+<%# locals: (well_known:) %>
 
-<%= form_with(model: well_known, url: admin_well_knowns_path) do |form| %>
-  <%= render "fields", form: %>
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Well Knowns", admin_well_knowns_path) %></li>
+  <% end %>
 
-  <div class="actions">
-    <%= form.admin_save %>
-  </div>
+  <h1>New well known</h1>
 <% end %>
+
+<%= render("form", well_known:) %>

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

@@ -1,19 +1,20 @@
-<% content_for :header do %>
-  <%= render(Koi::Header::ShowComponent.new(resource: well_known)) %>
-<% end %>
+<%# locals: (well_known:) %>
+
+<% content_for(:header) do %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to("Well Knowns", admin_well_knowns_path) %></li>
+  <% end %>
 
-<h2>Summary</h2>
+  <h1><%= well_known %></h1>
+
+  <%= actions_list do %>
+    <li><%= link_to("Edit", edit_admin_well_known_path(well_known)) %></li>
+  <% end %>
+<% end %>
 
 <%= summary_table_with(model: well_known) do |row| %>
-  <% row.link :name %>
+  <% row.text :name %>
   <% row.text :purpose %>
-  <% row.text :content_type %>
+  <% row.enum :content_type %>
   <% row.text :content %>
 <% end %>
-
-<div class="actions">
-  <%= button_to "Delete", admin_well_known_path(well_known),
-                class:  "button button--secondary",
-                method: :delete,
-                form:   { data: { turbo_confirm: "Are you sure?" } } %>
-</div>

data/app/views/katalyst/content/asides/_aside.html+form.erb

@@ -1,4 +1,6 @@
-<%= render Koi::Content::Editor::ItemFormComponent.new(model: aside, url: path) do |form| %>
-  <%= form.content_heading_fieldset %>
-  <%= form.govuk_check_box_field :reverse, label: { text: "Show aside before content on mobile" } %>
-<% end %>
+<%# locals: (form:, aside:) %>
+
+<%= form.content_heading_fieldset %>
+<%= form.govuk_check_box_field(:reverse, label: { text: "Show aside before content on mobile" }) %>
+<%= form.content_theme_field %>
+<%= form.content_visible_field %>

data/app/views/katalyst/content/columns/_column.html+form.erb

@@ -1,3 +1,5 @@
-<%= render Koi::Content::Editor::ItemFormComponent.new(model: column, url: path) do |form| %>
-  <%= form.content_heading_fieldset %>
-<% end %>
+<%# locals: (form:, column:) %>
+
+<%= form.content_heading_fieldset %>
+<%= form.content_theme_field %>
+<%= form.content_visible_field %>

data/app/views/katalyst/content/contents/_content.html+form.erb

@@ -1,6 +1,8 @@
-<%= render Koi::Content::Editor::ItemFormComponent.new(model: content, url: path) do |form| %>
-  <%= form.content_heading_fieldset %>
-  <%= form.govuk_rich_text_area :content,
-                                label: { size: "s" },
-                                class: "content" %>
-<% end %>
+<%# locals: (form:, content:) %>
+
+<%= form.content_heading_fieldset %>
+<%= form.govuk_rich_text_area(:content,
+                              label: { size: "s" },
+                              class: "content") %>
+<%= form.content_theme_field %>
+<%= form.content_visible_field %>

data/app/views/katalyst/content/figures/_figure.html+form.erb

@@ -1,6 +1,9 @@
-<%= render Koi::Content::Editor::ItemFormComponent.new(model: figure, url: path) do |form| %>
-  <%= form.govuk_image_field :image, label: { size: "s" } do %>
-    <%= form.govuk_text_field :heading, label: { text: "Alternate text" } %>
-    <%= form.govuk_text_field :caption, label: { text: "Caption (optional)" }, optional: true %>
-  <% end %>
+<%# locals: (form:, figure:) %>
+
+<%= form.govuk_image_field(:image, label: { size: "s" }) do %>
+  <%= form.govuk_text_field(:heading, label: { text: "Alternate text" }) %>
+  <%= form.govuk_text_field(:caption, label: { text: "Caption (optional)" }, optional: true) %>
 <% end %>
+
+<%= form.content_theme_field %>
+<%= form.content_visible_field %>

data/app/views/katalyst/content/groups/_group.html+form.erb

@@ -1,3 +1,5 @@
-<%= render Koi::Content::Editor::ItemFormComponent.new(model: group, url: path) do |form| %>
-  <%= form.content_heading_fieldset %>
-<% end %>
+<%# locals: (form:, group:) %>
+
+<%= form.content_heading_fieldset %>
+<%= form.content_theme_field %>
+<%= form.content_visible_field %>

data/app/views/katalyst/content/items/_item.html+form.erb

@@ -1,3 +1,5 @@
-<%= render Koi::Content::Editor::ItemFormComponent.new(model: item, url: path) do |form| %>
-  <%= form.content_heading_fieldset %>
-<% end %>
+<%# locals: (form:, item:) %>
+
+<%= form.content_heading_fieldset %>
+<%= form.content_theme_field %>
+<%= form.content_visible_field %>

data/app/views/katalyst/content/sections/_section.html+form.erb

@@ -1,3 +1,5 @@
-<%= render Koi::Content::Editor::ItemFormComponent.new(model: section, url: path) do |form| %>
-  <%= form.content_heading_fieldset %>
-<% end %>
+<%# locals: (form:, section:) %>
+
+<%= form.content_heading_fieldset %>
+<%= form.content_theme_field %>
+<%= form.content_visible_field %>

data/app/views/katalyst/content/tables/_table.html+form.erb

@@ -1,31 +1,36 @@
-<%= render Koi::Content::Editor::ItemFormComponent.new(model: table, url: path, data: { controller: "content--editor--table" }) do |form| %>
+<%# locals: (form:, table:) %>
+
+<div class="flow" data-controller="content--editor--table">
   <%= form.content_heading_fieldset %>
 
   <% content = sanitize_content_table(normalize_content_table(form.object, heading: false)) %>
-  <%= form.govuk_text_area :content, value: content, data: { content__editor__table_target: "input" } %>
+  <%= form.govuk_text_area(:content, value: content, data: { content__editor__table_target: "input" }) %>
 
   <%# hidden button to receive <Enter> events (HTML-default is to click first button in form) %>
-  <%= form.button "Save", hidden: "" %>
+  <%= form.button("Save", hidden: "") %>
 
   <%# hidden button to submit the table for re-rendering %>
-  <%= form.button "Update",
-                  formaction: table.persisted? ? content_routes.table_path : content_routes.tables_path,
+  <%= form.button("Update",
                   hidden:     "",
-                  data:       { content__editor__table_target: "update" } %>
+                  formaction: table.persisted? ? katalyst_content.table_path : katalyst_content.tables_path,
+                  data:       { content__editor__table_target: "update" }) %>
 
-  <%= form.govuk_number_field :heading_rows,
+  <%= form.govuk_number_field(:heading_rows,
                               label:       { text: "Heading rows" },
                               width:       2,
                               placeholder: 0,
                               min:         0,
                               data:        { content__editor__table_target: "headerRows",
-                                             action:                        "input->content--editor--table#update" } %>
+                                             action:                        "input->content--editor--table#update" }) %>
 
-  <%= form.govuk_number_field :heading_columns,
+  <%= form.govuk_number_field(:heading_columns,
                               label:       { text: "Heading columns" },
                               width:       2,
                               placeholder: 0,
                               min:         0,
                               data:        { content__editor__table_target: "headerColumns",
-                                             action:                        "input->content--editor--table#update" } %>
-<% end %>
+                                             action:                        "input->content--editor--table#update" }) %>
+</div>
+
+<%= form.content_theme_field %>
+<%= form.content_visible_field %>

data/app/views/katalyst/navigation/items/_button.html.erb

@@ -1,15 +1,9 @@
-<%= form_with model: item, scope: :item, url: path, builder: Koi::FormBuilder do |form| %>
-  <%= form.hidden_field :type %>
-  <%= form.govuk_text_field :title %>
-  <%= form.govuk_text_field :url %>
+<%# locals: (form:) %>
 
-  <%= form.govuk_check_box_field :visible, small: true, label: { text: "Visible?" } %>
+<%= form.govuk_text_field :title %>
+<%= form.govuk_text_field :url %>
 
-  <%= form.govuk_select :http_method, Katalyst::Navigation::Button::HTTP_METHODS, label: { text: "HTTP Method" } %>
-  <%= form.govuk_select :target, Katalyst::Navigation::Button::TARGETS %>
+<%= form.govuk_check_box_field :visible, small: true, label: { text: "Visible?" } %>
 
-  <div class="actions">
-    <%= form.admin_save "Done" %>
-    <%= form.admin_discard %>
-  </div>
-<% end %>
+<%= form.govuk_select :http_method, Katalyst::Navigation::Button::HTTP_METHODS, label: { text: "HTTP Method" } %>
+<%= form.govuk_select :target, Katalyst::Navigation::Button::TARGETS %>

data/app/views/katalyst/navigation/items/_heading.html.erb

@@ -1,11 +1,4 @@
-<%= form_with model: item, scope: :item, url: path, builder: Koi::FormBuilder do |form| %>
-  <%= form.hidden_field :type %>
-  <%= form.govuk_text_field :title %>
+<%# locals: (form:) %>
 
-  <%= form.govuk_check_box_field :visible, small: true, label: { text: "Visible?" } %>
-
-  <div class="actions">
-    <%= form.admin_save "Done" %>
-    <%= form.admin_discard %>
-  </div>
-<% end %>
+<%= form.govuk_text_field :title %>
+<%= form.govuk_check_box_field :visible, small: true, label: { text: "Visible?" } %>

data/app/views/katalyst/navigation/items/_link.html.erb

@@ -1,13 +1,8 @@
-<%= form_with model: item, scope: :item, url: path, builder: Koi::FormBuilder do |form| %>
-  <%= form.hidden_field :type %>
-  <%= form.govuk_text_field :title %>
-  <%= form.govuk_text_field :url %>
+<%# locals: (form:) %>
 
-  <%= form.govuk_check_box_field :visible, small: true, label: { text: "Visible?" } %>
-  <%= form.govuk_select :target, Katalyst::Navigation::Link::TARGETS %>
+<%= form.govuk_text_field :title %>
+<%= form.govuk_text_field :url %>
 
-  <div class="actions">
-    <%= form.admin_save "Done" %>
-    <%= form.admin_discard %>
-  </div>
-<% end %>
+<%= form.govuk_check_box_field :visible, small: true, label: { text: "Visible?" } %>
+
+<%= form.govuk_select :target, Katalyst::Navigation::Link::TARGETS %>

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

@@ -1,7 +1,13 @@
 <% content_for :header do %>
-  <%= render Koi::Header::EditComponent.new(resource: menu, title: "Edit navigation") do |component| %>
-    <% component.with_breadcrumb "Navigations", katalyst_navigation.menus_path %>
-    <% component.with_breadcrumb menu.title, katalyst_navigation.menu_path(menu) %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to "Navigations", katalyst_navigation.menus_path %></li>
+    <li><%= link_to menu.title, katalyst_navigation.menu_path(menu) %></li>
+  <% end %>
+
+  <h1>Edit navigation</h1>
+
+  <%= actions_list do %>
+    <li><%= link_to_delete(menu, url: katalyst_navigation.menu_path(menu)) %></li>
   <% end %>
 <% end %>
 
@@ -9,7 +15,5 @@
   <%= form.govuk_text_field :title %>
   <%= form.govuk_text_field :slug %>
   <%= form.govuk_text_field :depth %>
-  <div class="actions">
-    <%= form.admin_save %>
-  </div>
+  <%= form.button(type: :submit, class: "button") %>
 <% end %>

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

@@ -1,6 +1,8 @@
 <% content_for :header do %>
-  <%= render Koi::Header::IndexComponent.new(model: Katalyst::Navigation::Menu, title: "Navigation") do |component| %>
-    <% component.with_action "New", katalyst_navigation.new_menu_path %>
+  <h1>Navigation</h1>
+
+  <%= actions_list do %>
+    <li><%= link_to "New", katalyst_navigation.new_menu_path %>
   <% end %>
 <% end %>
 

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

@@ -1,12 +1,14 @@
 <% content_for :header do %>
-  <%= render Koi::Header::NewComponent.new(model: Katalyst::Navigation::Menu, title: "New navigation") do |component| %>
-    <% component.with_breadcrumb "Navigations", katalyst_navigation.menus_path %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to "Navigations", katalyst_navigation.menus_path %></li>
   <% end %>
+
+  <h1>New navigation</h1>
 <% end %>
 
 <%= form_with model: menu, url: katalyst_navigation.menus_path do |form| %>
   <%= form.govuk_text_field :title %>
   <%= form.govuk_text_field :slug %>
   <%= form.govuk_text_field :depth %>
-  <%= form.admin_save %>
+  <%= form.button(type: :submit, class: "button") %>
 <% end %>

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

@@ -1,13 +1,14 @@
 <% content_for :header do %>
-  <%= render Koi::Header::ShowComponent.new(resource: menu, title: menu.title) do |component| %>
-    <% component.with_breadcrumb "Navigations", katalyst_navigation.menus_path %>
-    <% component.with_action "Edit", katalyst_navigation.edit_menu_path(menu) %>
+  <%= breadcrumb_list do %>
+    <li><%= link_to "Navigations", katalyst_navigation.menus_path %></li>
+  <% end %>
+
+  <h1><%= menu.title %></h1>
+
+  <%= actions_list do %>
+    <li><%= link_to("Edit", katalyst_navigation.edit_menu_path(menu)) %></li>
   <% end %>
 <% end %>
 
 <%= render editor.status_bar %>
 <%= render editor %>
-
-<%= content_for :sidebar do %>
-  <%= render editor.new_items %>
-<% end %>

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

@@ -0,0 +1,20 @@
+<header data-environment="<%= Rails.env %>" class="application-header">
+  <div class="repel wrapper">
+    <%= link_to(main_app.admin_dashboard_path, class: "brand") do %>
+      <icon aria-hidden="true" class="icon" data-icon="koi">&nbsp;</icon>
+      Koi
+    <% end %>
+    <div>
+      <span class="environment"><%= Rails.env.capitalize %></span>
+      <span class="release">(<%= Koi::Release.version %>)</span>
+    </div>
+    <%= tag.button(class: "button",
+                   data:  {
+                     controller:  "navigation-toggle",
+                     action:      "navigation-toggle#trigger",
+                     text_button: "",
+                   }) do %>
+      Menu <kbd>G</kbd>
+    <% end %>
+  </div>
+</header>

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

@@ -0,0 +1,34 @@
+<dialog class="application-navigation"
+        data-controller="navigation"
+        data-action="shortcut:go@document->navigation#toggle
+          navigation:toggle@document->navigation#toggle
+          shortcut:nav-toggle@document->navigation#toggle
+          turbo:before-morph-attribute->navigation#onMorphAttribute
+          click->navigation#click">
+  <nav aria-label="Main menu" role="navigation" class="flow">
+    <div class="filter">
+      <input type="search" placeholder="Filter menu" autocomplete="off" autofocus
+             data-navigation-target="filter"
+             data-action="input->navigation#filter change->navigation#filter
+                        keydown.enter->navigation#go keydown.esc->navigation#clear">
+    </div>
+    <ul class="navigation-group | flow" role="list">
+      <li>
+        <span><%= current_admin_user.name %></span>
+        <ul class="navigation-list | flow" role="list">
+          <li><%= link_to("Profile", main_app.admin_admin_user_path(current_admin_user)) %></li>
+          <li><%= link_to("Log out", main_app.admin_session_path, data: { turbo_method: :delete }) %></li>
+        </ul>
+      </li>
+    </ul>
+    <%= navigation_menu_with(
+          menu:  Koi::Menu.admin_menu(self),
+          list:  {
+            class: "navigation-list | flow",
+            role:  "list",
+          },
+          class: "navigation-group | flow",
+          role:  "list",
+        ) %>
+  </nav>
+</dialog>

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

@@ -1,8 +1,11 @@
-<ul id="flash" aria-label="Notifications" data-controller="flash" class="stack">
+<ul aria-label="Notifications" data-controller="flash" class="flash | flow" role="list">
   <% flash.each do |type, message| %>
-    <%= tag.li role: "alertdialog", class: type do %>
+    <%= tag.li(role: "alertdialog", class: "flash | wrapper", data: { flash_type: type }) do %>
       <%= message %>
-      <%= tag.button "Close", aria: { label: "Dismiss" }, data: { action: "flash#close" } %>
+      <%= tag.button("Dismiss",
+                     aria:  { label: "Dismiss" },
+                     class: "button",
+                     data:  { action: "flash#close", ghost_button: "" }) %>
     <% end %>
   <% end %>
 </ul>

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

@@ -6,6 +6,4 @@
   <% else %>
     <h3 class="admin-name">Koi Admin</h3>
   <% end %>
-  <%# default, prefer using an icon in a Koi override %>
-  <span class="site-icon"><%= URI.parse(root_url).host[0] %></span>
 </header>