katalyst-koi 4.18.0 → 4.19.0

data/app/assets/javascripts/koi/controllers/webauthn_authentication_controller.js

@@ -1,23 +1,24 @@
 import { Controller } from "@hotwired/stimulus";
 
-import {
-  get,
-  parseRequestOptionsFromJSON,
-} from "@github/webauthn-json/browser-ponyfill";
-
 export default class WebauthnAuthenticationController extends Controller {
   static targets = ["response"];
-  static values = { options: Object };
+  static values = {
+    options: Object,
+  };
+
+  async authenticate() {
+    const credential = await navigator.credentials.get(this.options);
 
-  authenticate() {
-    get(this.options).then((response) => {
-      this.responseTarget.value = JSON.stringify(response);
+    this.responseTarget.value = JSON.stringify(credential.toJSON());
 
-      this.element.requestSubmit();
-    });
+    this.element.requestSubmit();
   }
 
   get options() {
-    return parseRequestOptionsFromJSON(this.optionsValue);
+    return {
+      publicKey: PublicKeyCredential.parseRequestOptionsFromJSON(
+        this.optionsValue.publicKey,
+      ),
+    };
   }
 }

data/app/assets/javascripts/koi/controllers/webauthn_registration_controller.js

@@ -1,29 +1,27 @@
 import { Controller } from "@hotwired/stimulus";
 
-import {
-  create,
-  parseCreationOptionsFromJSON,
-} from "@github/webauthn-json/browser-ponyfill";
-
 export default class WebauthnRegistrationController extends Controller {
   static values = {
     options: Object,
-    response: String,
+    response: Object,
   };
   static targets = ["intro", "nickname", "response"];
 
   submit(e) {
-    if (this.responseTarget.value === "") {
+    if (
+      this.responseTarget.value === "" &&
+      e.submitter.formMethod !== "dialog"
+    ) {
       e.preventDefault();
-      this.createCredential();
+      this.createCredential().then();
     }
   }
 
   async createCredential() {
-    const response = await create(this.options);
+    const credential = await navigator.credentials.create(this.options);
 
-    this.responseValue = JSON.stringify(response);
-    this.responseTarget.value = JSON.stringify(response);
+    this.responseValue = credential.toJSON();
+    this.responseTarget.value = JSON.stringify(credential.toJSON());
   }
 
   responseValueChanged(response) {
@@ -33,6 +31,10 @@ export default class WebauthnRegistrationController extends Controller {
   }
 
   get options() {
-    return parseCreationOptionsFromJSON(this.optionsValue);
+    return {
+      publicKey: PublicKeyCredential.parseCreationOptionsFromJSON(
+        this.optionsValue.publicKey,
+      ),
+    };
   }
 }

data/app/assets/stylesheets/koi/components/_pagy.scss

@@ -1,6 +1,7 @@
 @use "../base/button" as *;
 
-.pagy.nav a {
+.pagy.nav a,
+.pagy.series-nav a {
   @include button-text;
   border: 2px solid transparent;
 

data/app/assets/stylesheets/koi/themes/_govuk.scss

@@ -2,7 +2,6 @@
 
 @use "katalyst/govuk/formbuilder" with (
   $govuk-font-family: "Inter",
-  $govuk-text-colour: #{var(--site-text-color)},
   $govuk-typography-scale: (
     80: govuk-definition(h1),
     48: govuk-definition(h2),
@@ -12,10 +11,14 @@
     19: govuk-definition(h6),
     16: govuk-definition(paragraph),
     14: govuk-definition(small),
-  ),
-  $govuk-input-border-colour: #{var(--site-text-color)}
+  )
 );
 
+:root {
+  --govuk-text-colour: var(--site-text-color);
+  --govuk-input-border-colour: var(--site-text-color);
+}
+
 .govuk-input,
 .govuk-textarea {
   color: var(--site-text-color);

data/app/components/koi/header/edit_component.rb

@@ -8,7 +8,7 @@ module Koi
       delegate :with_breadcrumb, :with_action, to: :@header
 
       def initialize(resource:, title: nil)
-        super
+        super()
 
         @resource = resource
         @title = title

data/app/components/koi/header/index_component.rb

@@ -8,7 +8,7 @@ module Koi
       delegate :with_breadcrumb, :with_action, to: :@header
 
       def initialize(model:, title: model.model_name.human.pluralize)
-        super
+        super()
 
         @header = HeaderComponent.new(title:)
         @model  = model

data/app/components/koi/header/new_component.rb

@@ -8,7 +8,7 @@ module Koi
       delegate :with_breadcrumb, :with_action, to: :@header
 
       def initialize(model:, title: nil)
-        super
+        super()
 
         @model  = model
         @title  = title

data/app/components/koi/header/show_component.rb

@@ -8,7 +8,7 @@ module Koi
       delegate :with_breadcrumb, :with_action, to: :@header
 
       def initialize(resource:, title: nil)
-        super
+        super()
 
         @title    = title
         @resource = resource

data/app/components/koi/header_component.rb

@@ -6,14 +6,14 @@ module Koi
     renders_many :breadcrumbs, "LinkComponent"
 
     def initialize(title:)
-      super
+      super()
 
       @title = title
     end
 
     class LinkComponent < ViewComponent::Base
       def initialize(name, path, **options)
-        super
+        super()
 
         @name    = name
         @path    = path

data/app/components/koi/summary_list_component.rb

@@ -17,8 +17,8 @@ module Koi
       item:       SummaryList::ItemComponent,
     }
 
-    def initialize(model: nil, skip_blank: true, **attributes)
-      super(**attributes)
+    def initialize(model: nil, skip_blank: true, **)
+      super(**)
 
       @model      = model
       @skip_blank = skip_blank

data/app/controllers/admin/admin_users_controller.rb

@@ -53,13 +53,13 @@ module Admin
     def archive
       Admin::User.where(id: params[:id]).where.not(id: current_admin.id).each(&:archive!)
 
-      redirect_back(fallback_location: admin_admin_users_path, status: :see_other)
+      redirect_back_or_to(admin_admin_users_path, status: :see_other)
     end
 
     def restore
       Admin::User.archived.where(id: params[:id]).each(&:restore!)
 
-      redirect_back(fallback_location: admin_admin_users_path, status: :see_other)
+      redirect_back_or_to(admin_admin_users_path, status: :see_other)
     end
 
     def destroy

data/app/controllers/admin/caches_controller.rb

@@ -5,7 +5,7 @@ module Admin
     def destroy
       Rails.logger.warn("[CACHE CLEAR] - Cleaning entire cache manually by #{current_admin} request")
       Rails.cache.clear
-      redirect_back(fallback_location: admin_dashboard_path)
+      redirect_back_or_to(admin_dashboard_path)
     end
   end
 end

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

@@ -15,7 +15,15 @@ module Koi
         include HasAdminUsers
         include HasAttachments
         include Katalyst::Tables::Backend
-        include ::Pagy::Backend
+
+        if (pagy = "Pagy::Method".safe_constantize)
+          include pagy
+        elsif (pagy = "Pagy::Backend".safe_constantize)
+          # @deprecated Pagy <43
+          include pagy
+
+          helper "::Pagy::Frontend".safe_constantize
+        end
 
         default_form_builder "Koi::FormBuilder"
         default_table_component Koi::TableComponent
@@ -25,7 +33,6 @@ module Koi
         helper Katalyst::GOVUK::Formbuilder::Frontend
         helper Katalyst::Navigation::FrontendHelper
         helper Katalyst::Tables::Frontend
-        helper ::Pagy::Frontend
         helper Koi::Pagy::Frontend
         helper IndexActionsHelper
         helper :all

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Koi
+  module Controller
+    extend ActiveSupport::Concern
+
+    included do
+      include Koi::Controller::IsAdminController
+
+      authenticate_local_admins Rails.env.development?
+
+      helper Koi::ApplicationHelper
+      helper Koi::DefinitionListHelper
+    end
+  end
+end

data/config/importmap.rb

@@ -3,7 +3,6 @@
 pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
 pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
 pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
-pin "@github/webauthn-json/browser-ponyfill", to: "https://ga.jspm.io/npm:@github/webauthn-json@2.1.1/dist/esm/webauthn-json.browser-ponyfill.js"
 pin "@rails/actiontext", to: "actiontext.js", preload: true
 pin "trix"
 

data/config/initializers/dartsass.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Koi.config.admin_stylesheet = "admin"
+
+Rails.application.config.dartsass.builds = {
+  "application.scss" => "application.css",
+  "admin.scss"       => "admin.css",
+}
+
+Rails.application.config.dartsass.build_options << "--quiet-deps"

data/config/locales/pagy/en.yml

@@ -0,0 +1,24 @@
+en:
+  pagy:
+    p11n: 'OneOther'
+    aria_label:
+      nav:
+        one: "Pagination"
+        other: "Pagination"
+      prev: "Previous page"
+      previous: "Previous page" # @deprecated
+      next: "Next page"
+    prev: "←  Previous" # @deprecated
+    previous: "←  Previous"
+    next: "Next  →"
+    gap: "…"
+    item_name:
+      one: "item"
+      other: "items"
+    info_tag:
+      no_count: "Page %{page} of %{pages}"
+      no_items: "No %{item_name} found"
+      single_page: "Displaying %{count} %{item_name}"
+      multiple_pages: "Displaying %{item_name} %{from}-%{to} of %{count} in total"
+    input_nav_js: "Page %{page_input} of %{pages}"
+    limit_tag_js: "Show %{limit_input} %{item_name} per page"

data/lib/koi/engine.rb

@@ -71,7 +71,12 @@ module Koi
     end
 
     initializer "koi.pagination" do
-      Pagy::I18n.load(locale: "en", filepath: root.join("config/locales/pagy.en.yml"))
+      if Pagy::I18n.respond_to?(:pathnames)
+        Pagy::I18n.pathnames << root.join("config/locales/pagy")
+      else
+        # @deprecated support for Pagy <43
+        Pagy::I18n.load(locale: "en", filepath: root.join("config/locales/pagy/en.yml"))
+      end
     end
 
     initializer "koi.views" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 4.18.0
+  version: 4.19.0
 platform: ruby
 authors:
 - Katalyst Interactive
 bindir: bin
 cert_chain: []
-date: 2025-04-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,16 +195,16 @@ dependencies:
   name: katalyst-kpop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: katalyst-navigation
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,10 @@ files:
 - MIT-LICENSE
 - README.md
 - Upgrade.md
+- app/assets/builds/katalyst/koi.esm.js
+- app/assets/builds/katalyst/koi.js
+- app/assets/builds/katalyst/koi.min.js
+- app/assets/builds/katalyst/koi.min.js.map
 - app/assets/builds/koi/admin.css
 - app/assets/config/koi.js
 - app/assets/images/koi/application/chevron-right.svg
@@ -374,6 +378,7 @@ files:
 - app/controllers/admin/tokens_controller.rb
 - app/controllers/admin/url_rewrites_controller.rb
 - app/controllers/admin/well_knowns_controller.rb
+- app/controllers/concerns/koi/controller.rb
 - app/controllers/concerns/koi/controller/has_admin_users.rb
 - app/controllers/concerns/koi/controller/has_attachments.rb
 - app/controllers/concerns/koi/controller/has_webauthn.rb
@@ -457,11 +462,12 @@ files:
 - app/views/layouts/koi/frame.html.erb
 - app/views/layouts/koi/login.html.erb
 - config/importmap.rb
+- config/initializers/dartsass.rb
 - config/initializers/extensions.rb
 - config/initializers/flipper.rb
 - config/initializers/inflections.rb
 - config/locales/koi.en.yml
-- config/locales/pagy.en.yml
+- config/locales/pagy/en.yml
 - config/routes.rb
 - db/migrate/20120220130849_devise_create_admins.rb
 - db/migrate/20130509235316_add_url_rewriter.rb
@@ -531,7 +537,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Koi CMS admin framework
 test_files: []

data/config/locales/pagy.en.yml

@@ -1,11 +0,0 @@
-en:
-  pagy:
-    aria_label:
-      nav:
-        one: "Pagination"
-        other: "Pagination"
-      prev: "Previous page"
-      next: "Next page"
-    prev: "←  Previous"
-    next: "Next  →"
-    gap: "…"