iron-cms 0.17.3 → 0.18.1

data/app/assets/tailwind/iron/lexxy.css

@@ -37,25 +37,26 @@
     @apply focus-visible:outline-2 focus-visible:outline-sky-600 dark:focus-visible:outline-sky-500;
   }
 
-  /* Toolbar */
+  /* Toolbar — a single, non-wrapping row. Lexxy's controller measures how far
+     the buttons overflow the row (scrollWidth vs clientWidth) and tucks the
+     ones that don't fit into a trailing "more" menu, so the row must never
+     wrap. `relative` lets the dropdown panels anchor to the toolbar. */
   lexxy-toolbar {
-    @apply flex flex-wrap items-center gap-1 p-2;
+    @apply relative flex flex-nowrap items-center gap-1 p-2;
+    @apply max-w-full;
     @apply border-b border-stone-950/10 dark:border-white/10;
     @apply bg-stone-50 dark:bg-white/5;
     @apply rounded-t-xl;
   }
 
-  /* Toolbar button groups */
-  lexxy-toolbar [data-toolbar-group] {
-    @apply flex items-center;
+  /* Items keep their natural size; shrinking them would let everything squeeze
+     in and rob the overflow measurement of the signal it needs. */
+  lexxy-toolbar > * {
+    @apply flex-none;
   }
 
-  lexxy-toolbar [data-toolbar-group]:not(:last-child)::after {
-    content: "";
-    @apply mx-2 h-5 w-px bg-stone-300 dark:bg-white/20;
-  }
-
-  /* Toolbar buttons */
+  /* Toolbar buttons — square, icon-only. Buttons that live inside dropdown
+     panels are reshaped by the panel rules below. */
   lexxy-toolbar button,
   lexxy-toolbar summary {
     @apply inline-flex items-center justify-center;
@@ -64,12 +65,12 @@
     @apply hover:bg-stone-200 dark:hover:bg-white/10;
     @apply focus-visible:outline-2 focus-visible:outline-stone-600;
     @apply disabled:opacity-40 disabled:pointer-events-none;
+    @apply aria-disabled:opacity-40 aria-disabled:pointer-events-none;
     @apply transition-colors;
   }
 
   lexxy-toolbar button[aria-pressed="true"],
-  lexxy-toolbar button.active,
-  lexxy-toolbar details[open] > summary {
+  lexxy-toolbar button.active {
     @apply bg-stone-200 text-stone-900;
     @apply dark:bg-white/15 dark:text-white;
   }
@@ -80,6 +81,41 @@
     fill: currentColor;
   }
 
+  /* Dropdown triggers wear a chevron, so let them outgrow the square button. */
+  lexxy-toolbar .lexxy-editor__toolbar-button--chevron {
+    @apply w-auto gap-1 px-1.5;
+  }
+
+  lexxy-toolbar .lexxy-editor__toolbar-button--chevron::after {
+    content: "";
+    @apply size-1.5 rotate-45;
+    @apply border-b-2 border-e-2 border-current;
+    @apply opacity-50;
+    margin-block-start: -0.15rem;
+  }
+
+  /* Group separators — lexxy flags the last button of each cluster with
+     `…group-end`; we hang a hairline rule in the trailing gap. Scope to the
+     toolbar's own rows so the same class, reused inside the format menu and the
+     overflow menu, doesn't sprout stray dividers. */
+  lexxy-toolbar > button.lexxy-editor__toolbar-group-end,
+  lexxy-toolbar > lexxy-link-dropdown > button.lexxy-editor__toolbar-group-end {
+    @apply relative me-2.5;
+  }
+
+  lexxy-toolbar > button.lexxy-editor__toolbar-group-end::after,
+  lexxy-toolbar > lexxy-link-dropdown > button.lexxy-editor__toolbar-group-end::after {
+    content: "";
+    @apply absolute inset-y-1 w-px;
+    inset-inline-end: -0.3125rem;
+    @apply bg-stone-300 dark:bg-white/20 pointer-events-none;
+  }
+
+  /* History controls and the overflow menu sit at the trailing edge. */
+  lexxy-toolbar .lexxy-editor__toolbar-button--push-right {
+    margin-inline-start: auto;
+  }
+
   /* Editor content area — only the main editable surface, not decorator children */
   lexxy-editor [contenteditable="true"] {
     @apply block w-full min-h-48 p-4;
@@ -94,72 +130,38 @@
     @apply pointer-events-none;
   }
 
-  /* Toolbar dropdowns (shared container styles) */
+  /* ---- Dropdowns -------------------------------------------------------- */
+
+  /* Each dropdown anchors its panel beneath its own trigger. Compact mode (the
+     [overflowing] rules at the end) relaxes this so panels span the toolbar. */
   .lexxy-editor__toolbar-dropdown {
     @apply relative select-none;
   }
 
-  .lexxy-editor__toolbar-dropdown > summary {
-    list-style: none;
-    @apply cursor-pointer;
-  }
-
-  .lexxy-editor__toolbar-dropdown > summary::-webkit-details-marker {
-    display: none;
-  }
-
-  .lexxy-editor__toolbar-dropdown > summary::marker {
-    display: none;
-    content: "";
-  }
-
-  .lexxy-editor__toolbar-dropdown-content {
-    --dropdown-padding: --spacing(3);
-    --dropdown-gap: --spacing(1.5);
-
-    @apply absolute z-10;
-    @apply flex gap-(--dropdown-gap) p-(--dropdown-padding);
+  /* Shared panel chrome. Panels reveal/hide through the `hidden` attribute, so
+     each panel below sets its own display + padding once it is shown. */
+  lexxy-toolbar [data-dropdown-panel] {
+    @apply absolute z-20 top-full start-0 mt-1;
     @apply bg-white dark:bg-stone-800;
     @apply border-2 border-sky-200 dark:border-sky-500/30;
-    @apply rounded-md;
+    @apply rounded-md rounded-ss-none shadow-lg;
     @apply text-stone-900 dark:text-white;
-    @apply top-8 start-0;
-    @apply max-w-[40ch];
-    @apply rounded-ss-none;
   }
 
-  /* Active state for the dropdown's *trigger* (the <summary> itself, which carries
-     the toolbar-button class). Scope to direct summary so it doesn't bleed into
-     content buttons like highlight swatches that share the same class. */
-  .lexxy-editor__toolbar-dropdown:is([open]) > summary.lexxy-editor__toolbar-button {
-    @apply bg-sky-100 dark:bg-sky-500/20;
-    @apply rounded-ee-none rounded-es-none;
+  lexxy-toolbar [data-dropdown-panel][hidden] {
+    @apply hidden;
   }
 
-  .lexxy-editor__toolbar-dropdown:is([open]) > summary.lexxy-editor__toolbar-button:hover {
+  /* Open trigger — tint the button and square off the edge meeting the panel. */
+  .lexxy-editor__toolbar-dropdown > [data-dropdown-trigger][aria-expanded="true"],
+  .lexxy-editor__toolbar-dropdown > [data-dropdown-trigger][aria-expanded="true"]:hover {
     @apply bg-sky-100 dark:bg-sky-500/20;
+    @apply rounded-ee-none rounded-es-none;
   }
 
-  /* Responsive dropdown in overflow menu */
-  [overflowing] .lexxy-editor__toolbar-dropdown {
-    @apply static;
-  }
-
-  [overflowing] .lexxy-editor__toolbar-dropdown-content {
-    --dropdown-padding: --spacing(2);
-    @apply end-(--dropdown-padding) start-(--dropdown-padding);
-  }
-
-  /* Vertical dropdown menu (used by the text-formatting dropdown) — items show
-     an icon followed by a text label; needs to override toolbar's h-8 w-8 rule. */
-  .lexxy-editor__toolbar-dropdown-list {
-    @apply absolute z-10;
-    @apply flex flex-col p-1;
-    @apply bg-white dark:bg-stone-800;
-    @apply border-2 border-sky-200 dark:border-sky-500/30;
-    @apply rounded-md rounded-ss-none;
-    @apply text-stone-900 dark:text-white;
-    @apply top-8 start-0 min-w-[12rem];
+  /* Text-formatting menu — a vertical list of icon + label rows. */
+  [data-dropdown-panel].lexxy-editor__toolbar-dropdown-list {
+    @apply flex flex-col gap-0.5 p-1 min-w-[12rem];
   }
 
   .lexxy-editor__toolbar-dropdown-list button {
@@ -180,25 +182,24 @@
     fill: currentColor;
   }
 
-  /* Lexxy emits explicit <div class="lexxy-editor__toolbar-separator"> elements
-     between groups inside the dropdown — relying on those means no extra
-     border-b for `group-end` (which would double up the divider). */
   .lexxy-editor__toolbar-dropdown-list .lexxy-editor__toolbar-separator {
     @apply my-1 h-px w-full;
     @apply bg-stone-200 dark:bg-white/10;
   }
 
-  /* Link dropdown — URL input with Link / Unlink action buttons */
-  lexxy-link-dropdown {
-    @apply gap-2 min-w-[22rem];
+  /* Overflow ("more") menu — a compact grid of the buttons that didn't fit,
+     anchored to the trailing edge under its trigger. */
+  .lexxy-editor__toolbar-overflow [data-dropdown-panel] {
+    @apply start-auto end-0 rounded-ss-md rounded-se-none;
   }
 
-  [overflowing] lexxy-link-dropdown {
-    @apply min-w-0 flex-col;
+  [data-dropdown-panel].lexxy-editor__toolbar-overflow-menu {
+    @apply grid grid-cols-5 gap-1 p-2 justify-items-center;
   }
 
-  [overflowing] lexxy-link-dropdown .lexxy-editor__toolbar-dropdown-actions {
-    @apply mt-2;
+  /* Link dropdown — URL input with Link / Unlink action buttons. */
+  lexxy-link-dropdown [data-dropdown-panel] {
+    @apply flex items-center gap-2 p-2 min-w-[22rem];
   }
 
   lexxy-link-dropdown input[type="url"] {
@@ -236,15 +237,15 @@
   }
 
   /* Highlight/Color dropdown
-     Lexxy 0.9.9 emits 9 text-color buttons followed by 9 bg-color buttons.
-     With `grid-auto-flow: column` and 2 rows, source order fills col-by-col so
-     each column shows a matching color/bg pair (row 1 = color, row 2 = bg). */
-  lexxy-highlight-dropdown {
-    --button-size: --spacing(8);
-    @apply flex flex-col gap-2;
+     Lexxy emits N text-color buttons followed by N background-color buttons.
+     A 2-row grid with `grid-auto-flow: column` fills column-by-column, so each
+     column pairs a color with its background (row 1 = color, row 2 = bg). */
+  lexxy-highlight-dropdown [data-dropdown-panel] {
+    @apply flex flex-col gap-2 p-2;
   }
 
   lexxy-highlight-dropdown .lexxy-highlight-colors {
+    --button-size: --spacing(7);
     display: grid;
     grid-template-columns: repeat(var(--max-colors, 9), var(--button-size));
     grid-template-rows: repeat(2, var(--button-size));
@@ -253,7 +254,9 @@
   }
 
   lexxy-highlight-dropdown .lexxy-highlight-button {
-    @apply relative aspect-square size-8 rounded-md p-0;
+    @apply relative rounded-md p-0;
+    width: var(--button-size);
+    height: var(--button-size);
     @apply ring-1 ring-inset ring-stone-300 dark:ring-white/15;
     @apply hover:opacity-80;
     font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
@@ -262,7 +265,7 @@
   lexxy-highlight-dropdown .lexxy-highlight-button::after {
     content: "Aa";
     @apply absolute inset-0 flex items-center justify-center;
-    @apply font-semibold text-sm leading-none;
+    @apply font-semibold text-xs leading-none;
   }
 
   /* Background-color button: letter in default ink color over the swatch */
@@ -281,7 +284,7 @@
   }
 
   lexxy-highlight-dropdown .lexxy-editor__toolbar-dropdown-reset {
-    @apply mt-2 w-full whitespace-nowrap;
+    @apply mt-1 w-full whitespace-nowrap;
     @apply button-secondary button-sm;
   }
 
@@ -289,9 +292,30 @@
     @apply hidden;
   }
 
-  /* Responsive highlight dropdown — overflow menu is narrower */
-  [overflowing] lexxy-highlight-dropdown {
-    @apply w-fit;
+  /* ---- Compact (overflowing) toolbar ------------------------------------ */
+
+  /* When the row can't hold every control, lexxy sets `overflowing` on the
+     toolbar and moves the spill into the "more" menu. Panels then detach from
+     their trigger and drop below the whole toolbar, spanning its width so
+     nothing runs off a narrow screen. */
+  lexxy-toolbar[overflowing] .lexxy-editor__toolbar-dropdown {
+    position: static;
+  }
+
+  lexxy-toolbar[overflowing] [data-dropdown-panel] {
+    @apply start-2 end-2 w-auto rounded-md;
+  }
+
+  lexxy-toolbar[overflowing] [data-dropdown-trigger][aria-expanded="true"] {
+    @apply rounded-md;
+  }
+
+  lexxy-toolbar[overflowing] lexxy-link-dropdown [data-dropdown-panel] {
+    @apply min-w-0 flex-col items-stretch;
+  }
+
+  lexxy-toolbar[overflowing] lexxy-link-dropdown .lexxy-editor__toolbar-dropdown-actions {
+    @apply mt-2;
   }
 
   /* Attachment upload progress */

data/app/controllers/concerns/iron/schema_editing.rb

@@ -0,0 +1,19 @@
+module Iron
+  module SchemaEditing
+    extend ActiveSupport::Concern
+
+    private
+
+      def ensure_schema_editable
+        return if Schema.editable?
+
+        if request.format.json?
+          render json: { schema: [ I18n.t("iron.schema.locked.api_error") ] }, status: :forbidden
+        elsif request.format.turbo_stream?
+          render turbo_stream: turbo_stream.refresh(request_id: nil)
+        else
+          redirect_back fallback_location: root_path, alert: I18n.t("iron.schema.locked.alert"), status: :see_other
+        end
+      end
+  end
+end

data/app/controllers/concerns/iron/web_page.rb

@@ -12,7 +12,9 @@ module Iron
     end
 
     def set_entry
-      @entry = @content_type.entries.find_by!(route: params[:route])
+      @entry = @content_type.entries.find_by(route: params[:route])
+
+      raise ActiveRecord::RecordNotFound unless @entry&.published_in?(Current.locale)
     end
   end
 end

data/app/controllers/iron/api/schema/base_controller.rb

@@ -0,0 +1,25 @@
+module Iron
+  module Api
+    module Schema
+      class BaseController < Api::BaseController
+        include Iron::SchemaEditing
+
+        before_action :ensure_can_administer, only: %i[ create update destroy ]
+        before_action :ensure_schema_editable, only: %i[ create update destroy ]
+
+        rescue_from ActiveRecord::RecordNotUnique, with: :render_duplicate_handle
+        rescue_from ActiveModel::UnknownAttributeError, with: :render_unknown_attribute
+
+        private
+
+          def render_duplicate_handle
+            render json: { handle: [ "has already been taken" ] }, status: :unprocessable_entity
+          end
+
+          def render_unknown_attribute(exception)
+            render json: { exception.attribute => [ "is not supported by this field type" ] }, status: :unprocessable_entity
+          end
+      end
+    end
+  end
+end

data/app/controllers/iron/api/schema/block_definitions_controller.rb

@@ -0,0 +1,49 @@
+module Iron
+  module Api
+    module Schema
+      class BlockDefinitionsController < BaseController
+        before_action :set_block_definition, only: %i[ show update destroy ]
+
+        def index
+          @block_definitions = BlockDefinition.order(:name)
+        end
+
+        def show
+        end
+
+        def create
+          @block_definition = BlockDefinition.new(block_definition_params)
+
+          if @block_definition.save
+            render :show, status: :created, location: api_schema_block_definition_url(@block_definition)
+          else
+            render json: @block_definition.errors, status: :unprocessable_entity
+          end
+        end
+
+        def update
+          if @block_definition.update(block_definition_params)
+            render :show
+          else
+            render json: @block_definition.errors, status: :unprocessable_entity
+          end
+        end
+
+        def destroy
+          @block_definition.destroy!
+          head :no_content
+        end
+
+        private
+
+          def set_block_definition
+            @block_definition = BlockDefinition.find(params[:id])
+          end
+
+          def block_definition_params
+            params.permit(:name, :handle, :description)
+          end
+      end
+    end
+  end
+end

data/app/controllers/iron/api/schema/content_types_controller.rb

@@ -0,0 +1,64 @@
+module Iron
+  module Api
+    module Schema
+      class ContentTypesController < BaseController
+        before_action :set_content_type, only: %i[ show update destroy ]
+        before_action :ensure_supported_type, only: :create
+
+        def index
+          @content_types = ContentType.order(:name)
+        end
+
+        def show
+        end
+
+        def create
+          @content_type = ContentType.new(content_type_params.merge(type: classified_type))
+
+          if @content_type.save
+            render :show, status: :created, location: api_schema_content_type_url(@content_type)
+          else
+            render json: @content_type.errors, status: :unprocessable_entity
+          end
+        end
+
+        def update
+          if @content_type.update(content_type_params)
+            render :show
+          else
+            render json: @content_type.errors, status: :unprocessable_entity
+          end
+        end
+
+        def destroy
+          @content_type.destroy!
+          head :no_content
+        end
+
+        private
+
+          def set_content_type
+            @content_type = ContentType.find(params[:id])
+          end
+
+          def content_type_params
+            params.permit(:name, :handle, :description, :icon, :base_path, :web_publishing_enabled, :title_field_definition_id, :web_page_title_field_definition_id)
+          end
+
+          def ensure_supported_type
+            if params[:type].present? && requested_type.nil?
+              render json: { type: [ "must be one of: #{ContentType::TYPES.map(&:downcase).join(", ")}" ] }, status: :unprocessable_entity
+            end
+          end
+
+          def requested_type
+            ContentType::TYPES.find { |type| type.casecmp?(params[:type].to_s) }
+          end
+
+          def classified_type
+            ContentType.classify_type(requested_type || "Collection")
+          end
+      end
+    end
+  end
+end

data/app/controllers/iron/api/schema/field_definitions_controller.rb

@@ -0,0 +1,88 @@
+module Iron
+  module Api
+    module Schema
+      class FieldDefinitionsController < BaseController
+        before_action :set_schemable, :ensure_supported_type, only: :create
+        before_action :set_field_definition, only: %i[ show update destroy ]
+        before_action :ensure_valid_position, only: %i[ create update ]
+
+        def show
+        end
+
+        def create
+          @field_definition = @schemable.field_definitions.build(type: classified_type)
+          @field_definition.assign_attributes(field_definition_params)
+          place_at_requested_position
+
+          if @field_definition.save
+            render :show, status: :created, location: api_schema_field_definition_url(@field_definition)
+          else
+            render json: @field_definition.errors, status: :unprocessable_entity
+          end
+        end
+
+        def update
+          @field_definition.assign_attributes(field_definition_params)
+          place_at_requested_position
+
+          if @field_definition.save
+            render :show
+          else
+            render json: @field_definition.errors, status: :unprocessable_entity
+          end
+        end
+
+        def destroy
+          @field_definition.destroy!
+          head :no_content
+        end
+
+        private
+
+          def set_schemable
+            @schemable = if params[:content_type_id]
+              ContentType.find(params[:content_type_id])
+            else
+              BlockDefinition.find(params[:block_definition_id])
+            end
+          end
+
+          def set_field_definition
+            @field_definition = FieldDefinition.find(params[:id])
+          end
+
+          def field_definition_params
+            params.permit(:name, :handle, :required, :searchable, :file_scope, :min_length, :max_length, :min, :max, allowed_values: [], selected_presets: [], supported_block_definition_ids: [], supported_content_type_ids: [])
+          end
+
+          def ensure_valid_position
+            Integer(params[:position].to_s) if params.key?(:position)
+          rescue ArgumentError, TypeError
+            render json: { position: [ "must be an integer" ] }, status: :unprocessable_entity
+          end
+
+          def place_at_requested_position
+            @field_definition.move_to(requested_position) if params.key?(:position)
+          end
+
+          def requested_position
+            Integer(params[:position].to_s).clamp(0, highest_position)
+          end
+
+          def highest_position
+            @field_definition.schemable.field_definitions.where.not(id: @field_definition.id).count
+          end
+
+          def ensure_supported_type
+            unless FieldDefinition::TYPES.include?(params[:type].to_s)
+              render json: { type: [ "must be one of: #{FieldDefinition::TYPES.join(", ")}" ] }, status: :unprocessable_entity
+            end
+          end
+
+          def classified_type
+            FieldDefinition.classify_type(params[:type])
+          end
+      end
+    end
+  end
+end

data/app/controllers/iron/api/schema/locales_controller.rb

@@ -0,0 +1,52 @@
+module Iron
+  module Api
+    module Schema
+      class LocalesController < BaseController
+        before_action :set_locale, only: %i[ show update destroy ]
+
+        def index
+          @locales = Locale.order(:code)
+        end
+
+        def show
+        end
+
+        def create
+          @locale = Locale.new(locale_params)
+
+          if @locale.save
+            render :show, status: :created, location: api_schema_locale_url(@locale)
+          else
+            render json: @locale.errors, status: :unprocessable_entity
+          end
+        end
+
+        def update
+          if @locale.update(locale_params)
+            render :show
+          else
+            render json: @locale.errors, status: :unprocessable_entity
+          end
+        end
+
+        def destroy
+          if @locale.destroy
+            head :no_content
+          else
+            render json: @locale.errors, status: :unprocessable_entity
+          end
+        end
+
+        private
+
+          def set_locale
+            @locale = Locale.find(params[:id])
+          end
+
+          def locale_params
+            params.permit(:code, :name)
+          end
+      end
+    end
+  end
+end

data/app/controllers/iron/application_controller.rb

@@ -1,7 +1,7 @@
 module Iron
   class ApplicationController < ActionController::Base
     include ActiveStorage::SetCurrent
-    include AdminLocale, Authentication, Authorization
+    include AdminLocale, Authentication, Authorization, SchemaEditing
     default_form_builder FormBuilder
   end
 end

data/app/controllers/iron/block_definitions_controller.rb

@@ -2,6 +2,7 @@ module Iron
   class BlockDefinitionsController < ApplicationController
     before_action :set_block_definition, only: %i[ show edit update destroy ]
     before_action :ensure_can_administer
+    before_action :ensure_schema_editable, only: %i[ create update destroy ]
 
     def index
       @block_definitions = BlockDefinition.all

data/app/controllers/iron/content_types_controller.rb

@@ -2,6 +2,7 @@ module Iron
   class ContentTypesController < ApplicationController
     before_action :set_content_type, only: %i[ show edit update destroy ]
     before_action :ensure_can_administer
+    before_action :ensure_schema_editable, only: %i[ create update destroy ]
 
     def index
       @content_types = ContentType.order(:name)

data/app/controllers/iron/field_definitions_controller.rb

@@ -5,6 +5,7 @@ module Iron
     before_action :set_schemable, only: %i[ new create ]
     before_action :set_field_definition, only: %i[ edit update destroy ]
     before_action :ensure_can_administer
+    before_action :ensure_schema_editable, only: %i[ create update destroy ]
 
     def new
       @field_definition = @schemable.field_definitions.build(type: selected_field_definition_type)
@@ -42,7 +43,7 @@ module Iron
       end
 
       def field_definition_params
-        params.expect(field_definition: [ :type, :name, :handle, :rank, :allowed_values_text, :required, :searchable, :file_scope, selected_presets: [], supported_block_definition_ids: [], supported_content_type_ids: [] ])
+        params.expect(field_definition: [ :type, :name, :handle, :rank, :allowed_values_text, :required, :min_length, :max_length, :min, :max, :searchable, :file_scope, selected_presets: [], supported_block_definition_ids: [], supported_content_type_ids: [] ])
       end
 
       def selected_field_definition_type

data/app/controllers/iron/first_runs_controller.rb

@@ -19,7 +19,7 @@ module Iron
 
     private
       def prevent_running_after_setup
-        redirect_to root_url if User.any?
+        redirect_to root_url if User.people.any?
       end
 
       def user_params

data/app/controllers/iron/locales_controller.rb

@@ -2,6 +2,7 @@ module Iron
   class LocalesController < ApplicationController
     before_action :set_locale, only: %i[ edit update destroy ]
     before_action :ensure_can_administer
+    before_action :ensure_schema_editable, only: %i[ create update destroy ]
 
     def index
       @locales = Locale.all