admin_suite 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed1253c0c2d8c5d658db9ad2bc569e0f0b2c76d8ed4741f3069d0e2240619848
-  data.tar.gz: dc3dd2e0686581694f2d71f77b440bfe56606c867d4a7103e3d1148aecf5b3ed
+  metadata.gz: 3679b3f1b7a2f81d3001c2def3f283c0af6af3ab3c8d593c552fd073f72aaff1
+  data.tar.gz: f4087201617ce4d248c4c7727cc7464344e43fed12a50c5a3eb966e86e0d5c61
 SHA512:
-  metadata.gz: fb266215e70e3aa1aea7ff9e4ed49801c3960b7ef7c82c966f7e4417f0d7b3b84c88ca4a27b4fe2c1fdbc584932b78ce3bf7e621f885ec8ceacb3a48e7bb5d90
-  data.tar.gz: 426c328efa276ac354a5776ab4636643747a2d8d4fc6849f789742ed03d3573b2fa14fbcc4451b5ba25c4f88ff95a546f3410c2d770b79e9d61dfc7195e14ec3
+  metadata.gz: c303e1f7222b79e6a0dba629b08657078c104beb661338f721285462aabc3319e2546d6a3549921eb648f079d527c42d05954e4dd22f6455ec3c783ddbb9d92f
+  data.tar.gz: 21dbc5ae2cd26045afa6f9dfc0a0852fdb82470ee359fbb18236c655e45ca836301d178e8c9e4ad6fab018c3f95286d528152e2426b5cb6d28f6dcb9c07be0bf

data/app/controllers/admin_suite/resources_controller.rb

@@ -64,9 +64,10 @@ module AdminSuite
 
       executor = Admin::Base::ActionExecutor.new(resource_config, action, admin_suite_actor)
       result = executor.execute_member(@resource, params.to_unsafe_h)
+      redirect_target = result.redirect_url.presence || resource_url(@resource)
 
       if result.success?
-        redirect_to resource_url(@resource), notice: result.message
+        redirect_to redirect_target, notice: result.message
       else
         redirect_to resource_url(@resource), alert: result.message
       end
@@ -145,23 +146,20 @@ module AdminSuite
     end
 
     def set_resource
-      @resource = resource_class.find(params[:id])
-    rescue ActiveRecord::RecordNotFound
-      # Support "friendly" params (e.g. slugged records) without requiring host apps
-      # to change their model primary keys.
+      klass = resource_class
       id = params[:id].to_s
-      columns = resource_class.column_names
-
-      @resource =
-        if columns.include?("slug")
-          resource_class.find_by!(slug: id)
-        elsif columns.include?("uuid")
-          resource_class.find_by!(uuid: id)
-        elsif columns.include?("token")
-          resource_class.find_by!(token: id)
-        else
-          raise
-        end
+      columns = klass.column_names
+
+      # Prevent ActiveRecord from coercing UUID-ish params like "2ce3-..."
+      # into integer ids (e.g., 2) for integer primary keys.
+      if non_numeric_id_for_numeric_primary_key?(klass, id)
+        @resource = find_friendly_resource!(klass, id, columns)
+        return
+      end
+
+      @resource = klass.find(id)
+    rescue ActiveRecord::RecordNotFound
+      @resource = find_friendly_resource!(klass, id, columns)
     end
 
     def resource
@@ -214,8 +212,18 @@ module AdminSuite
         end
       end
 
-      key = resource_class.model_name.param_key
-      params.require(key).permit(permitted_fields + array_fields)
+      candidate_keys = []
+      candidate_keys << @resource.class.model_name.param_key if defined?(@resource) && @resource.present?
+      candidate_keys << resource_class.model_name.param_key
+      candidate_keys.uniq!
+
+      candidate_keys.each do |key|
+        if params.key?(key) || params.key?(key.to_sym)
+          return params.require(key).permit(permitted_fields + array_fields)
+        end
+      end
+
+      params.require(resource_class.model_name.param_key).permit(permitted_fields + array_fields)
     end
 
     def toggleable_fields
@@ -244,5 +252,33 @@ module AdminSuite
     def collection_url
       resources_path(portal: current_portal, resource_name: resource_name)
     end
+
+    def find_friendly_resource!(klass, id, columns = klass.column_names)
+      if columns.include?("slug")
+        record = klass.find_by(slug: id)
+        return record if record
+      end
+
+      if columns.include?("uuid")
+        record = klass.find_by(uuid: id)
+        return record if record
+      end
+
+      if columns.include?("token")
+        record = klass.find_by(token: id)
+        return record if record
+      end
+
+      raise ActiveRecord::RecordNotFound
+    end
+
+    def non_numeric_id_for_numeric_primary_key?(klass, id)
+      primary_key = klass.primary_key.to_s
+      return false if primary_key.blank?
+
+      pk_type = klass.columns_hash[primary_key]&.type
+      numeric_pk = %i[integer bigint].include?(pk_type)
+      numeric_pk && id !~ /\A\d+\z/
+    end
   end
 end

data/app/helpers/admin_suite/base_helper.rb

@@ -1079,6 +1079,16 @@ module AdminSuite
       current_label = if current_value.present? && collection.is_a?(Array)
         match = collection.find { |opt| opt.is_a?(Array) ? opt[1].to_s == current_value.to_s : opt.to_s == current_value.to_s }
         match.is_a?(Array) ? match[0] : match.to_s
+      elsif current_value.present? && collection.is_a?(String)
+        association_name = field.name.to_s.sub(/_id\z/, "")
+        assoc = resource.public_send(association_name) if resource.respond_to?(association_name)
+        if assoc.respond_to?(:name) && assoc.name.present?
+          assoc.name
+        elsif assoc.respond_to?(:title) && assoc.title.present?
+          assoc.title
+        else
+          current_value
+        end
       else
         current_value
       end
@@ -1088,7 +1098,8 @@ module AdminSuite
           controller: "admin-suite--searchable-select",
           "admin-suite--searchable-select-options-value": options_json,
           "admin-suite--searchable-select-creatable-value": field.create_url.present?,
-          "admin-suite--searchable-select-search-url-value": collection.is_a?(String) ? collection : ""
+          "admin-suite--searchable-select-search-url-value": collection.is_a?(String) ? collection : "",
+          "admin-suite--searchable-select-create-url-value": field.create_url.to_s
         },
         class: "relative") do
         concat(hidden_field_tag("#{param_key}[#{field.name}]", current_value, data: { "admin-suite--searchable-select-target": "input" }))

data/app/javascript/controllers/admin_suite/searchable_select_controller.js

@@ -11,6 +11,7 @@ export default class extends Controller {
     options: { type: Array, default: [] },
     creatable: { type: Boolean, default: false },
     searchUrl: { type: String, default: "" },
+    createUrl: { type: String, default: "" },
   }
 
   connect() {
@@ -55,16 +56,8 @@ export default class extends Controller {
         opt.label.toLowerCase().includes(query),
       )
 
-      if (
-        this.creatableValue &&
-        query &&
-        !this.filteredOptions.some((o) => o.value === query)
-      ) {
-        this.filteredOptions.push({
-          value: query,
-          label: `Create "${query}"`,
-          isNew: true,
-        })
+      if (this.creatableValue && query && !this.hasExactOptionMatch(query)) {
+        this.filteredOptions.push(this.buildCreateOption(query))
       }
 
       this.renderDropdown()
@@ -81,19 +74,11 @@ export default class extends Controller {
       const data = await response.json()
       this.filteredOptions = data.map((item) => ({
         value: item.id || item.value,
-        label: item.name || item.label,
+        label: item.name || item.title || item.label,
       }))
 
-      if (
-        this.creatableValue &&
-        query &&
-        !this.filteredOptions.some((o) => o.value === query)
-      ) {
-        this.filteredOptions.push({
-          value: query,
-          label: `Create "${query}"`,
-          isNew: true,
-        })
+      if (this.creatableValue && query && !this.hasExactOptionMatch(query)) {
+        this.filteredOptions.push(this.buildCreateOption(query))
       }
 
       this.renderDropdown()
@@ -117,7 +102,9 @@ export default class extends Controller {
               class="block w-full text-left px-3 py-2 text-sm hover:bg-slate-100 ${index === this.selectedIndex ? "bg-slate-100" : ""} ${opt.isNew ? "text-indigo-600 font-medium" : "text-slate-700"}"
               data-action="click->admin-suite--searchable-select#select"
               data-value="${opt.value}"
-              data-label="${opt.label}">
+              data-label="${opt.label}"
+              data-create-label="${opt.createLabel || ""}"
+              data-is-new="${opt.isNew ? "true" : "false"}">
         ${opt.label}
       </button>
     `,
@@ -125,18 +112,12 @@ export default class extends Controller {
       .join("")
   }
 
-  select(event) {
-    const value = event.currentTarget.dataset.value
-    const label = event.currentTarget.dataset.label
-      .replace(/^Create "/, "")
-      .replace(/"$/, "")
-
-    this.inputTarget.value = value
-    this.searchTarget.value = label
-    this.close()
+  async select(event) {
+    const option = this.optionFromElement(event.currentTarget)
+    await this.applyOption(option)
   }
 
-  keydown(event) {
+  async keydown(event) {
     switch (event.key) {
       case "ArrowDown":
         event.preventDefault()
@@ -154,12 +135,8 @@ export default class extends Controller {
       case "Enter":
         event.preventDefault()
         if (this.selectedIndex >= 0 && this.filteredOptions[this.selectedIndex]) {
-          const opt = this.filteredOptions[this.selectedIndex]
-          this.inputTarget.value = opt.value
-          this.searchTarget.value = opt.label
-            .replace(/^Create "/, "")
-            .replace(/"$/, "")
-          this.close()
+          const option = this.filteredOptions[this.selectedIndex]
+          await this.applyOption(option)
         }
         break
       case "Escape":
@@ -167,5 +144,111 @@ export default class extends Controller {
         break
     }
   }
+
+  hasExactOptionMatch(query) {
+    return this.filteredOptions.some((opt) => {
+      const value = String(opt.value || "").toLowerCase().trim()
+      const label = String(opt.label || "").toLowerCase().trim()
+      return value === query || label === query
+    })
+  }
+
+  buildCreateOption(query) {
+    return {
+      value: query,
+      label: `Create "${query}"`,
+      createLabel: query,
+      isNew: true,
+    }
+  }
+
+  optionFromElement(element) {
+    const isNew = element.dataset.isNew === "true"
+    return {
+      value: element.dataset.value,
+      label: isNew
+        ? element.dataset.createLabel || element.dataset.label
+        : element.dataset.label,
+      isNew,
+    }
+  }
+
+  async applyOption(option) {
+    if (!option) return
+
+    let value = option.value
+    let label = option.label || ""
+
+    if (option.isNew) {
+      if (!this.createUrlValue) {
+        this.showInlineError("Create URL is not configured for this field.")
+        return
+      }
+
+      const created = await this.createOption(label)
+      if (!created) return
+
+      value = created.id
+      label = created.name || created.title || label
+    }
+
+    this.inputTarget.value = value
+    this.searchTarget.value = label
+    this.close()
+  }
+
+  async createOption(label) {
+    const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content
+    this.searchTarget.disabled = true
+
+    try {
+      const response = await fetch(this.createUrlValue, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Accept: "application/json",
+          ...(csrfToken ? { "X-CSRF-Token": csrfToken } : {}),
+        },
+        body: JSON.stringify({
+          name: label,
+          title: label,
+        }),
+      })
+
+      const data = await response.json().catch(() => ({}))
+      if (!response.ok) {
+        const errors = Array.isArray(data?.errors) ? data.errors.join(", ") : null
+        this.showInlineError(errors || "Could not create this option.")
+        return null
+      }
+
+      if (!data?.id) {
+        this.showInlineError("Create endpoint returned no id.")
+        return null
+      }
+
+      return data
+    } catch (error) {
+      console.error("Create failed:", error)
+      this.showInlineError("Could not create this option.")
+      return null
+    } finally {
+      this.searchTarget.disabled = false
+    }
+  }
+
+  showInlineError(message) {
+    this.dropdownTarget.innerHTML = `
+      <div class="px-3 py-2 text-sm text-red-600">${this.escapeHtml(message)}</div>
+    `
+    this.dropdownTarget.classList.remove("hidden")
+    this.isOpen = true
+  }
+
+  escapeHtml(value) {
+    const div = document.createElement("div")
+    div.textContent = value
+    return div.innerHTML
+  }
 }
 

data/lib/admin/base/action_executor.rb

@@ -109,14 +109,33 @@ module Admin
 
       def execute_model_method(record, action, bang: false)
         method_name = bang ? "#{action.name}!" : action.name
-        record.public_send(method_name)
-        success_result("#{action.label} completed successfully")
+        action_result = record.public_send(method_name)
+        return action_result if action_result.is_a?(Result)
+
+        success_result(
+          "#{action.label} completed successfully",
+          redirect_url: redirect_url_for_action(action, action_result)
+        )
       rescue ActiveRecord::RecordInvalid => e
         failure_result("Validation failed: #{e.record.errors.full_messages.join(', ')}")
       rescue AASM::InvalidTransition => e
         failure_result("Invalid state transition: #{e.message}")
       end
 
+      def redirect_url_for_action(action, action_result)
+        return nil unless action.name.to_sym == :duplicate
+        return nil unless action_result.respond_to?(:persisted?) && action_result.persisted?
+        return nil unless resource_class.respond_to?(:portal_name) && resource_class.respond_to?(:resource_name_plural)
+
+        AdminSuite::Engine.routes.url_helpers.resource_path(
+          portal: resource_class.portal_name,
+          resource_name: resource_class.resource_name_plural,
+          id: action_result.to_param
+        )
+      rescue StandardError
+        nil
+      end
+
       def find_handler_class(action)
         if defined?(AdminSuite) && AdminSuite.config.resolve_action_handler.present?
           resolved = AdminSuite.config.resolve_action_handler.call(resource_class, action.name)

data/lib/admin_suite/version.rb

@@ -2,7 +2,7 @@
 
 module AdminSuite
   module Version
-    VERSION = "0.2.3"
+    VERSION = "0.2.5"
   end
 
   # Backward-compatible constant.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admin_suite
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - TechWright Labs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-14 00:00:00.000000000 Z
+date: 2026-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails