plum-cms 0.1.2 → 0.2.1

data/app/services/plum/site_archive.rb

@@ -0,0 +1,367 @@
+require "json"
+require "zip"
+require "digest"
+require "tempfile"
+
+module Plum
+  module SiteArchive
+    FORMAT = "plum-site"
+    VERSION = 1
+
+    class Error < StandardError; end
+    class InvalidArchive < Error; end
+
+    module_function
+
+    def dump(site:, path:)
+      Exporter.new(site).write(path)
+    end
+
+    def load(path:, name: nil, domain: nil)
+      Importer.new(path).import(name: name, domain: domain)
+    end
+
+    class Exporter
+      def initialize(site)
+        @site = site
+      end
+
+      def write(path)
+        destination = Pathname(path).expand_path
+        destination.dirname.mkpath
+        FileUtils.rm_f(destination)
+
+        Zip::File.open(destination, create: true) do |zip|
+          zip.get_output_stream("manifest.json") { |stream| stream.write(JSON.pretty_generate(manifest)) }
+          site.assets.with_attached_file.find_each do |asset|
+            next unless asset.file.attached?
+
+            zip.get_output_stream(asset_path(asset)) do |stream|
+              asset.file.blob.open { |file| IO.copy_stream(file, stream) }
+            end
+          end
+        end
+        destination
+      end
+
+      private
+
+      attr_reader :site
+
+      def manifest
+        {
+          "format" => FORMAT,
+          "format_version" => VERSION,
+          "plum_version" => Plum::VERSION,
+          "exported_at" => Time.current.iso8601,
+          "site" => record(site, %w[id name domain theme_name settings theme_settings custom_css]),
+          "site_setting" => site.site_setting && record(site.site_setting, site_setting_fields),
+          "content_types" => records(site.content_types, %w[id name handle singleton blueprint icon]),
+          "fieldsets" => records(site.fieldsets, %w[id name handle fields]),
+          "taxonomies" => records(site.taxonomies, %w[id name handle slug]),
+          "terms" => records(site.terms, %w[id taxonomy_id name slug position]),
+          "assets" => site.assets.with_attached_file.order(:id).map { |asset| asset_record(asset) },
+          "entries" => site.entries.order(:id).map { |entry| entry_record(entry) },
+          "entry_revisions" => revision_records,
+          "globals" => records(site.globals, %w[id name handle data]),
+          "nav_menus" => records(site.nav_menus, %w[id name handle]),
+          "nav_items" => records(site.nav_items.unscoped.where(site: site), %w[id nav_menu_id parent_id entry_id label url position]),
+          "form_definitions" => records(site.form_definitions, %w[id name handle fields notification_email]),
+          "form_submissions" => records(site.form_submissions, %w[id form_definition_id data created_at updated_at])
+        }.compact
+      end
+
+      def site_setting_fields
+        %w[name tagline logo favicon seo_title seo_description theme_name primary_color support_email]
+      end
+
+      def entry_record(entry)
+        record(entry, %w[id content_type_id title slug status data published_at author_name author_email author_gid locale origin_id]).merge(
+          "term_ids" => entry.term_ids
+        )
+      end
+
+      def revision_records
+        site.entries.includes(:revisions).flat_map do |entry|
+          entry.revisions.order(:id).map do |revision|
+            record(revision, %w[id entry_id editor_name editor_email editor_gid snapshot created_at updated_at])
+          end
+        end
+      end
+
+      def asset_record(asset)
+        record(asset, %w[id alt_text caption folder focal_x focal_y]).merge(
+          "filename" => asset.filename,
+          "content_type" => asset.content_type,
+          "byte_size" => asset.file.byte_size,
+          "checksum" => asset.file.blob.checksum,
+          "path" => asset_path(asset)
+        )
+      end
+
+      def asset_path(asset)
+        "assets/#{asset.id}/#{asset.filename.gsub(/[^A-Za-z0-9._-]/, "_")}"
+      end
+
+      def records(scope, fields)
+        scope.order(:id).map { |item| record(item, fields) }
+      end
+
+      def record(item, fields)
+        item.attributes.slice(*fields)
+      end
+    end
+
+    class Importer
+      def initialize(path)
+        @path = Pathname(path).expand_path
+        @maps = Hash.new { |hash, key| hash[key] = {} }
+        @uploaded_blobs = []
+      end
+
+      def import(name: nil, domain: nil)
+        raise InvalidArchive, "Archive does not exist: #{path}" unless path.file?
+
+        Zip::File.open(path) do |zip|
+          @zip = zip
+          @data = parse_manifest(zip)
+          validate_manifest!
+          ActiveRecord::Base.transaction { import_site(name:, domain:) }
+        end
+      rescue StandardError => error
+        cleanup_uploaded_files
+        raise unless error.is_a?(Zip::Error) || error.is_a?(JSON::ParserError)
+
+        raise InvalidArchive, error.message
+      ensure
+        @zip = nil
+      end
+
+      private
+
+      attr_reader :path, :data, :maps, :zip
+
+      def parse_manifest(zip_file)
+        entry = zip_file.find_entry("manifest.json")
+        raise InvalidArchive, "Archive is missing manifest.json" unless entry
+
+        JSON.parse(entry.get_input_stream.read)
+      end
+
+      def validate_manifest!
+        raise InvalidArchive, "Not a Plum site archive" unless data["format"] == FORMAT
+        raise InvalidArchive, "Unsupported archive version #{data['format_version'].inspect}" unless data["format_version"] == VERSION
+        raise InvalidArchive, "Archive is missing site data" unless data["site"].is_a?(Hash)
+      end
+
+      def import_site(name:, domain:)
+        source = data.fetch("site")
+        @site = Site.create!(
+          name: name.presence || source.fetch("name"),
+          domain: domain.nil? ? source["domain"] : domain,
+          theme_name: source["theme_name"],
+          settings: source["settings"] || {},
+          theme_settings: source["theme_settings"] || {},
+          custom_css: source["custom_css"],
+          skip_defaults: true
+        )
+        maps[:sites][source["id"]] = @site.id
+
+        import_simple(:content_types, ContentType, %w[name handle singleton blueprint icon])
+        import_simple(:fieldsets, Fieldset, %w[name handle fields])
+        import_simple(:taxonomies, Taxonomy, %w[name handle slug])
+        import_terms
+        import_assets
+        import_entries
+        import_entry_links
+        import_globals
+        import_navigation
+        import_forms
+        import_site_setting
+        @site
+      end
+
+      def import_simple(key, model, fields)
+        Array(data[key.to_s]).each do |source|
+          item = model.create!(source.slice(*fields).merge("site_id" => @site.id))
+          maps[key][source["id"]] = item.id
+        end
+      end
+
+      def import_terms
+        Array(data["terms"]).each do |source|
+          term = Term.create!(source.slice("name", "slug", "position").merge(
+            "site_id" => @site.id,
+            "taxonomy_id" => mapped!(:taxonomies, source["taxonomy_id"])
+          ))
+          maps[:terms][source["id"]] = term.id
+        end
+      end
+
+      def import_assets
+        Array(data["assets"]).each do |source|
+          archive_entry = zip.find_entry(source.fetch("path"))
+          raise InvalidArchive, "Archive is missing asset #{source['path']}" unless archive_entry
+
+          asset = import_asset(source, archive_entry)
+          maps[:assets][source["id"]] = asset.id
+        end
+      end
+
+      def import_asset(source, archive_entry)
+        Tempfile.create([ "plum-asset", File.extname(source.fetch("filename")) ], binmode: true) do |file|
+          digest = Digest::MD5.new
+          bytes = 0
+          input = archive_entry.get_input_stream
+          while (chunk = input.read(64 * 1024))
+            file.write(chunk)
+            digest.update(chunk)
+            bytes += chunk.bytesize
+          end
+          expected_checksum = source["checksum"].to_s
+          actual_checksum = [ digest.digest ].pack("m0")
+          raise InvalidArchive, "Asset #{source['path']} has an invalid size" if source["byte_size"].present? && bytes != source["byte_size"].to_i
+          raise InvalidArchive, "Asset #{source['path']} failed its checksum" if expected_checksum.present? && actual_checksum != expected_checksum
+
+          file.rewind
+          asset = Asset.new(source.slice("alt_text", "caption", "folder", "focal_x", "focal_y").merge("site_id" => @site.id))
+          blob = ActiveStorage::Blob.create_and_upload!(
+            io: file,
+            filename: source.fetch("filename"),
+            content_type: source["content_type"]
+          )
+          @uploaded_blobs << blob
+          asset.file.attach(blob)
+          asset.save!
+          asset
+        end
+      end
+
+      def import_entries
+        Array(data["entries"]).each do |source|
+          entry = Entry.create!(source.slice("title", "slug", "status", "data", "published_at", "author_name", "author_email", "author_gid", "locale").merge(
+            "site_id" => @site.id,
+            "content_type_id" => mapped!(:content_types, source["content_type_id"])
+          ))
+          maps[:entries][source["id"]] = entry.id
+        end
+      end
+
+      def import_entry_links
+        entries_by_id = Array(data["entries"]).index_by { |item| item["id"] }
+        entries_by_id.each do |old_id, source|
+          entry = Entry.find(mapped!(:entries, old_id))
+          fields = entry.content_type.fields
+          entry.update_columns(
+            data: remap_field_values(source["data"] || {}, fields),
+            origin_id: mapped(:entries, source["origin_id"]),
+            updated_at: Time.current
+          )
+          entry.term_ids = Array(source["term_ids"]).filter_map { |id| mapped(:terms, id) }
+        end
+
+        Array(data["entry_revisions"]).each do |source|
+          snapshot = source["snapshot"].to_h.deep_dup
+          entry = Entry.find(mapped!(:entries, source["entry_id"]))
+          snapshot["data"] = remap_field_values(snapshot["data"] || {}, entry.content_type.fields)
+          snapshot["term_ids"] = Array(snapshot["term_ids"]).filter_map { |id| mapped(:terms, id) }
+          EntryRevision.create!(source.slice("editor_name", "editor_email", "editor_gid", "created_at", "updated_at").merge(
+            "site_id" => @site.id, "entry_id" => entry.id, "snapshot" => snapshot
+          ))
+        end
+      end
+
+      def remap_field_values(values, fields)
+        result = values.to_h.deep_dup
+        Array(fields).each do |field|
+          handle = field["handle"].to_s
+          value = result[handle]
+          result[handle] = case field["type"]
+          when "image" then mapped(:assets, value)
+          when "images" then Array(value).filter_map { |id| mapped(:assets, id) }
+          when "relationship"
+            field["multiple"] ? Array(value).filter_map { |id| mapped(:entries, id) } : mapped(:entries, value)
+          when "group" then remap_field_values(value || {}, field["fields"])
+          when "repeater" then Array(value).map { |row| remap_field_values(row, field["fields"]) }
+          when "blocks" then remap_blocks(value)
+          else value
+          end
+        end
+        result
+      end
+
+      def remap_blocks(value)
+        library = BlockLibrary.new(@site.theme)
+        Array(value).map do |block|
+          restored = block.to_h.deep_dup
+          definition = library.definition(restored["type"])
+          restored["fields"] = remap_field_values(restored["fields"] || {}, definition&.dig("fields") || [])
+          restored
+        end
+      end
+
+      def import_globals
+        Array(data["globals"]).each do |source|
+          Global.create!(source.slice("name", "handle", "data").merge("site_id" => @site.id))
+        end
+      end
+
+      def import_navigation
+        import_simple(:nav_menus, NavMenu, %w[name handle])
+        pending = Array(data["nav_items"]).sort_by { |item| item["parent_id"].present? ? 1 : 0 }
+        until pending.empty?
+          imported = pending.reject! do |source|
+            next false if source["parent_id"].present? && mapped(:nav_items, source["parent_id"]).blank?
+
+            item = NavItem.create!(source.slice("label", "url", "position").merge(
+              "site_id" => @site.id,
+              "nav_menu_id" => mapped!(:nav_menus, source["nav_menu_id"]),
+              "parent_id" => mapped(:nav_items, source["parent_id"]),
+              "entry_id" => mapped(:entries, source["entry_id"])
+            ))
+            maps[:nav_items][source["id"]] = item.id
+            true
+          end
+          raise InvalidArchive, "Navigation contains an invalid parent cycle" unless imported
+        end
+      end
+
+      def import_forms
+        import_simple(:form_definitions, FormDefinition, %w[name handle fields notification_email])
+        Array(data["form_submissions"]).each do |source|
+          submission = FormSubmission.new(source.slice("data", "created_at", "updated_at").merge(
+            "site_id" => @site.id,
+            "form_definition_id" => mapped!(:form_definitions, source["form_definition_id"])
+          ))
+          submission.save!(validate: false)
+        end
+      end
+
+      def import_site_setting
+        source = data["site_setting"]
+        return SiteSetting.instance(@site) unless source
+
+        attributes = source.except("id")
+        attributes["logo"] = mapped(:assets, source["logo"].to_i)&.to_s if source["logo"].present?
+        attributes["favicon"] = mapped(:assets, source["favicon"].to_i)&.to_s if source["favicon"].present?
+        SiteSetting.create!(attributes.merge("site_id" => @site.id))
+      end
+
+      def mapped(type, old_id)
+        return if old_id.blank?
+
+        maps[type][old_id] || maps[type][old_id.to_i]
+      end
+
+      def mapped!(type, old_id)
+        mapped(type, old_id) || raise(InvalidArchive, "Missing #{type.to_s.singularize} reference #{old_id.inspect}")
+      end
+
+      def cleanup_uploaded_files
+        @uploaded_blobs.each { |blob| blob.service.delete(blob.key) }
+      rescue StandardError
+        nil
+      end
+    end
+  end
+end

data/app/views/layouts/plum/cp.html.erb

@@ -78,6 +78,8 @@
             <% end %>
             <%= link_to "+ New Type", new_cp_content_type_path,
                 class: "flex items-center px-4 py-2 mt-2 text-sm font-medium plum-sidebar-link" %>
+            <%= link_to "Fieldsets", cp_fieldsets_path,
+                class: "flex items-center px-4 py-2 mt-2 text-sm font-medium rounded-md plum-sidebar-link #{request.path.include?('/cp/fieldsets') ? 'active' : ''}" %>
             <%= link_to "Assets", cp_assets_path,
                 class: "flex items-center px-4 py-2 mt-2 text-sm font-medium rounded-md plum-sidebar-link #{request.path.include?('/cp/assets') ? 'active' : ''}" %>
             <%= link_to "Globals", cp_globals_path,

data/app/views/plum/cp/assets/_form.html.erb

@@ -9,12 +9,24 @@
     </div>
   <% end %>
 
+  <div data-controller="plum--focal-point">
   <% if asset.persisted? && plum_asset_image_url(asset).present? %>
     <div class="overflow-hidden rounded-lg border border-gray-200 bg-gray-100">
-      <%= image_tag plum_asset_image_url(asset), alt: asset.alt_text.to_s, class: "h-44 w-full object-cover" %>
+      <%= image_tag plum_asset_image_url(asset), alt: asset.alt_text.to_s, class: "h-44 w-full object-cover", data: { "plum--focal-point-target": "preview" } %>
     </div>
   <% end %>
 
+  <div class="mt-4 grid gap-4 sm:grid-cols-2">
+    <label class="text-sm font-medium text-gray-700">Horizontal focal point
+      <%= f.range_field :focal_x, min: 0, max: 100, data: { "plum--focal-point-target": "x", action: "input->plum--focal-point#refresh" }, class: "mt-2 block w-full" %>
+    </label>
+    <label class="text-sm font-medium text-gray-700">Vertical focal point
+      <%= f.range_field :focal_y, min: 0, max: 100, data: { "plum--focal-point-target": "y", action: "input->plum--focal-point#refresh" }, class: "mt-2 block w-full" %>
+    </label>
+  </div>
+  <p class="mt-2 text-xs text-gray-500">Crop focus: <span data-plum--focal-point-target="label"></span></p>
+  </div>
+
   <div>
     <%= f.label :file, asset.persisted? ? "Replace image" : "Image", class: "block text-sm font-medium text-gray-700" %>
     <%= f.file_field :file, accept: "image/*", class: "mt-1 block w-full text-sm text-gray-700" %>

data/app/views/plum/cp/content_types/_form.html.erb

@@ -46,34 +46,28 @@
     </div>
   </div>
 
-  <div class="bg-white shadow rounded-lg p-6" data-controller="plum--blueprint">
+  <div class="bg-white shadow rounded-lg p-6" data-controller="plum--blueprint"
+       data-plum--blueprint-types-value="<%= Plum::FieldTypeRegistry.as_json.to_json %>"
+       data-plum--blueprint-nested-types-value="<%= Plum::FieldTypeRegistry.as_json.select { |type| Plum::FieldTypeRegistry::NESTED_FIELD_TYPES.include?(type[:handle]) }.to_json %>"
+       <% if content_type.persisted? %>data-plum--blueprint-apply-fieldset-url-value="<%= apply_fieldset_cp_content_type_path(content_type) %>"<% end %>>
     <h3 class="text-lg font-medium text-gray-900 mb-4">Blueprint</h3>
-    <p class="text-sm text-gray-500 mb-4">Define the fields for this content type using JSON format.</p>
+    <p class="text-sm text-gray-500 mb-4">Choose fields and configure how editors enter content.</p>
 
     <%= f.hidden_field :blueprint, value: (content_type.blueprint || { "fields" => [] }).to_json, data: { "plum--blueprint-target": "input" } %>
 
     <div class="space-y-4" data-plum--blueprint-target="fields">
       <% (content_type.fields || []).each_with_index do |field, index| %>
-        <div class="grid grid-cols-1 gap-4 p-4 bg-gray-50 rounded-lg sm:grid-cols-2 lg:grid-cols-5" data-plum--blueprint-target="field">
+        <div class="plum-blueprint-field" data-plum--blueprint-target="field">
+          <div class="plum-blueprint-field-header col-span-full">
+            <p class="plum-blueprint-field-title" data-field-summary><%= field["label"].presence || field["handle"].presence || "Untitled field" %><span class="plum-blueprint-field-type"><%= field["type"].presence || "text" %></span></p>
+            <button type="button" data-action="plum--blueprint#removeField" class="text-sm font-medium text-red-600 hover:text-red-700">Remove</button>
+          </div>
           <input type="text" value="<%= field['handle'] %>" placeholder="handle" data-field="handle"
                  data-action="input->plum--blueprint#inputChanged"
                  class="px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 font-mono text-sm">
           <select data-field="type" data-action="change->plum--blueprint#inputChanged"
                   class="px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 text-sm">
-            <option value="text" <%= 'selected' if field['type'] == 'text' %>>Text</option>
-            <option value="textarea" <%= 'selected' if field['type'] == 'textarea' %>>Textarea</option>
-            <option value="rich_text" <%= 'selected' if field['type'] == 'rich_text' %>>Rich Text</option>
-            <option value="number" <%= 'selected' if field['type'] == 'number' %>>Number</option>
-            <option value="boolean" <%= 'selected' if field['type'] == 'boolean' %>>Boolean</option>
-            <option value="date" <%= 'selected' if field['type'] == 'date' %>>Date</option>
-            <option value="select" <%= 'selected' if field['type'] == 'select' %>>Select</option>
-            <option value="checkboxes" <%= 'selected' if field['type'] == 'checkboxes' %>>Checkboxes</option>
-            <option value="color" <%= 'selected' if field['type'] == 'color' %>>Color</option>
-            <option value="url" <%= 'selected' if field['type'] == 'url' %>>URL</option>
-            <option value="taxonomy" <%= 'selected' if field['type'] == 'taxonomy' %>>Taxonomy</option>
-            <option value="image" <%= 'selected' if field['type'] == 'image' %>>Image</option>
-            <option value="relationship" <%= 'selected' if field['type'] == 'relationship' %>>Relationship</option>
-            <option value="blocks" <%= 'selected' if field['type'] == 'blocks' %>>Blocks</option>
+            <%= options_for_select(Plum::FieldTypeRegistry.options, field["type"]) %>
           </select>
           <input type="text" value="<%= field['label'] %>" placeholder="Label" data-field="label"
                  data-action="input->plum--blueprint#inputChanged"
@@ -81,17 +75,72 @@
           <input type="text" value="<%= field['content_type'] %>" placeholder="Related type handle" data-field="content_type" data-field-config="relationship"
                  data-action="input->plum--blueprint#inputChanged"
                  class="<%= 'hidden' unless field['type'] == 'relationship' %> px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 font-mono text-sm">
+          <label class="<%= 'hidden' unless field['type'] == 'relationship' %> flex items-center gap-2 text-sm text-gray-700" data-field-config="relationship"><input type="checkbox" data-field="multiple" data-action="change->plum--blueprint#inputChanged" <%= "checked" if ActiveModel::Type::Boolean.new.cast(field['multiple']) %>> Allow multiple entries</label>
           <input type="text" value="<%= field['taxonomy'] %>" placeholder="Taxonomy handle" data-field="taxonomy" data-field-config="taxonomy"
                  data-action="input->plum--blueprint#inputChanged"
                  class="<%= 'hidden' unless field['type'] == 'taxonomy' %> px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 font-mono text-sm">
-          <input type="text" value="<%= Array(field['options']).join(', ') %>" placeholder="Option 1, Option 2, Option 3" data-field="options" data-field-config="select checkboxes"
+          <textarea rows="4" placeholder="Published | published&#10;Draft | draft" data-field="options" data-field-config="select radio button_group checkboxes"
                  data-action="input->plum--blueprint#inputChanged"
-                 class="<%= 'hidden' unless %w[select checkboxes].include?(field['type']) %> px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 text-sm">
-          <button type="button" data-action="plum--blueprint#removeField" class="justify-self-start text-red-500 hover:text-red-700">
-            <svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
-            </svg>
-          </button>
+                 class="<%= 'hidden' unless %w[select radio button_group checkboxes].include?(field['type']) %> col-span-full px-3 py-2 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-purple-500 focus:border-purple-500 font-mono text-sm"><%= Plum::FieldOptions.editor_value(field['options']) %></textarea>
+          <div class="<%= 'hidden' unless %w[group repeater].include?(field['type']) %> col-span-full space-y-3 rounded-md border border-gray-200 bg-white p-3" data-field-config="group repeater" data-nested-editor>
+            <div class="flex items-center justify-between">
+              <p class="text-sm font-medium text-gray-700">Nested fields</p>
+              <button type="button" data-action="plum--blueprint#addNestedField" class="text-sm font-medium text-purple-600 hover:text-purple-700">+ Add nested field</button>
+            </div>
+            <div class="space-y-3" data-nested-fields>
+              <% Array(field["fields"]).each do |nested| %>
+                <div class="grid gap-2 rounded-md border border-gray-200 bg-gray-50 p-3 sm:grid-cols-3" data-nested-field>
+                  <input type="text" value="<%= nested['handle'] %>" placeholder="handle" data-nested="handle" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 font-mono text-sm">
+                  <select data-nested="type" data-action="change->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm"><%= options_for_select(Plum::FieldTypeRegistry.options.select { |_, handle| Plum::FieldTypeRegistry::NESTED_FIELD_TYPES.include?(handle) }, nested["type"]) %></select>
+                  <input type="text" value="<%= nested['label'] %>" placeholder="Label" data-nested="label" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+                  <input type="text" value="<%= nested['instructions'] %>" placeholder="Instructions" data-nested="instructions" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+                  <input type="text" value="<%= nested['placeholder'] %>" placeholder="Placeholder" data-nested="placeholder" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+                  <input type="text" value="<%= nested['default'] %>" placeholder="Default value" data-nested="default" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+                  <label class="flex items-center gap-2 text-sm text-gray-700"><input type="checkbox" data-nested="required" data-action="change->plum--blueprint#inputChanged" <%= "checked" if ActiveModel::Type::Boolean.new.cast(nested['required']) %>> Required</label>
+                  <div class="flex gap-3">
+                    <button type="button" data-direction="-1" data-action="plum--blueprint#moveNestedField" class="text-sm text-gray-600">↑ Up</button>
+                    <button type="button" data-direction="1" data-action="plum--blueprint#moveNestedField" class="text-sm text-gray-600">↓ Down</button>
+                    <button type="button" data-action="plum--blueprint#removeNestedField" class="text-sm font-medium text-red-600">Remove</button>
+                  </div>
+                </div>
+              <% end %>
+            </div>
+          </div>
+          <div class="<%= 'hidden' unless field['type'] == 'number' %> col-span-full grid gap-3 rounded-md border border-gray-200 bg-white p-3 sm:grid-cols-4" data-field-config="number">
+            <%= select_tag nil, options_for_select([["Decimal", "decimal"], ["Integer", "integer"]], field["number_kind"]), data: { field: "number_kind", action: "change->plum--blueprint#inputChanged" }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+            <input type="number" value="<%= field['min'] %>" placeholder="Minimum" data-field="min" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="number" value="<%= field['max'] %>" placeholder="Maximum" data-field="max" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="number" value="<%= field['step'] %>" placeholder="Step" data-field="step" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="text" value="<%= field['unit'] %>" placeholder="Unit (optional)" data-field="unit" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+          </div>
+          <div class="<%= 'hidden' unless field['type'] == 'date' %> col-span-full grid gap-3 rounded-md border border-gray-200 bg-white p-3 sm:grid-cols-3" data-field-config="date">
+            <%= select_tag nil, options_for_select([["Date", "date"], ["Time", "time"], ["Date and time", "datetime"]], field["date_mode"]), data: { field: "date_mode", action: "change->plum--blueprint#inputChanged" }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+            <input type="text" value="<%= field['min'] %>" placeholder="Earliest value" data-field="min" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="text" value="<%= field['max'] %>" placeholder="Latest value" data-field="max" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+          </div>
+          <div class="<%= 'hidden' unless %w[list repeater images].include?(field['type']) || (field['type'] == 'relationship' && field['multiple']) %> col-span-full grid gap-3 rounded-md border border-gray-200 bg-white p-3 sm:grid-cols-3" data-field-config="list repeater images relationship" data-multiple-only>
+            <input type="number" min="0" value="<%= field['min_items'] %>" placeholder="Minimum items" data-field="min_items" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <input type="number" min="0" value="<%= field['max_items'] %>" placeholder="Maximum items" data-field="max_items" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+            <label class="<%= 'hidden' unless field['type'] == 'list' %> flex items-center gap-2 text-sm text-gray-700" data-field-config="list"><input type="checkbox" data-field="unique" data-action="change->plum--blueprint#inputChanged" <%= "checked" if ActiveModel::Type::Boolean.new.cast(field['unique']) %>> Unique values</label>
+          </div>
+          <div class="col-span-full grid gap-3 border-t border-gray-200 pt-3 sm:grid-cols-3">
+            <input type="text" value="<%= field['instructions'] %>" placeholder="Instructions" data-field="instructions" data-action="input->plum--blueprint#inputChanged"
+                   class="px-3 py-2 border border-gray-300 rounded-md shadow-sm text-sm">
+            <input type="text" value="<%= field['placeholder'] %>" placeholder="Placeholder" data-field="placeholder" data-action="input->plum--blueprint#inputChanged"
+                   class="px-3 py-2 border border-gray-300 rounded-md shadow-sm text-sm">
+            <input type="text" value="<%= field['default'] %>" placeholder="Default value" data-field="default" data-action="input->plum--blueprint#inputChanged"
+                   class="px-3 py-2 border border-gray-300 rounded-md shadow-sm text-sm">
+            <label class="flex items-center gap-2 text-sm text-gray-700">
+              <input type="checkbox" data-field="required" data-action="change->plum--blueprint#inputChanged" <%= "checked" if ActiveModel::Type::Boolean.new.cast(field['required']) %>>
+              Required
+            </label>
+          </div>
+          <div class="col-span-full grid gap-3 rounded-md border border-gray-200 bg-white p-3 sm:grid-cols-4">
+            <%= select_tag nil, options_for_select([["Full width", 12], ["Three quarters", 9], ["Two thirds", 8], ["Half width", 6], ["One third", 4], ["Quarter width", 3]], field["width"].presence || 12), data: { field: "width", action: "change->plum--blueprint#inputChanged" }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+            <input type="text" value="<%= field.dig('condition', 'field') %>" placeholder="Show when field…" data-field="condition_field" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 font-mono text-sm">
+            <%= select_tag nil, options_for_select([["Equals", "equals"], ["Does not equal", "not_equals"], ["Contains", "contains"], ["Is empty", "empty"], ["Is not empty", "not_empty"]], field.dig("condition", "operator")), include_blank: "No condition", data: { field: "condition_operator", action: "change->plum--blueprint#inputChanged" }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+            <input type="text" value="<%= field.dig('condition', 'value') %>" placeholder="Value" data-field="condition_value" data-action="input->plum--blueprint#inputChanged" class="rounded-md border border-gray-300 px-3 py-2 text-sm">
+          </div>
         </div>
       <% end %>
     </div>
@@ -103,6 +152,14 @@
       </svg>
       Add Field
     </button>
+    <% if content_type.persisted? && @fieldsets.any? %>
+      <div class="mt-4 flex flex-wrap items-center gap-3 border-t border-gray-200 pt-4">
+        <%= select_tag nil, options_from_collection_for_select(@fieldsets, :id, :name), prompt: "Choose saved fieldset", data: { fieldset_picker: true }, class: "rounded-md border border-gray-300 px-3 py-2 text-sm" %>
+        <button type="button" data-action="plum--blueprint#applyFieldset" class="rounded-md border border-purple-200 bg-purple-50 px-3 py-2 text-sm font-semibold text-purple-700 hover:bg-purple-100">Insert fieldset</button>
+        <span class="hidden text-sm" data-fieldset-status></span>
+      </div>
+    <% end %>
+    <p class="mt-3 text-xs text-gray-500"><%= link_to "Manage reusable fieldsets", cp_fieldsets_path, class: "text-purple-600 hover:text-purple-700" %></p>
   </div>
 
   <div class="flex justify-end space-x-3">

data/app/views/plum/cp/custom_fields/_input.html.erb

@@ -0,0 +1,5 @@
+<%= text_field_tag "entry[data][#{field_handle}]", field_value,
+    id: field_id,
+    placeholder: field["placeholder"],
+    required: field["required"],
+    class: "mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm focus:border-purple-500 focus:ring-purple-500" %>