katalyst-content 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83d4599fc11b8b7b4dec904defe637176d35349af678d4f2329616239563fde
-  data.tar.gz: 66b0f23f5cc84c62f6f99a5f5718c369381a646c819628958017070941efbb91
+  metadata.gz: 8972c901b7463acaafc585438ac770f56a3636d6a82685bc875f20363b831089
+  data.tar.gz: 850d22ee22e8c82158fd655460c8e6eab91c6f03d13542392a18be38756b6543
 SHA512:
-  metadata.gz: f9410bff8a37d6b180a196641112a1013acf37c292d2873ed50a3a1a082e9dd7b1e0b7c8df079fc5a914be7b8a2908487914410ce4db593706230670a5ecf175
-  data.tar.gz: 8d6feaf626296faa82e4b2549426a44ad0cd258071f132d1e004dfb3383eef6bb2cd6bd06aa1d8d65006006388d5678007518b3ef9eecab9000b56ee6b3959a5
+  metadata.gz: 8a11515dafad3e8c39c5fc1734d520612927c91ebdea98eeed913d1fdf4a5cbfbea8ecc993ae60175c068d89c4ac0f917f5918b05bfd5ca1ee2448c3fa734a2c
+  data.tar.gz: 41faa7d49f39de485e3372963ea472fd67e2a85b751d5021320705b3dbddccc6462fb75b78f5a57dfc733e5bc5d892f87cabd853c4ffb1773735d62afeb21ec4

data/app/assets/stylesheets/katalyst/content/editor/_new-items.scss

@@ -1,10 +1,5 @@
 @use "icon" as *;
 
-// provide size for container queries
-#content--editor--item-frame {
-  container-type: inline-size;
-}
-
 .content--editor--new-items {
   display: grid;
   grid-template-columns: repeat(3, calc((100% - 1rem) / 3));

data/app/components/katalyst/content/editor/base_component.rb

@@ -12,8 +12,6 @@ module Katalyst
         STATUS_BAR_CONTROLLER = "content--editor--status-bar"
         NEW_ITEM_CONTROLLER   = "content--editor--new-item"
 
-        TURBO_FRAME = "content--editor--item-frame"
-
         attr_accessor :container, :item
 
         delegate :config, to: ::Katalyst::Content

data/app/components/katalyst/content/editor/item_component.html.erb

@@ -15,7 +15,7 @@
   <div role="toolbar" data-tree-controls>
     <span role="button" value="de-nest" data-action="click-><%= CONTAINER_CONTROLLER %>#deNest" title="Outdent"></span>
     <span role="button" value="nest" data-action="click-><%= CONTAINER_CONTROLLER %>#nest" title="Indent"></span>
-    <%= link_to("", edit_item_link, role: "button", title: "Edit", value: "edit", data: { turbo_frame: TURBO_FRAME }) %>
+    <%= kpop_link_to("", edit_item_link, role: "button", title: "Edit", value: "edit") %>
     <span role="button" value="remove" data-action="click-><%= CONTAINER_CONTROLLER %>#remove" title="Remove"></span>
   </div>
 

data/app/components/katalyst/content/editor/item_component.rb

@@ -4,6 +4,8 @@ module Katalyst
   module Content
     module Editor
       class ItemComponent < BaseComponent
+        include KpopHelper
+
         def edit_item_link
           if item.persisted?
             helpers.katalyst_content.edit_item_path(item)

data/app/components/katalyst/content/editor/item_editor_component.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Katalyst
+  module Content
+    module Editor
+      class ItemEditorComponent < BaseComponent
+        include ::Turbo::FramesHelper
+
+        module Helpers
+          def prefix_partial_path_with_controller_namespace
+            false
+          end
+        end
+
+        def call
+          tag.div(**html_attributes) do
+            helpers.extend(Helpers)
+            helpers.render(item, path:)
+          end
+        end
+
+        def id
+          "item-editor-#{item.id}"
+        end
+
+        def title
+          if item.persisted?
+            "Edit #{item.model_name.human.downcase}"
+          else
+            "New #{item.model_name.human.downcase}"
+          end
+        end
+
+        def path
+          if item.persisted?
+            view_context.katalyst_content.item_path(item)
+          else
+            view_context.katalyst_content.items_path
+          end
+        end
+
+        def default_html_attributes
+          {
+            id:,
+            class: "content--item-editor",
+          }
+        end
+      end
+    end
+  end
+end

data/app/components/katalyst/content/editor/new_item_component.rb

@@ -40,9 +40,8 @@ module Katalyst
             role:      "listitem",
             data:      {
               item_type:,
-              turbo_frame: TURBO_FRAME,
-              controller:  NEW_ITEM_CONTROLLER,
-              action:      ACTIONS,
+              controller: NEW_ITEM_CONTROLLER,
+              action:     ACTIONS,
             },
           }
         end

data/app/components/katalyst/content/editor/new_items_component.html.erb

@@ -1,5 +1,3 @@
-<%= turbo_frame_tag "content--editor--item-frame" do %>
-  <div class="content--editor--new-items" role="listbox">
-    <%= render Katalyst::Content::Editor::NewItemComponent.with_collection(items) %>
-  </div>
-<% end %>
+<div class="content--editor--new-items" role="listbox">
+  <%= render Katalyst::Content::Editor::NewItemComponent.with_collection(items) %>
+</div>

data/app/components/katalyst/content/editor_component.rb

@@ -27,6 +27,10 @@ module Katalyst
         Editor::NewItemsComponent.new(container:)
       end
 
+      def item_editor(item:)
+        Editor::ItemEditorComponent.new(container:, item:)
+      end
+
       def item(item:)
         Editor::ItemComponent.new(container:, item:)
       end

data/app/controllers/katalyst/content/items_controller.rb

@@ -7,23 +7,27 @@ module Katalyst
       before_action :set_item, except: %i[new create]
       before_action :set_editor_variant
 
+      attr_reader :container, :item, :editor
+
       helper EditorHelper
 
+      layout nil
+
       def new
-        render locals: { item: @container.items.build(item_params) }
+        render_editor
       end
 
       def edit
-        render locals: { item: @item }
+        render_editor
       end
 
       def create
-        @item = item = @container.items.build(item_params)
         if item.save
-          editor = Katalyst::Content::EditorComponent.new(container: @item.container, item: @item)
           render :update, locals: { editor:, item:, previous: @container.items.build(type: item.type) }
         else
-          render :new, status: :unprocessable_entity, locals: { item: }
+          store_attachments(item)
+
+          render_editor status: :unprocessable_entity
         end
       end
 
@@ -33,11 +37,12 @@ module Katalyst
         if @item.valid?
           previous = @item
           @item    = @item.dup.tap(&:save!)
-          editor   = Katalyst::Content::EditorComponent.new(container: @item.container, item: @item)
 
-          render locals: { editor:, item: @item, previous: }
+          render locals: { editor:, item:, previous: }
         else
-          render :edit, status: :unprocessable_entity, locals: { item: @item }
+          store_attachments(item)
+
+          render_editor status: :unprocessable_entity
         end
       end
 
@@ -59,15 +64,42 @@ module Katalyst
       def set_container
         @container = Item.new(item_params).container
         raise ActiveRecord::RecordNotFound unless @container
+
+        @item   = @container.items.build(item_params)
+        @editor = Katalyst::Content::EditorComponent.new(container:, item:)
       end
 
       def set_item
-        @item = Item.find(params[:id])
+        @item      = Item.find(params[:id])
+        @container = @item.container
+        @editor = Katalyst::Content::EditorComponent.new(container:, item:)
       end
 
       def set_editor_variant
         request.variant << :form
       end
+
+      def render_editor(**)
+        render(:edit, locals: { item_editor: editor.item_editor(item:) }, **)
+      end
+
+      # Ensure that any attachments are stored before the item is returned to
+      # the editor, so that uploads are not lost if the item is invalid.
+      #
+      # This mimics the behaviour of direct uploads without requiring the JS
+      # integration.
+      def store_attachments(item)
+        item.attachment_changes.each_value do |change|
+          case change
+          when ActiveStorage::Attached::Changes::CreateOne
+            change.upload
+            change.blob.save!
+          when ActiveStorage::Attached::Changes::CreateMany
+            change.upload
+            change.blobs.each(&:save!)
+          end
+        end
+      end
     end
   end
 end

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

@@ -4,6 +4,11 @@
 
   <div class="field">
     <%= form.label :image %>
+    <% if (image = form.object.image).attached? %>
+      <%= image.filename %>
+      <br>
+      <%= form.hidden_field :image, value: form.object.image.signed_id %>
+    <% end %>
     <%= form.file_field :image %>
   </div>
 

data/app/views/katalyst/content/items/edit.html.erb

@@ -1,4 +1,5 @@
-<%= turbo_frame_tag "content--editor--item-frame" do %>
-  <h3 class="heading-three">Edit <%= item.model_name.human.downcase %></h3>
-  <%= render item, path: katalyst_content.item_path(item) %>
+<%= render Kpop::FrameComponent.new do %>
+  <%= render Kpop::ModalComponent.new(title: item_editor.title) do %>
+    <%= render item_editor %>
+  <% end %>
 <% end %>

data/app/views/katalyst/content/items/edit.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%= turbo_stream.replace item_editor.id do %>
+  <%= render item_editor %>
+<% end %>

data/app/views/katalyst/content/items/update.turbo_stream.erb

@@ -1,7 +1,4 @@
-<%= turbo_stream.replace "content--editor--item-frame" do %>
-  <%= render editor.new_items %>
-<% end %>
-
+<%= turbo_stream.kpop.dismiss %>
 <%= turbo_stream.replace dom_id(previous) do %>
   <%= render editor.item(item:) %>
 <% end %>

data/lib/katalyst/content.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "active_support"
+require "katalyst/html_attributes"
+require "katalyst/kpop"
+
 require "katalyst/content/config"
 require "katalyst/content/engine"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-content
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Katalyst Interactive
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2023-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_storage_validations
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: katalyst-kpop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,7 @@ files:
 - app/components/katalyst/content/editor/errors_component.rb
 - app/components/katalyst/content/editor/item_component.html.erb
 - app/components/katalyst/content/editor/item_component.rb
+- app/components/katalyst/content/editor/item_editor_component.rb
 - app/components/katalyst/content/editor/new_item_component.html.erb
 - app/components/katalyst/content/editor/new_item_component.rb
 - app/components/katalyst/content/editor/new_items_component.html.erb
@@ -136,7 +151,7 @@ files:
 - app/views/katalyst/content/items/_item.html+form.erb
 - app/views/katalyst/content/items/_item.html.erb
 - app/views/katalyst/content/items/edit.html.erb
-- app/views/katalyst/content/items/new.html.erb
+- app/views/katalyst/content/items/edit.turbo_stream.erb
 - app/views/katalyst/content/items/update.turbo_stream.erb
 - app/views/katalyst/content/sections/_section.html+form.erb
 - app/views/katalyst/content/sections/_section.html.erb
@@ -171,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Rich content page builder and editor

data/app/views/katalyst/content/items/new.html.erb

@@ -1,4 +0,0 @@
-<%= turbo_frame_tag "content--editor--item-frame" do %>
-  <h3 class="heading-three">New <%= item.model_name.human.downcase %></h3>
-  <%= render item, path: katalyst_content.items_path %>
-<% end %>