RubyGems - katalyst-koi - Versions diffs - 5.0.0.alpha.2 → 5.0.0.beta.1 - Mend

katalyst-koi 5.0.0.alpha.2 → 5.0.0.beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

data/app/models/concerns/koi/model/archivable.rb CHANGED Viewed

@@ -24,11 +24,11 @@ module Koi
         default_scope { not_archived }
-        alias_method :archived?, :archived
+        alias_method :archived, :archived?
       end
-      # Returns true iff the record has been archived.
-      def archived
+      # @return true if the record has been archived.
+      def archived?
         archived_at.present?
       end

data/app/views/layouts/koi/application.html.erb CHANGED Viewed

@@ -21,7 +21,7 @@
   <%= stylesheet_link_tag Koi.config.admin_stylesheet, "data-turbo-track": "reload" %>
   <!-- SCRIPTS -->
-  <%= javascript_importmap_tags "koi/admin" %>
+  <%= javascript_importmap_tags Koi.config.admin_javascript_entry_point %>
 </head>
 <body data-controller="keyboard"
       data-action="keyup->keyboard#event"

data/config/importmap.rb CHANGED Viewed

@@ -4,8 +4,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 "@katalyst/koi", to: "katalyst/koi.min.js"
 pin "@rails/actiontext", to: "actiontext.js", preload: true
 pin "trix"
-pin_all_from Koi::Engine.root.join("app/assets/javascripts/koi"),
-             under: "koi", preload: Rails.env.test?

data/lib/generators/koi/helpers/attribute_helpers.rb CHANGED Viewed

@@ -8,6 +8,17 @@ module Koi
   module Helpers
     module AttributeHelpers
       extend ActiveSupport::Concern
+      included do
+        private
+        def parse_attributes!
+          if attributes.none? && model_class && model_class < ActiveRecord::Base
+            load_attributes!
+          else
+            super
+          end
+        end
+      end
       class IntrospectedAttribute < Rails::Generators::GeneratedAttribute
         attr_reader :association, :attachment, :enum
@@ -33,12 +44,6 @@ module Koi
         end
       end
-      def initialize(args, *options)
-        super
-        load_attributes! if attributes.empty?
-      end
       def govuk_input_for(attribute)
         AttributeTypes.for(attribute).govuk_input
       end
@@ -80,8 +85,6 @@ module Koi
       end
       def load_attributes!
-        return unless model_class && model_class < ActiveRecord::Base
         load_basic_attributes!
         load_attachment_attributes!
         load_rich_text_attributes!

data/lib/generators/koi/helpers/resource_helpers.rb CHANGED Viewed

@@ -17,9 +17,17 @@ module Koi
           @controller_class_path = ["admin", *@controller_class_path]
         end
+        def controller_class_path
+          if options[:model_name] || @controller_class_path
+            @controller_class_path
+          else
+            class_path
+          end
+        end
         def class_name
           candidate = (class_path + [file_name]).map!(&:camelize).join("::")
-          if class_path_overlap.any?
+          if @controller_class_path && class_path_overlap.any?
             "::#{candidate}"
           else
             candidate

data/lib/koi/config.rb CHANGED Viewed

@@ -15,6 +15,8 @@ module Koi
     config_accessor(:admin_stylesheet) { "admin" }
+    config_accessor(:admin_javascript_entry_point) { "@katalyst/koi" }
     config_accessor(:document_mime_types) do
       %w[image/png image/gif image/jpeg image/webp application/pdf audio/*].freeze
     end

data/lib/koi/engine.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 require "importmap-rails"
 require "katalyst/content"
-require "katalyst/govuk/formbuilder"
+require "katalyst-govuk-formbuilder"
 require "katalyst/navigation"
 require "katalyst/tables"
 require "pagy"
@@ -15,6 +15,7 @@ require "webauthn"
 module Koi
   class Engine < ::Rails::Engine
     engine_name "koi"
+    isolate_namespace Koi
     config.eager_load_namespaces << Koi
     config.paths.add("lib", autoload_once: true, exclude: %w[lib/generators lib/tasks])
@@ -24,10 +25,16 @@ module Koi
       g.factory_bot dir: "spec/factories"
     end
+    initializer "koi.autoload", before: :setup_once_autoloader do
+      %w[lib/katalyst-koi.rb lib/generators lib/tasks].each do |path|
+        Rails.autoloaders.once.ignore File.expand_path(root.join(path))
+      end
+    end
     initializer "koi.assets" do |app|
       app.config.after_initialize do |_|
         if app.config.respond_to?(:assets)
-          app.config.assets.precompile += %w(koi.js)
+          app.config.assets.precompile += %w(katalyst/koi.js)
         end
       end
     end
@@ -41,13 +48,9 @@ module Koi
       FactoryBot.definition_file_paths << root.join("spec/factories") if defined?(FactoryBot)
     end
-    initializer "koi.forms" do
-      GOVUKDesignSystemFormBuilder::Builder.include(Koi::Form::GOVUKExtensions)
-    end
     initializer "koi.importmap", before: "importmap" do |app|
       app.config.importmap.paths << root.join("config/importmap.rb")
-      app.config.importmap.cache_sweepers << root.join("app/assets/javascripts")
+      app.config.importmap.cache_sweepers << root.join("app/assets/builds")
     end
     initializer "koi.middleware" do |app|

data/lib/koi/form_builder.rb CHANGED Viewed

@@ -4,6 +4,5 @@ module Koi
   class FormBuilder < ActionView::Helpers::FormBuilder
     include GOVUKDesignSystemFormBuilder::Builder
     include Koi::Form::Builder
-    include Koi::Form::Content
   end
 end

data/lib/koi.rb CHANGED Viewed

@@ -1,13 +1,6 @@
 # frozen_string_literal: true
-require "active_support"
-require "active_support/rails"
 module Koi
-  extend ActiveSupport::Autoload
-  autoload :Config
   extend self
   def config

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-koi
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha.2
+  version: 5.0.0.beta.1
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -228,6 +228,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/config/koi.js
 - app/assets/images/koi/application/chevron-right.svg
 - app/assets/images/koi/application/glyphicons-halflings-white.png
@@ -260,28 +264,6 @@ files:
 - app/assets/images/koi/icons/add.svg
 - app/assets/images/koi/icons/close.svg
 - app/assets/images/koi/koi.png
-- app/assets/javascripts/koi/admin.js
-- app/assets/javascripts/koi/controllers/application.js
-- app/assets/javascripts/koi/controllers/clipboard_controller.js
-- app/assets/javascripts/koi/controllers/document_field_controller.js
-- app/assets/javascripts/koi/controllers/file_field_controller.js
-- app/assets/javascripts/koi/controllers/flash_controller.js
-- app/assets/javascripts/koi/controllers/form_request_submit_controller.js
-- app/assets/javascripts/koi/controllers/image_field_controller.js
-- app/assets/javascripts/koi/controllers/index.js
-- app/assets/javascripts/koi/controllers/index_actions_controller.js
-- app/assets/javascripts/koi/controllers/keyboard_controller.js
-- app/assets/javascripts/koi/controllers/koi/modal_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
-- app/assets/javascripts/koi/controllers/webauthn_registration_controller.js
-- app/assets/javascripts/koi/elements/index.js
-- app/assets/javascripts/koi/elements/toolbar.js
-- app/assets/javascripts/koi/utils/transition.js
 - app/assets/stylesheets/koi/blocks/actions.css
 - app/assets/stylesheets/koi/blocks/application-header.css
 - app/assets/stylesheets/koi/blocks/application-navigation.css
@@ -307,6 +289,7 @@ files:
 - app/assets/stylesheets/koi/compositions/wrapper.css
 - app/assets/stylesheets/koi/forms/caption.css
 - app/assets/stylesheets/koi/forms/checkboxes.css
+- app/assets/stylesheets/koi/forms/combobox.css
 - app/assets/stylesheets/koi/forms/date-input.css
 - app/assets/stylesheets/koi/forms/document-field.css
 - app/assets/stylesheets/koi/forms/errors.css
@@ -343,6 +326,7 @@ files:
 - app/components/koi/header_component.rb
 - app/components/koi/navigation/editor/errors_component.html.erb
 - app/components/koi/navigation/editor/errors_component.rb
+- app/components/koi/pagy_nav_component.rb
 - app/components/koi/summary_table_component.rb
 - app/components/koi/table_component.rb
 - app/components/koi/table_query_component.rb
@@ -370,8 +354,26 @@ files:
 - app/helpers/koi/index_actions_helper.rb
 - app/helpers/koi/modal_helper.rb
 - app/helpers/koi/pagy.rb
+- app/javascript/koi/application.js
+- app/javascript/koi/controllers/application.js
+- app/javascript/koi/controllers/clipboard_controller.js
+- app/javascript/koi/controllers/flash_controller.js
+- app/javascript/koi/controllers/form_request_submit_controller.js
+- app/javascript/koi/controllers/index.js
+- app/javascript/koi/controllers/index_actions_controller.js
+- app/javascript/koi/controllers/keyboard_controller.js
+- app/javascript/koi/controllers/modal_controller.js
+- app/javascript/koi/controllers/navigation_controller.js
+- app/javascript/koi/controllers/navigation_toggle_controller.js
+- app/javascript/koi/controllers/pagy_nav_controller.js
+- app/javascript/koi/controllers/show_hide_controller.js
+- app/javascript/koi/controllers/sluggable_controller.js
+- app/javascript/koi/controllers/webauthn_authentication_controller.js
+- app/javascript/koi/controllers/webauthn_registration_controller.js
+- app/javascript/koi/elements/index.js
+- app/javascript/koi/elements/toolbar.js
+- app/javascript/koi/utils/transition.js
 - app/jobs/koi/application_job.rb
-- app/mailers/koi/application_mailer.rb
 - app/models/admin/collection.rb
 - app/models/admin/credential.rb
 - app/models/admin/user.rb
@@ -417,14 +419,6 @@ files:
 - app/views/admin/well_knowns/index.html.erb
 - app/views/admin/well_knowns/new.html.erb
 - app/views/admin/well_knowns/show.html.erb
-- app/views/katalyst/content/asides/_aside.html+form.erb
-- app/views/katalyst/content/columns/_column.html+form.erb
-- app/views/katalyst/content/contents/_content.html+form.erb
-- app/views/katalyst/content/figures/_figure.html+form.erb
-- app/views/katalyst/content/groups/_group.html+form.erb
-- app/views/katalyst/content/items/_item.html+form.erb
-- app/views/katalyst/content/sections/_section.html+form.erb
-- app/views/katalyst/content/tables/_table.html+form.erb
 - app/views/katalyst/navigation/items/_button.html.erb
 - app/views/katalyst/navigation/items/_heading.html.erb
 - app/views/katalyst/navigation/items/_link.html.erb
@@ -478,7 +472,7 @@ files:
 - lib/generators/koi/helpers/attribute_types.rb
 - lib/generators/koi/helpers/resource_helpers.rb
 - lib/generators/koi/model/model_generator.rb
-- lib/katalyst/koi.rb
+- lib/katalyst-koi.rb
 - lib/koi.rb
 - lib/koi/caching.rb
 - lib/koi/config.rb
@@ -486,10 +480,6 @@ files:
 - lib/koi/extensions/object_rendering.rb
 - lib/koi/form/builder.rb
 - lib/koi/form/content.rb
-- lib/koi/form/elements/document.rb
-- lib/koi/form/elements/file_element.rb
-- lib/koi/form/elements/image.rb
-- lib/koi/form/govuk_extensions.rb
 - lib/koi/form_builder.rb
 - lib/koi/menu.rb
 - lib/koi/menu/builder.rb

data/app/assets/javascripts/koi/controllers/document_field_controller.js DELETED Viewed

@@ -1,26 +0,0 @@
-import FileFieldController from "koi/controllers/file_field_controller";
-export default class DocumentFieldController extends FileFieldController {
-  connect() {
-    this.initialPreviewContent = this.filenameTag.text;
-  }
-  setPreviewContent(content) {
-    this.filenameTag.innerText = content;
-  }
-  showPreview(file) {
-    const reader = new FileReader();
-    reader.onload = (e) => {
-      if (this.filenameTag) {
-        this.filenameTag.innerText = file.name;
-      }
-    };
-    reader.readAsDataURL(file);
-  }
-  get filenameTag() {
-    return this.previewTarget.querySelector("p.preview-filename");
-  }
-}

data/app/assets/javascripts/koi/controllers/file_field_controller.js DELETED Viewed

@@ -1,152 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-export default class FileFieldController extends Controller {
-  static targets = ["preview", "destroy"];
-  static values = {
-    mimeTypes: Array,
-  };
-  connect() {
-    this.counter = 0;
-    this.initialPreviewContent = null;
-    this.onUploadFlag = false;
-  }
-  onUpload(event) {
-    this.onUploadFlag = true;
-    // Set the file to be destroyed only if it is already persisted
-    if (this.hasDestroyTarget) {
-      this.destroyTarget.value = false;
-    }
-    this.previewTarget.removeAttribute("hidden");
-    // Show preview only if a file has been selected in the file picker popup. If cancelled, show previous file or do
-    // not show preview at all
-    if (this.hasPreviewTarget) {
-      if (event.currentTarget.files.length > 0) {
-        this.showPreview(event.currentTarget.files[0]);
-      } else {
-        this.setPreviewContent(this.initialPreviewContent);
-      }
-    }
-  }
-  setDestroy(event) {
-    event.preventDefault();
-    // If the data is already persisted and another image has been picked from the file picker popup, but the new image
-    // is removed, show the original image
-    if (this.initialPreviewContent && this.onUploadFlag) {
-      this.onUploadFlag = false;
-      this.setPreviewContent(this.initialPreviewContent);
-    } else {
-      // Set image to be destroyed, hide preview and remove image url
-      if (this.hasDestroyTarget) {
-        this.destroyTarget.value = true;
-      }
-      if (this.hasPreviewTarget) {
-        this.previewTarget.setAttribute("hidden", "");
-        this.setPreviewContent("");
-      }
-      if (this.previousInput) {
-        this.previousInput.toggleAttribute("disabled", true);
-      }
-    }
-    this.fileInput.value = "";
-  }
-  setPreviewContent(content) {
-    if (this.filenameTag) {
-      this.filenameTag.innerText = text;
-    }
-  }
-  drop(event) {
-    event.preventDefault();
-    const file = this.fileForEvent(event, this.mimeTypesValue);
-    if (file) {
-      const dT = new DataTransfer();
-      dT.items.add(file);
-      this.fileInput.files = dT.files;
-      this.fileInput.dispatchEvent(new Event("change"));
-    }
-    this.counter = 0;
-    this.element.classList.remove("droppable");
-  }
-  dragover(event) {
-    event.preventDefault();
-  }
-  dragenter(event) {
-    event.preventDefault();
-    if (this.counter === 0) {
-      this.element.classList.add("droppable");
-    }
-    this.counter++;
-  }
-  dragleave(event) {
-    event.preventDefault();
-    this.counter--;
-    if (this.counter === 0) {
-      this.element.classList.remove("droppable");
-    }
-  }
-  get fileInput() {
-    return this.element.querySelector("input[type='file']");
-  }
-  get previousInput() {
-    return this.element.querySelector(
-      `input[type='hidden'][name='${this.fileInput.name}']`,
-    );
-  }
-  get filenameTag() {
-    if (!this.hasPreviewTarget) return null;
-    return this.previewTarget.querySelector("p.preview-filename");
-  }
-  showPreview(file) {
-    const reader = new FileReader();
-    reader.onload = (e) => {
-      if (this.filenameTag) {
-        this.filenameTag.innerText = file.name;
-      }
-    };
-    reader.readAsDataURL(file);
-  }
-  /**
-   * Given a drop event, find the first acceptable file.
-   * @param event {DropEvent}
-   * @param mimeTypes {String[]}
-   * @returns {File}
-   */
-  fileForEvent(event, mimeTypes) {
-    const accept = (file) => mimeTypes.indexOf(file.type) > -1;
-    let file;
-    if (event.dataTransfer.items) {
-      const item = [...event.dataTransfer.items].find(accept);
-      if (item) {
-        file = item.getAsFile();
-      }
-    } else {
-      file = [...event.dataTransfer.files].find(accept);
-    }
-    return file;
-  }
-}

data/app/assets/javascripts/koi/controllers/image_field_controller.js DELETED Viewed

@@ -1,24 +0,0 @@
-import FileFieldController from "koi/controllers/file_field_controller";
-export default class ImageFieldController extends FileFieldController {
-  connect() {
-    this.initialPreviewContent = this.imageTag.getAttribute("src");
-  }
-  setPreviewContent(content) {
-    this.imageTag.src = content;
-  }
-  showPreview(file) {
-    const reader = new FileReader();
-    reader.onload = (e) => {
-      this.imageTag.src = e.target.result;
-    };
-    reader.readAsDataURL(file);
-  }
-  get imageTag() {
-    return this.previewTarget.querySelector("img");
-  }
-}

data/app/assets/javascripts/koi/controllers/index.js DELETED Viewed

@@ -1,15 +0,0 @@
-import { application } from "koi/controllers/application";
-import content from "@katalyst/content";
-application.load(content);
-import navigation from "@katalyst/navigation";
-application.load(navigation);
-import tables from "@katalyst/tables";
-application.load(tables);
-// Eager load all controllers defined in the import map under controllers/**/*_controller
-import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading";
-eagerLoadControllersFrom("controllers", application);
-eagerLoadControllersFrom("koi/controllers", application);

data/app/assets/javascripts/koi/elements/index.js DELETED Viewed

	@@ -1 +0,0 @@
1	- import "koi/elements/toolbar";

data/app/mailers/koi/application_mailer.rb DELETED Viewed

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-module Koi
-  class ApplicationMailer < ActionMailer::Base
-    default from: "support@katalyst.com.au"
-    layout "mailer"
-  end
-end

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

@@ -1,6 +0,0 @@
-<%# 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 DELETED Viewed

@@ -1,5 +0,0 @@
-<%# 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 DELETED Viewed

@@ -1,8 +0,0 @@
-<%# 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 DELETED Viewed

@@ -1,9 +0,0 @@
-<%# 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 DELETED Viewed

@@ -1,5 +0,0 @@
-<%# 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 DELETED Viewed

@@ -1,5 +0,0 @@
-<%# 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 DELETED Viewed

@@ -1,5 +0,0 @@
-<%# 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 DELETED Viewed

@@ -1,36 +0,0 @@
-<%# 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" }) %>
-  <%# 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",
-                  hidden:     "",
-                  formaction: table.persisted? ? katalyst_content.table_path : katalyst_content.tables_path,
-                  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" }) %>
-</div>
-<%= form.content_theme_field %>
-<%= form.content_visible_field %>