katalyst-koi 4.5.0.beta.2 → 4.5.1

data/app/components/koi/tables/header_row_component.rb

@@ -5,46 +5,208 @@ module Koi
     # Custom header row component, in order to override the default header cell component
     # for number columns, we add a class to the header cell to allow for custom styling
     class HeaderRowComponent < Katalyst::Tables::HeaderRowComponent
-      def boolean(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, &block)
+      # Renders a boolean column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (:xs) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a boolean column header
+      #  <% row.boolean :active %> # => <th>Active</th>
+      #
+      # @example Render a boolean column header with a custom label
+      #  <% row.boolean :active, label: "Published" %> # => <th>Published</th>
+      #
+      # @example Render a boolean column header with medium width
+      #  <% row.boolean :active, width: :m %>
+      #  # => <th class="width-s">Active</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#boolean
+      def boolean(method, **attributes, &block)
+        header_cell(method, component: Header::BooleanComponent, **attributes, &block)
       end
 
-      def date(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, &block)
+      # Renders a date column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (:s) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a date column header
+      #  <% row.date :published_on %> # => <th>Published on</th>
+      #
+      # @example Render a date column header with a custom label
+      #  <% row.date :published_on, label: "Date" %> # => <th>Date</th>
+      #
+      # @example Render a date column header with small width
+      #  <% row.date :published_on, width: :s %>
+      #  # => <th class="width-s">Published on</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#date
+      def date(method, **attributes, &block)
+        header_cell(method, component: Header::DateComponent, **attributes, &block)
       end
 
-      def datetime(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, &block)
+      # Renders a datetime column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (:m) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a datetime column header
+      #  <% row.datetime :created_at %> # => <th>Created at</th>
+      #
+      # @example Render a datetime column header with a custom label
+      #  <% row.datetime :created_at, label: "Published at" %> # => <th>Published at</th>
+      #
+      # @example Render a datetime column header with small width
+      #  <% row.datetime :created_at, width: :s %>
+      #  # => <th class="width-s">Created at</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#datetime
+      def datetime(method, **attributes, &block)
+        header_cell(method, component: Header::DateTimeComponent, **attributes, &block)
       end
 
-      def number(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, component: Header::NumberComponent, &block)
+      # Renders a number column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (:xs) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a number column header
+      #  <% row.number :comment_count %> # => <th>Comments</th>
+      #
+      # @example Render a number column header with a custom label
+      #  <% row.number :comment_count, label: "Comments" %> # => <th>Comments</th>
+      #
+      # @example Render a number column header with medium width
+      #  <% row.number :comment_count, width: :m %>
+      #  # => <th class="width-m">Comment Count</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#number
+      def number(method, **attributes, &block)
+        header_cell(method, component: Header::NumberComponent, **attributes, &block)
       end
 
-      def money(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, component: Header::NumberComponent, &block)
+      # Renders a currency column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (:s) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a currency column header
+      #  <% row.currency :price %> # => <th>Price</th>
+      #
+      # @example Render a currency column header with a custom label
+      #  <% row.currency :price, label: "Amount($)" %> # => <th>Amount($)</th>
+      #
+      # @example Render a currency column header with medium width
+      #  <% row.currency :price, width: :m %>
+      #  # => <th class="width-m">Price</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#currency
+      def currency(method, **attributes, &block)
+        header_cell(method, component: Header::CurrencyComponent, **attributes, &block)
       end
 
-      def rich_text(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, &block)
+      # Renders a rich text column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (nil) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a rich text column header
+      #  <% row.rich_text :content %> # => <th>Content</th>
+      #
+      # @example Render a rich text column header with a custom label
+      #  <% row.rich_text :content, label: "Post content" %> # => <th>Post content</th>
+      #
+      # @example Render a rich text column header with large width
+      #  <% row.rich_text :content, width: :l %>
+      #  # => <th class="width-l">Content</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#rich_text
+      def rich_text(method, **attributes, &block)
+        header_cell(method, component: Header::TextComponent, **attributes, &block)
       end
 
-      def link(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, &block)
+      # Renders a link column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (nil) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a link column header
+      #  <% row.link :link %> # => <th>Link</th>
+      #
+      # @example Render a link column header with a custom label
+      #  <% row.link :link, label: "Post" %> # => <th>Post</th>
+      #
+      # @example Render a link column header with small width
+      #  <% row.link :content, width: :s %>
+      #  # => <th class="width-s">Content</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#link
+      def link(method, **attributes, &block)
+        header_cell(method, component: Header::LinkComponent, **attributes, &block)
       end
 
-      def text(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, &block)
+      # Renders a text column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (nil) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a text column header
+      #  <% row.text :content %> # => <th>Content</th>
+      #
+      # @example Render a text column header with a custom label
+      #  <% row.text :content, label: "Description" %> # => <th>Description</th>
+      #
+      # @example Render a text column header with large width
+      #  <% row.text :content, width: :l %>
+      #  # => <th class="width-l">Content</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#text
+      def text(method, **attributes, &block)
+        header_cell(method, component: Header::TextComponent, **attributes, &block)
       end
 
-      def image(attribute, **attributes, &block)
-        header_cell(attribute, **attributes, &block)
+      # Renders a attachment column header
+      # @param method [Symbol] the method to call on the record to get the value
+      # @param attributes [Hash] additional arguments are applied as html attributes to the th element
+      # @option attributes [String] :label (nil) The label options to display in the header
+      # @option attributes [Hash] :link ({}) The link options for the sorting link
+      # @option attributes [String] :width (nil) The width of the column, can be +:xs+, +:s+, +:m+, +:l+ or nil
+      #
+      # @example Render a attachment column header
+      #  <% row.attachment :attachment %> # => <th>Attachment</th>
+      #
+      # @example Render a attachment column header with a custom label
+      #  <% row.attachment :attachment, label: "Document" %> # => <th>Document</th>
+      #
+      # @example Render a attachment column header with small width
+      #  <% row.attachment :attachment, width: :s %>
+      #  # => <th class="width-s">Attachment</th>
+      #
+      # @see Koi::Tables::BodyRowComponent#attachment
+      def attachment(method, **attributes, &block)
+        header_cell(method, component: Header::AttachmentComponent, **attributes, &block)
       end
 
       private
 
-      def header_cell(attribute, component: HeaderCellComponent, **attributes, &block)
-        with_column(component.new(@table, attribute, link: @link_attributes, **attributes), &block)
+      def header_cell(method, component: HeaderCellComponent, **attributes, &block)
+        with_column(component.new(@table, method, link: @link_attributes, **attributes), &block)
       end
     end
   end

data/app/controllers/admin/tokens_controller.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Admin
+  class TokensController < ApplicationController
+    include Koi::Controller::JsonWebToken
+
+    skip_before_action :authenticate_admin, only: %i[show update]
+    before_action :set_token, only: %i[show update]
+
+    def create
+      admin = Admin::User.find(params[:id])
+      token = encode_token(admin_id: admin.id, exp: 5.minutes.from_now.to_i, iat: Time.now.to_i)
+
+      render locals: { token: }
+    end
+
+    def update
+      return redirect_to admin_dashboard_path, status: :see_other if admin_signed_in?
+
+      return redirect_to new_admin_session_path, status: :see_other, notice: "invalid token" if @token.blank?
+
+      admin = Admin::User.find(@token[:admin_id])
+      sign_in_admin(admin)
+
+      redirect_to admin_admin_user_path(admin)
+    end
+
+    def show
+      return redirect_to new_admin_session_path, notice: "Token invalid or consumed already" if @token.blank?
+
+      admin = Admin::User.find(@token[:admin_id])
+
+      if token_utilised?(admin, @token)
+        return redirect_to new_admin_session_path, notice: "Token invalid or consumed already"
+      end
+
+      render locals: { admin:, token: params[:token] }, layout: "koi/login"
+    end
+
+    private
+
+    def set_token
+      @token = decode_token(params[:token])
+    end
+
+    def token_utilised?(admin, token)
+      admin.current_sign_in_at.present? || (admin.last_sign_in_at.present? && admin.last_sign_in_at.to_i > token[:iat])
+    end
+
+    def sign_in_admin(admin)
+      admin.current_sign_in_at = Time.current
+      admin.current_sign_in_ip = request.remote_ip
+      admin.sign_in_count      = 1
+
+      # disable validations to allow saving without password or passkey credentials
+      admin.save!(validate: false)
+      session[:admin_user_id] = admin.id
+    end
+  end
+end

data/app/controllers/concerns/koi/controller/json_web_token.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Koi
+  module Controller
+    module JsonWebToken
+      extend ActiveSupport::Concern
+
+      SECRET_KEY = Rails.application.secret_key_base
+
+      def encode_token(**payload)
+        JWT.encode(payload, SECRET_KEY)
+      end
+
+      def decode_token(token)
+        payload = JWT.decode(token, SECRET_KEY)[0]
+        HashWithIndifferentAccess.new(payload)
+      rescue JWT::DecodeError
+        nil
+      end
+    end
+  end
+end

data/app/helpers/koi/date_helper.rb

@@ -1,36 +1,26 @@
 # frozen_string_literal: true
 
-# rubocop:disable Naming/MethodName
 module Koi
   module DateHelper
-    # @deprecated
-    def date_format(date, format)
-      date.strftime format.gsub(/yyyy/, "%Y")
-                      .gsub(/yy/,    "%y")
-                      .gsub(/Month/, "%B")
-                      .gsub(/M/,     "%b")
-                      .gsub(/mm/,    "%m")
-                      .gsub(/m/,     "%-m")
-                      .gsub(/Day/,   "%A")
-                      .gsub(/D/,     "%a")
-                      .gsub(/dd/,    "%d")
-                      .gsub(/d/,     "%-d")
-    end
-
-    # @deprecated
-    def date_Month_d_yyyy(date)
-      date.strftime "%B %-d, %Y"
-    end
-
-    # @deprecated
-    def date_d_Month_yyyy(date)
-      date.strftime "%-d %B %Y"
-    end
+    # Returns a string representing the number of days ago or from now.
+    # If the date is not 'recent' returns nil.
+    def days_ago_in_words(value)
+      from_time = value.to_time
+      to_time = Date.current.to_time
+      distance_in_days = ((to_time - from_time) / (24.0 * 60.0 * 60.0)).round
 
-    # @deprecated
-    def date_d_M_yy(date)
-      date.strftime "%-d %b %y"
+      case distance_in_days
+      when 0
+        "today"
+      when 1
+        "yesterday"
+      when -1
+        "tomorrow"
+      when 2..5
+        "#{distance_in_days} days ago"
+      when -5..-2
+        "#{distance_in_days.abs} days from now"
+      end
     end
   end
 end
-# rubocop:enable Naming/MethodName

data/app/models/admin/user.rb

@@ -8,7 +8,8 @@ module Admin
       ActiveModel::Name.new(self, nil, "Admin")
     end
 
-    has_secure_password :password
+    # disable validations for password_digest
+    has_secure_password validations: false
 
     has_many :credentials, inverse_of: :admin, class_name: "Admin::Credential", dependent: :destroy
 

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

@@ -2,12 +2,12 @@
   <%= render Koi::Header::ShowComponent.new(resource: admin) %>
 <% end %>
 
-<%= definition_list(class: "item-table") do |builder| %>
-  <%= builder.item admin, :name %>
-  <%= builder.item admin, :email %>
-  <%= builder.item admin, :created_at %>
-  <%= builder.item admin, :last_sign_in_at, label: { text: "Last sign in" } %>
-  <%= builder.item admin, :archived? %>
+<%= render Koi::SummaryListComponent.new(model: admin, class: "item-table") do |builder| %>
+  <%= builder.text :name %>
+  <%= builder.text :email %>
+  <%= builder.datetime :created_at %>
+  <%= builder.datetime :last_sign_in_at, label: { text: "Last sign in" } %>
+  <%= builder.boolean :archived? %>
 <% end %>
 
 <div class="actions">
@@ -17,6 +17,7 @@
                   method: :delete,
                   form:   { data: { turbo_confirm: "Are you sure?" } } %>
   <% end %>
+  <%= button_to "Generate login link", invite_admin_admin_user_path(admin), class: "button button--primary", form: { id: "invite" } %>
 </div>
 
 <h2>Authentication</h2>

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

@@ -7,6 +7,15 @@
         webauthn_authentication_options_value: { publicKey: webauthn_auth_options },
       },
     ) do |f| %>
+  <% unless flash.empty? %>
+    <div class="govuk-error-summary">
+      <ul class="govuk-error-summary__list">
+        <% flash.each do |_, message| %>
+          <%= tag.li message %>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
   <%= f.govuk_fieldset legend: nil do %>
     <%= f.govuk_email_field :email, autofocus: true, autocomplete: "email" %>
     <%= f.govuk_password_field :password, autocomplete: "current-password" %>

data/app/views/admin/tokens/create.turbo_stream.erb

@@ -0,0 +1,9 @@
+<%= turbo_stream.replace "invite" do %>
+  <div class="action copy-to-clipboard govuk-input__wrapper" data-controller="clipboard" data-clipboard-supported-class="clipboard--supported">
+    <%= text_field_tag :invite_link, admin_token_url(token), readonly: true, data: { clipboard_target: "source" } %>
+    <button class="govuk-input__suffix clipboard-button" aria-hidden="true" data-action="clipboard#copy">
+      Copy link
+    </button>
+    <div class="copy-to-clipboard-feedback" role="alert"></div>
+  </div>
+<% end %>

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

@@ -0,0 +1,13 @@
+<%= render "layouts/koi/navigation_header" %>
+
+<%= form_with(url: accept_admin_session_path) do |form| %>
+  <%= tag.input name: :token, type: :hidden, value: token %>
+  <p>Welcome to Koi Admin</p>
+  <%= render Koi::SummaryListComponent.new(model: admin, class: "item-table") do |builder| %>
+    <%= builder.text :name %>
+    <%= builder.text :email %>
+  <% end %>
+  <div class="actions-group">
+    <%= form.admin_save "Sign in" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,41 @@
+<%= render Koi::Content::Editor::ItemFormComponent.new(model: table, url: path, data: { controller: "content--editor--table" }) do |form| %>
+  <%= form.content_heading_fieldset %>
+
+  <div class="govuk-form-group">
+    <label for="item-content-field" class="govuk-label govuk-label--s">Content</label>
+    <% content = sanitize_content_table(normalize_content_table(form.object, heading: false)) %>
+    <div class="govuk-textarea content--editor--table-editor"
+         contenteditable="true"
+         data-content--editor--table-target="content"
+         data-action="paste->content--editor--table#paste"
+         id="item-content-field">
+      <%= content %>
+    </div>
+    <%= form.hidden_field :content, value: content, data: { content__editor__table_target: "input" } %>
+  </div>
+
+  <%# hidden button to receive <Enter> events (HTML-default is to click first button in form) %>
+  <%= 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,
+                  hidden:     "",
+                  data:       { content__editor__table_target: "update" } %>
+
+  <%= 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" } %>
+
+  <%= 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 %>

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

@@ -2,7 +2,7 @@
      data-action="shortcut:go@document->navigation#focus
      navigation:toggle@document->navigation#toggle
      shortcut:nav-toggle@document->navigation#toggle">
-  <%= render "layouts/koi/navigation_header" %>
+  <%= render "layouts/koi/navigation_header", admin: current_admin %>
   <div class="filter">
     <input type="search" placeholder="Filter menu" autocomplete="off"
            data-navigation-target="filter"

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

@@ -1,6 +1,11 @@
 <header>
   <h2 class="site-name"><%= URI.parse(root_url).host %></h2>
-  <h3 class="admin-name">Koi Admin</h3>
+  <%# show username on nav header and Koi Admin on login page %>
+  <% if local_assigns[:admin].present? %>
+    <%= link_to admin.name, admin_admin_user_path(admin), class: "admin-name" %>
+  <% 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>

data/config/routes.rb

@@ -2,13 +2,20 @@
 
 Rails.application.routes.draw do
   namespace :admin do
-    resource :session, only: %i[new create destroy]
+    resource :session, only: %i[new create destroy] do
+      post :accept, to: "tokens#update"
+    end
 
     resources :url_rewrites
     resources :admin_users do
       resources :credentials, only: %i[new create destroy]
+      post :invite, on: :member, to: "tokens#create"
     end
 
+    # JWT tokens have dots(represents the 3 parts of data) in them, so we need to allow them in the URL
+    # can by pass if we use token as a query param
+    get "token/:token", to: "tokens#show", as: :token, token: /[^\/]+/
+
     resource :cache, only: %i[destroy]
     resource :dashboard, only: %i[show]
 

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

@@ -2,7 +2,6 @@
 
 module Admin
   class <%= controller_class_name %>Controller < ApplicationController
-
     before_action :set_<%= singular_name %>, only: %i[show edit update destroy]
 
     def index
@@ -31,7 +30,7 @@ module Admin
       @<%= singular_name %> = ::<%= class_name %>.new(<%= singular_table_name %>_params)
 
       if @<%= singular_name %>.save
-        redirect_to [:admin, @<%= singular_name %>]
+        redirect_to [:admin, @<%= singular_name %>], status: :see_other
       else
         render :new, locals: { <%= singular_name %>: @<%= singular_name %> }, status: :unprocessable_entity
       end
@@ -39,16 +38,16 @@ module Admin
 
     def update
       if @<%= singular_name %>.update(<%= singular_table_name %>_params)
-        redirect_to action: :show
+        redirect_to action: :show, status: :see_other
       else
         render :edit, locals: { <%= singular_name %>: @<%= singular_name %> }, status: :unprocessable_entity
       end
     end
 
     def destroy
-      @<%= singular_name %>.destroy
+      @<%= singular_name %>.destroy!
 
-      redirect_to action: :index
+      redirect_to action: :index, status: :see_other
     end
 
     private
@@ -56,9 +55,9 @@ module Admin
     # Only allow a list of trusted parameters through.
     def <%= "#{singular_table_name}_params" %>
       <%- if attributes_names.empty? -%>
-        params.fetch(:<%= singular_table_name %>, {})
+      params.fetch(:<%= singular_table_name %>, {})
       <%- else -%>
-        params.require(:<%= singular_table_name %>).permit(<%= permitted_params %>)
+      params.require(:<%= singular_table_name %>).permit(<%= permitted_params %>)
       <%- end -%>
     end
 

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

@@ -23,7 +23,7 @@ RSpec.describe Admin::<%= controller_class_name %>Controller do
 
       it "paginates the collection" do
         action
-        expect(response.body).to have_selector("tbody tr", count: 20)
+        expect(response.body).to have_css("tbody tr", count: 20)
       end
     end
 
@@ -37,7 +37,7 @@ RSpec.describe Admin::<%= controller_class_name %>Controller do
 
       it "finds first in second place" do
         action
-        expect(response.body).to have_selector("tbody tr + tr td", text: "first")
+        expect(response.body).to have_css("tbody tr + tr td", text: "first")
       end
     end
 
@@ -51,12 +51,12 @@ RSpec.describe Admin::<%= controller_class_name %>Controller do
 
       it "finds the needle" do
         action
-        expect(response.body).to have_selector("table td", text: "first")
+        expect(response.body).to have_css("table td", text: "first")
       end
 
       it "removes the chaff" do
         action
-        expect(response.body).not_to have_selector("table td", text: "second")
+        expect(response.body).to have_no_css("table td", text: "second")
       end
     end
   end

data/lib/generators/koi/admin_views/admin_views_generator.rb

@@ -38,10 +38,10 @@ module Koi
         %(<%= form.govuk_check_box_field :#{attribute.name} %>)
       when :date
         %(<%= form.govuk_date_field :#{attribute.name}, legend: { size: "s" } %>)
-      when :text
-        %(<%= form.govuk_rich_text_area :#{attribute.name} %>)
-      when :rich_text
+      when :rich_text, :text
         %(<%= form.govuk_rich_text_area :#{attribute.name} %>)
+      when :attachment
+        %(<%= form.govuk_image_field :#{attribute.name} %>)
       else
         ""
       end
@@ -61,6 +61,8 @@ module Koi
         %(<% dl.datetime :#{attribute.name} %>)
       when :rich_text
         %(<% dl.rich_text :#{attribute.name} %>)
+      when :attachment
+        %(<% dl.attachment :#{attribute.name} %>)
       else
         %(<% dl.text :#{attribute.name} %>)
       end
@@ -79,7 +81,7 @@ module Koi
       when :rich_text
         %(<% row.rich_text :#{attribute.name} %>)
       when :attachment
-        %(<% row.image :#{attribute.name} %>)
+        %(<% row.attachment :#{attribute.name} %>)
       else
         %(<% row.text :#{attribute.name} %>)
       end