katalyst-koi 4.7.3 → 4.8.1

data/lib/govuk_design_system_formbuilder/elements/image.rb

@@ -9,8 +9,8 @@ module GOVUKDesignSystemFormBuilder
       include FileElement
 
       def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, mime_types:,
-                     **kwargs, &block)
-        super(builder, object_name, attribute_name, &block)
+                     **kwargs, &)
+        super(builder, object_name, attribute_name, &)
 
         @mime_types      = mime_types
         @label           = label
@@ -89,10 +89,10 @@ module GOVUKDesignSystemFormBuilder
                           hint: {},
                           form_group: {},
                           mime_types: Koi.config.image_mime_types,
-                          **kwargs,
-                          &block)
+                          **,
+                          &)
       Elements::Image.new(
-        self, object_name, attribute_name, label:, caption:, hint:, form_group:, mime_types:, **kwargs, &block
+        self, object_name, attribute_name, label:, caption:, hint:, form_group:, mime_types:, **, &
       ).html
     end
   end

data/lib/koi/config.rb

@@ -7,6 +7,8 @@ module Koi
   class Config
     include ActiveSupport::Configurable
 
+    config_accessor(:admin_name) { "Koi" }
+
     config_accessor(:resource_name_candidates) { %i[title name] }
 
     config_accessor(:admin_stylesheet) { "koi/admin" }

data/lib/koi/form_builder.rb

@@ -7,31 +7,31 @@ module Koi
     include GOVUKDesignSystemFormBuilder::Builder
 
     # Generates a submit button for saving admin resources.
-    def admin_save(text = "Save", name: :commit, value: :save, class: "button button--primary", **kwargs)
-      button(text, name:, value:, class:, **kwargs)
+    def admin_save(text = "Save", name: :commit, value: :save, class: "button button--primary", **)
+      button(text, name:, value:, class:, **)
     end
 
     # Generates a delete link formatted as a button that will perform a turbo
     # delete with a confirmation.
-    def admin_delete(text = "Delete", url: nil, confirm: "Are you sure?", data: {}, **kwargs)
+    def admin_delete(text = "Delete", url: nil, confirm: "Are you sure?", data: {}, **)
       return unless object.persisted?
 
       link_to(text, url || url_for(action: :destroy),
               class: "button button--secondary",
               data:  data.reverse_merge(turbo_method: :delete, turbo_confirm: confirm),
-              **kwargs)
+              **)
     end
 
     # Generates an archive link formatted as a button that will perform a turbo
     # delete with a confirmation.
-    def admin_archive(text = "Archive", **kwargs)
-      admin_delete(text, **kwargs)
+    def admin_archive(text = "Archive", **)
+      admin_delete(text, **)
     end
 
     # Generates a discard changes link formatted as a text button that navigates
     # the user back to the previous page.
-    def admin_discard(text = "Discard", url: :back, **kwargs)
-      link_to(text, url, class: "button button--text", **kwargs)
+    def admin_discard(text = "Discard", url: :back, **)
+      link_to(text, url, class: "button button--text", **)
     end
 
     # @api internal
@@ -42,7 +42,7 @@ module Koi
         hint[:text] ||= t("helpers.hint.default.document", max_size: @template.number_to_human_size(max_size))
       end
 
-      super(attribute_name, hint:, **, &)
+      super
     end
 
     # @api internal
@@ -53,20 +53,20 @@ module Koi
         hint[:text] ||= t("helpers.hint.default.document", max_size: @template.number_to_human_size(max_size))
       end
 
-      super(attribute_name, hint:, **, &)
+      super
     end
 
     # Use content editor trix setup by default.
     #
     # @api internal
     # @see GOVUKDesignSystemFormBuilder::Builder#govuk_rich_text_area
-    def govuk_rich_text_area(attribute_name, data: {}, **kwargs, &block)
+    def govuk_rich_text_area(attribute_name, data: {}, **, &)
       data = data.reverse_merge(
         direct_upload_url: @template.katalyst_content.direct_uploads_url,
         controller:        "content--editor--trix",
         action:            "trix-initialize->content--editor--trix#trixInitialize",
       )
-      super(attribute_name, data:, **kwargs, &block)
+      super
     end
   end
 end

data/lib/koi/menu/builder.rb

@@ -27,10 +27,10 @@ module Koi
         end
       end
 
-      def add_menu(title:, **options, &)
+      def add_menu(title:, **, &)
         @menu.items.build(type:  Katalyst::Navigation::Heading.name,
                           title:,
-                          **options,
+                          **,
                           index: @index,
                           depth: @depth)
         @index += 1
@@ -39,21 +39,21 @@ module Koi
         @depth -= 1
       end
 
-      def add_link(title:, url:, **options)
+      def add_link(title:, url:, **)
         @menu.items.build(type:  Katalyst::Navigation::Link.name,
                           title:,
                           url:,
-                          **options,
+                          **,
                           index: @index,
                           depth: @depth)
         @index += 1
       end
 
-      def add_button(title:, url:, **options)
+      def add_button(title:, url:, **)
         @menu.items.build(type:  Katalyst::Navigation::Button.name,
                           title:,
                           url:,
-                          **options,
+                          **,
                           index: @index,
                           depth: @depth)
         @index += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 4.7.3
+  version: 4.8.1
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-30 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -260,6 +260,7 @@ files:
 - app/assets/javascripts/koi/controllers/keyboard_controller.js
 - app/assets/javascripts/koi/controllers/navigation_controller.js
 - app/assets/javascripts/koi/controllers/navigation_toggle_controller.js
+- app/assets/javascripts/koi/controllers/pagy_nav_controller.js
 - app/assets/javascripts/koi/controllers/show_hide_controller.js
 - app/assets/javascripts/koi/controllers/sluggable_controller.js
 - app/assets/javascripts/koi/controllers/webauthn_authentication_controller.js
@@ -272,17 +273,16 @@ files:
 - app/assets/stylesheets/koi/base/_input.scss
 - app/assets/stylesheets/koi/base/_link.scss
 - app/assets/stylesheets/koi/base/_list.scss
+- app/assets/stylesheets/koi/base/_tables.scss
 - app/assets/stylesheets/koi/base/_typography.scss
 - app/assets/stylesheets/koi/components/_actions-group.scss
 - app/assets/stylesheets/koi/components/_clipboard.scss
 - app/assets/stylesheets/koi/components/_document-field.scss
 - app/assets/stylesheets/koi/components/_image-field.scss
 - app/assets/stylesheets/koi/components/_index-actions.scss
-- app/assets/stylesheets/koi/components/_index-table.scss
 - app/assets/stylesheets/koi/components/_index.scss
 - app/assets/stylesheets/koi/components/_pagy.scss
 - app/assets/stylesheets/koi/components/_summary-list.scss
-- app/assets/stylesheets/koi/components/index-table/_ordinal.scss
 - app/assets/stylesheets/koi/layouts/_banner.scss
 - app/assets/stylesheets/koi/layouts/_content.scss
 - app/assets/stylesheets/koi/layouts/_flash.scss
@@ -303,6 +303,7 @@ files:
 - app/assets/stylesheets/koi/utils/_hide.scss
 - app/assets/stylesheets/koi/utils/_index.scss
 - app/assets/stylesheets/koi/utils/_typography.scss
+- app/components/concerns/koi/tables/cells.rb
 - app/components/koi/content/editor/errors_component.html.erb
 - app/components/koi/content/editor/errors_component.rb
 - app/components/koi/content/editor/item_form_component.html.erb
@@ -326,7 +327,10 @@ files:
 - app/components/koi/summary_list/text_component.rb
 - app/components/koi/summary_list_component.html.erb
 - app/components/koi/summary_list_component.rb
+- app/components/koi/summary_table_component.rb
+- app/components/koi/table_component.rb
 - app/components/koi/tables/cells/attachment_component.rb
+- app/components/koi/tables/cells/enum_component.rb
 - app/components/koi/tables/cells/link_component.rb
 - app/components/koi/tables/table_component.rb
 - app/controllers/admin/admin_users_controller.rb
@@ -346,6 +350,7 @@ files:
 - app/helpers/koi/date_helper.rb
 - app/helpers/koi/definition_list_helper.rb
 - app/helpers/koi/index_actions_helper.rb
+- app/helpers/koi/pagy.rb
 - app/jobs/koi/application_job.rb
 - app/mailers/koi/application_mailer.rb
 - app/models/admin/credential.rb
@@ -470,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Koi CMS admin framework

data/app/assets/stylesheets/koi/components/_index-table.scss

@@ -1,147 +0,0 @@
-@use "index-table/ordinal" as *;
-
-@mixin sort-icon {
-  display: inline-block;
-  content: " ";
-  position: relative;
-  right: -1rem;
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 13'%3E%3Cpath d='M.541 0l11.125 12.573a.5.5 0 00.749 0L23.541 0h-23z' fill='%23000' fill-rule='evenodd'/%3E%3C/svg%3E");
-  background-size: 14px 14px;
-  height: 14px;
-  width: 14px;
-}
-
-$grey: #f0ecf3 !default;
-
-$table-header-color: transparent !default;
-$row-border-color: $grey !default;
-$row-height: 48px !default;
-$cell-spacing: 0.5rem !default;
-
-$width-small: 6rem !default;
-$width-medium: 12rem !default;
-$width-large: 16rem !default;
-
-.index-table {
-  --row-height: #{$row-height};
-  --cell-spacing: #{$cell-spacing};
-  --table-header-color: #{$table-header-color};
-  --row-border-color: #{$row-border-color};
-
-  --width-small: #{$width-small};
-  --width-medium: #{$width-medium};
-  --width-large: #{$width-large};
-}
-
-.index-table {
-  border: none;
-  table-layout: fixed;
-  border-collapse: collapse;
-  text-align: left;
-  width: 100%;
-
-  thead {
-    background: var(--table-header-color);
-  }
-
-  tr {
-    height: var(--row-height);
-    line-height: var(--row-height);
-  }
-
-  th,
-  td {
-    border: none;
-    box-shadow: inset 0px -1px 0px var(--row-border-color);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: top;
-    white-space: nowrap;
-    background-color: white;
-    padding-right: var(--cell-spacing);
-
-    &:last-child {
-      padding-right: 0;
-    }
-
-    > a {
-      display: block;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      text-decoration: none;
-    }
-
-    > img,
-    > a > img {
-      max-height: 3rem;
-      padding: 0;
-    }
-
-    > .trix-content {
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-
-  th {
-    font-weight: bold;
-  }
-
-  thead th {
-    // types defined first so they can be overridden with width classes
-    &.type-boolean,
-    &.type-number {
-      width: var(--width-small);
-    }
-
-    &.type-date,
-    &.type-currency {
-      width: var(--width-medium);
-    }
-
-    &.type-datetime {
-      width: var(--width-large);
-    }
-
-    &.width-s {
-      width: var(--width-small);
-    }
-
-    &.width-m {
-      width: var(--width-medium);
-    }
-
-    &.width-l {
-      width: var(--width-large);
-    }
-  }
-
-  td {
-    &.type-currency,
-    &.type-number {
-      text-align: right;
-    }
-  }
-
-  thead a.ascending:after,
-  [data-sort="asc"] a::after {
-    @include sort-icon;
-    top: 0;
-    transform: rotate(180deg);
-  }
-
-  thead a.descending:after,
-  [data-sort="desc"] a::after {
-    @include sort-icon;
-    top: 4px;
-  }
-
-  .button_to {
-    line-height: 1.5;
-  }
-
-  caption {
-    margin: 2rem 0;
-  }
-}

data/app/assets/stylesheets/koi/components/index-table/_ordinal.scss

@@ -1,38 +0,0 @@
-$width: 2rem !default;
-$time: 125ms !default;
-
-.index-table {
-  tr {
-    transition:
-      top $time ease-in-out,
-      transform $time ease-in-out;
-  }
-
-  tr[dragging] {
-    transition: transform $time ease-in-out;
-    filter: drop-shadow(0 0 0.5rem var(--row-border-color));
-    transform: scale(1.01);
-    td {
-      box-shadow: none;
-    }
-  }
-
-  th.ordinal {
-    width: $width;
-    padding-left: 0;
-    a {
-      width: $width;
-      height: 3rem;
-    }
-    a::after {
-      right: 0;
-    }
-  }
-
-  td.ordinal {
-    width: $width;
-    padding-left: 0;
-    cursor: grab;
-    text-align: center;
-  }
-}