terrazzo 0.7.5 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '084ca2853c7f77397ca86d6530e21abe0d61819a464a6ce352b2c9230ae2d95f'
-  data.tar.gz: b2b7a278bd069090a23ef1c4edbb73a7e793af55eca3941225dff5695d90e92c
+  metadata.gz: 7598c68c1691318c48e26a9b47176857414e6b1d0b72df96215941bd6f809ea5
+  data.tar.gz: e6f744d7131f5481d2b4a2c8c25db6a0547e96d9417eddc6edad0192805ad223
 SHA512:
-  metadata.gz: e1dc0b5cb17ff57bf6261cd3eafc85583473d52e5898be93c54114972cc4d7d926a653bdbf1073ba8bec5b90c4526b314ec05d8c40e7771af608e2a986b920d8
-  data.tar.gz: 01b2c4e3ba0b24076b7a1c0bd90e8f55a70b0b03a11b04963fef2d130939350d0b34d0d95602c04ef9020f3029ac8afdab3220859c8b5f243cf5bb512ad3b5c7
+  metadata.gz: 2b50169a5535e19fe88c591f4d6f44881f1e7923fb6559d3f50ef6091e5addf971eb789a30d2c8fb92a09eb2180ee1bec7d89bb824a6783bf2244560e17b7d40
+  data.tar.gz: 91a647284864eddc2f1d3ba22e658a02b4800415008720256b3e1d868fe62e50af20d05d8ed54cf4064e9267fdaab13480688f4de9236be8f59321bc0fa74362

data/README.md

@@ -1,5 +1,7 @@
 # Terrazzo
 
+Association forms load selected values first. `HasMany` and `BelongsTo` use typeahead search with at most 10 matches. Upgrade the gem and npm package together. Custom association form components must use the new option query contract; see [custom fields](docs/customizing-fields.md).
+
 A drop-in admin panel for Rails apps. Uses the [Administrate](https://github.com/thoughtbot/administrate) dashboard DSL with a React SPA frontend powered by [Superglue](https://github.com/thoughtbot/superglue).
 
 [![CI](https://github.com/gohypelab/terrazzo/actions/workflows/ci.yml/badge.svg)](https://github.com/gohypelab/terrazzo/actions/workflows/ci.yml)

data/app/controllers/terrazzo/application_controller.rb

@@ -58,12 +58,14 @@ module Terrazzo
     def new
       @resource = resource_class.new
       authorize_action!(@resource, :new)
+      return render_association_options("create") if params[:association].present?
       @page = Terrazzo::Page::Form.new(dashboard, @resource)
     end
 
     def edit
       @resource = find_resource(params[:id])
       authorize_action!(@resource, :edit)
+      return render_association_options("update") if params[:association].present?
       @page = Terrazzo::Page::Form.new(dashboard, @resource)
     end
 
@@ -271,6 +273,18 @@ module Terrazzo
 
     private
 
+    def render_association_options(action)
+      attribute = params[:association].to_s
+      attributes = dashboard.flatten_attributes(dashboard.form_attributes(action))
+      return head :not_found unless attributes.map(&:to_s).include?(attribute)
+
+      field = dashboard.attribute_type_for(attribute.to_sym).new(attribute.to_sym, nil, :form, resource: @resource)
+      return head :not_found unless field.association_options?
+
+      response.headers["Cache-Control"] = "no-store"
+      render json: field.association_options(search: params[:search])
+    end
+
     def resolver
       @_resolver ||= Terrazzo::ResourceResolver.new(controller_path)
     end

data/app/helpers/terrazzo/resource_paths_helper.rb

@@ -1,5 +1,16 @@
 module Terrazzo
   module ResourcePathsHelper
+    def association_options_path(field)
+      url_for(
+        controller: controller_path,
+        action: field.resource.persisted? ? :edit : :new,
+        id: field.resource.persisted? ? terrazzo_resource_param(field.resource) : nil,
+        association: field.attribute,
+        only_path: true,
+        format: :json
+      )
+    end
+
     def terrazzo_resource_collection_path(resource_or_class = resource_class)
       url_for(
         controller: terrazzo_resource_controller_path(resource_or_class),

data/app/views/terrazzo/application/_edit_base.json.props

@@ -30,26 +30,17 @@ json.form do
       json.hint dashboard.attribute_hint(field.attribute, :form)
       json.fieldType field.field_type
       json.value field.serialize_value(:form)
-      json.options field.serializable_options(:form)
+      options = field.serializable_options(:form)
+      options[:optionsUrl] = association_options_path(field) if field.association_options?
+      json.options options
       json.required field.required?
       json.input field.form_input_attributes(param_key)
     end
   end
   json.fieldGroups do
-    json.array! @page.grouped_attributes("update") do |group|
+    json.array! @page.attribute_groups("update") do |group|
       json.name group[:name]
-      json.fields do
-        json.array! group[:fields] do |field|
-          json.attribute field.attribute.to_s
-          json.label dashboard.attribute_label(field.attribute, :form)
-          json.hint dashboard.attribute_hint(field.attribute, :form)
-          json.fieldType field.field_type
-          json.value field.serialize_value(:form)
-          json.options field.serializable_options(:form)
-          json.required field.required?
-          json.input field.form_input_attributes(param_key)
-        end
-      end
+      json.attributes group[:attributes]
     end
   end
 end

data/app/views/terrazzo/application/_new_base.json.props

@@ -26,26 +26,17 @@ json.form do
       json.hint dashboard.attribute_hint(field.attribute, :form)
       json.fieldType field.field_type
       json.value field.serialize_value(:form)
-      json.options field.serializable_options(:form)
+      options = field.serializable_options(:form)
+      options[:optionsUrl] = association_options_path(field) if field.association_options?
+      json.options options
       json.required field.required?
       json.input field.form_input_attributes(param_key)
     end
   end
   json.fieldGroups do
-    json.array! @page.grouped_attributes(action) do |group|
+    json.array! @page.attribute_groups(action) do |group|
       json.name group[:name]
-      json.fields do
-        json.array! group[:fields] do |field|
-          json.attribute field.attribute.to_s
-          json.label dashboard.attribute_label(field.attribute, :form)
-          json.hint dashboard.attribute_hint(field.attribute, :form)
-          json.fieldType field.field_type
-          json.value field.serialize_value(:form)
-          json.options field.serializable_options(:form)
-          json.required field.required?
-          json.input field.form_input_attributes(param_key)
-        end
-      end
+      json.attributes group[:attributes]
     end
   end
 end

data/lib/generators/terrazzo/views/templates/components/AssociationSelect.jsx

@@ -0,0 +1,200 @@
+import React, { useEffect, useId, useState } from "react";
+import { Label, Popover, PopoverContent, PopoverTrigger } from "./ui";
+
+export function AssociationSelect({
+  value,
+  options,
+  input,
+  label,
+  required,
+  multiple = false,
+  onChange,
+}) {
+  const popupId = useId();
+  const [selectedIds, setSelectedIds] = useState(() =>
+    (multiple
+      ? (value ?? [])
+      : value == null || value === ""
+        ? []
+        : [value]
+    ).map(String),
+  );
+  const [selectedOptions, setSelectedOptions] = useState(
+    options.resourceOptions,
+  );
+  const [open, setOpen] = useState(false);
+  const [search, setSearch] = useState("");
+  const [result, setResult] = useState({ resourceOptions: [] });
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState("");
+  const [retry, setRetry] = useState(0);
+
+  useEffect(() => {
+    if (!open) return;
+    const controller = new window.AbortController();
+    let active = true;
+    setLoading(true);
+    setError("");
+    const timer = setTimeout(async () => {
+      try {
+        const url = new URL(options.optionsUrl, window.location.origin);
+        url.searchParams.set("search", search);
+        const response = await window.fetch(url, {
+          headers: { Accept: "application/json" },
+          signal: controller.signal,
+          credentials: "same-origin",
+        });
+        if (!response.ok) throw new Error("Could not load options.");
+        const data = await response.json();
+        if (active) setResult(data);
+      } catch (failure) {
+        if (active && failure.name !== "AbortError")
+          setError("Could not load options.");
+      } finally {
+        if (active) setLoading(false);
+      }
+    }, 200);
+    return () => {
+      active = false;
+      clearTimeout(timer);
+      controller.abort();
+    };
+  }, [open, search, options.optionsUrl, retry]);
+
+  const select = (option) => {
+    const id = option[1];
+    const nextIds = multiple
+      ? selectedIds.includes(id)
+        ? selectedIds.filter((item) => item !== id)
+        : [...selectedIds, id]
+      : [id];
+    const nextOptions = [
+      ...selectedOptions.filter((item) => item[1] !== id),
+      option,
+    ].filter((item) => nextIds.includes(item[1]));
+    setSelectedIds(nextIds);
+    setSelectedOptions(nextOptions);
+    onChange?.(multiple ? nextIds : id, option);
+    if (!multiple) setOpen(false);
+  };
+
+  const remove = (id) => {
+    const nextIds = selectedIds.filter((item) => item !== id);
+    setSelectedIds(nextIds);
+    setSelectedOptions((items) => items.filter((item) => item[1] !== id));
+    onChange?.(multiple ? nextIds : "", null);
+  };
+
+  return (
+    <div className="space-y-2">
+      {label && (
+        <Label htmlFor={input?.id}>
+          {label}
+          {required && " *"}
+        </Label>
+      )}
+      {input?.name && <input type="hidden" name={input.name} value="" />}
+      {input?.name &&
+        selectedIds.map((id) => (
+          <input key={id} type="hidden" name={input.name} value={id} />
+        ))}
+      {multiple && (
+        <div className="flex flex-wrap gap-1">
+          {selectedOptions
+            .filter((option) => selectedIds.includes(option[1]))
+            .map(([display, id]) => (
+              <button
+                key={id}
+                type="button"
+                className="rounded bg-muted px-2 py-1 text-sm"
+                aria-label={`Remove ${display}`}
+                onClick={() => remove(id)}
+              >
+                {display} ×
+              </button>
+            ))}
+        </div>
+      )}
+      <Popover
+        open={open}
+        onOpenChange={(next) => {
+          setOpen(next);
+          if (next) setLoading(true);
+        }}
+      >
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            id={input?.id}
+            aria-describedby={input?.["aria-describedby"]}
+            role="combobox"
+            aria-expanded={open}
+            aria-controls={popupId}
+            aria-haspopup="dialog"
+            className="flex min-h-10 w-full items-center rounded-md border px-3 py-2 text-sm"
+          >
+            {multiple
+              ? "Select items…"
+              : (selectedOptions.find(
+                  (option) => option[1] === selectedIds[0],
+                )?.[0] ?? "Select…")}
+          </button>
+        </PopoverTrigger>
+        <PopoverContent id={popupId} className="w-80 space-y-2">
+          <input
+            aria-label={`Search ${label ?? "options"}`}
+            value={search}
+            placeholder="Search…"
+            className="w-full rounded border px-2 py-1"
+            onChange={(event) => {
+              setSearch(event.target.value);
+              setLoading(true);
+            }}
+          />
+          {loading ? (
+            <p role="status">Loading…</p>
+          ) : error ? (
+            <div role="alert">
+              {error}{" "}
+              <button
+                type="button"
+                onClick={() => setRetry((count) => count + 1)}
+              >
+                Retry
+              </button>
+            </div>
+          ) : (
+            <div
+              className="max-h-60 overflow-y-auto"
+              role="group"
+              aria-label="Options"
+            >
+              {result.resourceOptions.length === 0 && <p>No results found.</p>}
+              {result.resourceOptions.map((option) => (
+                <button
+                  key={option[1]}
+                  type="button"
+                  aria-pressed={selectedIds.includes(option[1])}
+                  className="block w-full rounded px-2 py-1 text-left hover:bg-muted"
+                  onClick={() => select(option)}
+                >
+                  {selectedIds.includes(option[1]) ? "✓ " : ""}
+                  {option[0]}
+                </button>
+              ))}
+            </div>
+          )}
+        </PopoverContent>
+      </Popover>
+      {!multiple && selectedIds.length > 0 && (
+        <button
+          type="button"
+          className="text-sm text-muted-foreground"
+          onClick={() => remove(selectedIds[0])}
+        >
+          Clear selection
+        </button>
+      )}
+    </div>
+  );
+}

data/lib/generators/terrazzo/views/templates/fields/belongs_to/FormField.jsx

@@ -1,29 +1,6 @@
 import React from "react";
+import { AssociationSelect } from "../../components";
 
-import { Label } from "../../components/ui";
-
-export function FormField({ value, label, input, options, required }) {
-  const resourceOptions = options?.resourceOptions ?? [];
-
-  return (
-    <div className="space-y-2">
-      {label &&
-      <Label htmlFor={input?.id}>
-          {label}{required && <span className="text-destructive"> *</span>}
-        </Label>
-      }
-      <select
-        defaultValue={value != null ? String(value) : ""}
-        className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
-        {...input}>
-
-        <option value="">Select...</option>
-        {resourceOptions.map(([display, id]) =>
-        <option key={id} value={id}>
-            {display}
-          </option>
-        )}
-      </select>
-    </div>);
-
+export function FormField(props) {
+  return <AssociationSelect {...props} />;
 }

data/lib/generators/terrazzo/views/templates/fields/has_many/FormField.jsx

@@ -1,151 +1,6 @@
-import React, { useState, useRef, useCallback } from "react";
-import { X, Check } from "lucide-react";
-
-import { Label } from "../../components/ui";
-import { Badge } from "../../components/ui";
-import { Popover, PopoverTrigger, PopoverContent } from "../../components/ui";
-import { cn } from "terrazzo";
-
-export function FormField({ value, label, input, options, required }) {
-  const resourceOptions = options?.resourceOptions ?? [];
-  const initialIds = value ?? [];
-
-  const [selectedIds, setSelectedIds] = useState(() => new Set(initialIds));
-  const [search, setSearch] = useState("");
-  const [open, setOpen] = useState(false);
-  const inputRef = useRef(null);
-
-  const inputProps = input;
-  const inputName = inputProps?.name;
-  const inputId = inputProps?.id;
-
-  const toggleOption = useCallback((id) => {
-    setSelectedIds((prev) => {
-      const next = new Set(prev);
-      if (next.has(id)) {
-        next.delete(id);
-      } else {
-        next.add(id);
-      }
-      return next;
-    });
-    setSearch("");
-  }, []);
-
-  const removeOption = useCallback((id, e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    setSelectedIds((prev) => {
-      const next = new Set(prev);
-      next.delete(id);
-      return next;
-    });
-  }, []);
-
-  const selectedOptions = resourceOptions.filter(([, id]) => selectedIds.has(id));
-  const filteredOptions = resourceOptions.filter(([display]) =>
-  display.toLowerCase().includes(search.toLowerCase())
-  );
-
-  return (
-    <div className="space-y-2">
-      {label &&
-      <Label htmlFor={inputId}>
-          {label}{required && <span className="text-destructive"> *</span>}
-        </Label>
-      }
-
-      {/* Hidden inputs for form submission */}
-      {inputName && <input type="hidden" name={inputName} value="" />}
-      {selectedIds.size > 0 && inputName &&
-      Array.from(selectedIds).map((id) =>
-      <input key={id} type="hidden" name={inputName} value={id} />
-      )
-      }
-
-      <Popover open={open} onOpenChange={setOpen}>
-        <PopoverTrigger asChild>
-          <button
-            type="button"
-            role="combobox"
-            aria-expanded={open}
-            id={inputId}
-            className={cn(
-              "flex min-h-10 w-full flex-wrap items-center gap-1 rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background",
-              "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
-              "hover:bg-accent/50 cursor-pointer"
-            )}>
-
-            {selectedOptions.length > 0 ?
-            selectedOptions.map(([display, id]) =>
-            <Badge key={id} variant="secondary" className="gap-1">
-                  {display}
-                  <span
-                role="button"
-                tabIndex={0}
-                className="ml-0.5 rounded-full outline-none hover:bg-muted-foreground/20 focus:bg-muted-foreground/20"
-                onPointerDown={(e) => removeOption(id, e)}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" || e.key === " ") {
-                    e.preventDefault();
-                    removeOption(id, e);
-                  }
-                }}>
-
-                    <X className="h-3 w-3" />
-                  </span>
-                </Badge>
-            ) :
-
-            <span className="text-muted-foreground">Select {label?.toLowerCase() ?? "items"}...</span>
-            }
-          </button>
-        </PopoverTrigger>
-        <PopoverContent
-          className="p-0"
-          onOpenAutoFocus={(e) => {
-            e.preventDefault();
-            inputRef.current?.focus();
-          }}>
-
-          <div className="p-2 border-b">
-            <input
-              ref={inputRef}
-              type="text"
-              className="flex h-8 w-full rounded-md bg-transparent px-2 py-1 text-sm outline-none placeholder:text-muted-foreground"
-              placeholder={`Search ${label?.toLowerCase() ?? "items"}...`}
-              value={search}
-              onChange={(e) => setSearch(e.target.value)} />
-
-          </div>
-          <div className="max-h-60 overflow-y-auto p-1">
-            {filteredOptions.length === 0 ?
-            <div className="px-2 py-4 text-center text-sm text-muted-foreground">
-                No results found.
-              </div> :
-
-            filteredOptions.map(([display, id]) => {
-              const isSelected = selectedIds.has(id);
-              return (
-                <button
-                  key={id}
-                  type="button"
-                  className={cn(
-                    "flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-sm cursor-pointer",
-                    "outline-none hover:bg-accent hover:text-accent-foreground",
-                    "focus:bg-accent focus:text-accent-foreground"
-                  )}
-                  onClick={() => toggleOption(id)}>
-
-                    <Check className={cn("h-4 w-4 shrink-0", isSelected ? "opacity-100" : "opacity-0")} />
-                    {display}
-                  </button>);
-
-            })
-            }
-          </div>
-        </PopoverContent>
-      </Popover>
-    </div>);
+import React from "react";
+import { AssociationSelect } from "../../components";
 
+export function FormField(props) {
+  return <AssociationSelect {...props} multiple />;
 }

data/lib/generators/terrazzo/views/templates/pages/_form.jsx

@@ -7,6 +7,7 @@ export function AdminForm({ form = {}, errors = [] }) {
   const { props: formProps = {}, extras = {}, fieldGroups = [], fields = [] } = form;
   const groups = Array.isArray(fieldGroups) ? fieldGroups : [];
   const hasFieldGroups = groups.length > 0;
+  const fieldsByAttribute = new Map(fields.map((field) => [field.attribute, field]));
 
   const renderField = (field) => {
     const hintId = field.hint && field.input?.id ? `${field.input.id}_hint` : null;
@@ -15,7 +16,7 @@ export function AdminForm({ form = {}, errors = [] }) {
       field.input;
 
     return (
-      <div key={field.attribute} className="space-y-2">
+      <div key={`${field.attribute}:${JSON.stringify(field.value)}`} className="space-y-2">
         <FieldRenderer
           mode="form"
           fieldType={field.fieldType}
@@ -63,7 +64,7 @@ export function AdminForm({ form = {}, errors = [] }) {
                   <legend className="text-lg font-semibold">{group.name}</legend>
                 )}
                 <div className="space-y-6">
-                  {(group.fields || []).map((field) => renderField(field))}
+                  {group.attributes.map((attribute) => renderField(fieldsByAttribute.get(attribute)))}
                 </div>
               </fieldset>
             )}

data/lib/terrazzo/field/associative.rb

@@ -1,6 +1,40 @@
 module Terrazzo
   module Field
     class Associative < Base
+      OPTION_LIMIT = 10
+
+      def association_options(search:)
+        scope = candidate_scope
+        columns = options[:searchable_fields] || (%w[name title email slug code original_filename id] &
+          (associated_class.column_names + associated_class.stored_attributes.values.flatten.map(&:to_s)))
+        scope = Terrazzo::Search.new(scope, nil, search).run_for_columns(columns)
+        scope = scope.reorder(options[:order] || association_primary_key).order(association_primary_key)
+        records = scope.limit(OPTION_LIMIT).to_a
+        {
+          resourceOptions: records.map { |record| option_for(record) }
+        }
+      end
+
+      def selected_resource_options
+        records = data.nil? ? [] : (data.respond_to?(:to_ary) ? data.to_ary : [data])
+        records.map { |record| option_for(record) }
+      end
+
+      def candidate_scope
+        scope = if options[:scope].is_a?(Proc)
+          options[:scope].call(associated_class)
+        elsif options[:scope]
+          associated_class.public_send(options[:scope])
+        else
+          associated_class.all
+        end
+        options.key?(:includes) ? scope.includes(*options[:includes]) : scope
+      end
+
+      def option_for(record)
+        [display_name(record), record.public_send(association_primary_key).to_s]
+      end
+
       class << self
         def associative?
           true

data/lib/terrazzo/field/base.rb

@@ -24,6 +24,10 @@ module Terrazzo
         {}
       end
 
+      def association_options?
+        false
+      end
+
       def required?
         return false unless resource
 

data/lib/terrazzo/field/belongs_to.rb

@@ -1,6 +1,10 @@
 module Terrazzo
   module Field
     class BelongsTo < Associative
+      def association_options?
+        true
+      end
+
       def serialize_value(mode)
         case mode
         when :form
@@ -13,11 +17,7 @@ module Terrazzo
 
       def serializable_options(page = nil)
         return {} unless page == :form && resource
-        collection = ordered_resource_options
-        if options[:include_blank]
-          collection = [["", nil]] + collection
-        end
-        { resourceOptions: collection }
+        { resourceOptions: selected_resource_options }
       end
 
       class << self
@@ -35,20 +35,6 @@ module Terrazzo
 
       private
 
-      def ordered_resource_options
-        return [] unless associated_class
-        scope = if options[:scope].is_a?(Proc)
-          options[:scope].call(associated_class)
-        elsif options[:scope]
-          associated_class.public_send(options[:scope])
-        else
-          associated_class.all
-        end
-        scope = scope.reorder(options[:order]) if options[:order]
-        pk = association_primary_key
-        scope.map { |r| [display_name(r), r.public_send(pk).to_s] }
-      end
-
       def foreign_key_value
         return nil unless resource
 

data/lib/terrazzo/field/has_many.rb

@@ -3,6 +3,10 @@ module Terrazzo
     class HasMany < Associative
       DEFAULT_PER_PAGE = 5
 
+      def association_options?
+        true
+      end
+
       def serialize_value(mode)
         return nil if data.nil?
 
@@ -13,7 +17,7 @@ module Terrazzo
           label = label.singularize if count == 1
           { count: count, label: label }
         when :form
-          data.map { |r| r.id.to_s }
+          data.map { |r| r.public_send(association_primary_key).to_s }
         when :show
           serialize_show_value
         else
@@ -24,7 +28,7 @@ module Terrazzo
       def serializable_options(page = nil)
         opts = {}
         if page == :form && resource
-          opts[:resourceOptions] = resource_options
+          opts[:resourceOptions] = selected_resource_options
         end
         if options.key?(:render_actions)
           opts[:renderActions] = options[:render_actions]
@@ -187,20 +191,6 @@ module Terrazzo
         }.compact
       end
 
-      def resource_options
-        return [] unless associated_class
-        scope = if options[:scope].is_a?(Proc)
-          options[:scope].call(associated_class)
-        elsif options[:scope]
-          associated_class.public_send(options[:scope])
-        else
-          associated_class.all
-        end
-        scope = scope.includes(*options[:includes]) if options.key?(:includes)
-        pk = association_primary_key
-        scope.map { |r| [display_name(r), r.public_send(pk).to_s] }
-      end
-
       def apply_sorting(records)
         sort_by = options[:sort_by]
         return records unless sort_by

data/lib/terrazzo/page/form.rb

@@ -13,6 +13,12 @@ module Terrazzo
         normalize_groups(attrs, :form)
       end
 
+      def attribute_groups(action = nil)
+        attrs = dashboard.form_attributes(action)
+        groups = attrs.is_a?(Hash) ? attrs : { "" => attrs }
+        groups.map { |name, fields| { name: name, attributes: fields.map(&:to_s) } }
+      end
+
       def attributes(action = nil)
         attrs = dashboard.form_attributes(action)
         dashboard.flatten_attributes(attrs).map do |attr|

data/lib/terrazzo/search.rb

@@ -12,6 +12,16 @@ module Terrazzo
       term.blank? ? scoped_resource : search_results
     end
 
+    def run_for_columns(columns)
+      return scoped_resource if term.blank?
+      return scoped_resource.none if columns.empty?
+
+      conditions = columns.map do |column|
+        text_attribute(scoped_resource.model, column).matches(search_pattern, LIKE_ESCAPE)
+      end
+      scoped_resource.where(conditions.reduce(:or))
+    end
+
     private
 
     LIKE_ESCAPE = "\\"

data/lib/terrazzo/version.rb

@@ -1,3 +1,3 @@
 module Terrazzo
-  VERSION = "0.7.5"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors:
 - Terrazzo Contributors
@@ -193,6 +193,7 @@ files:
 - lib/generators/terrazzo/views/new_generator.rb
 - lib/generators/terrazzo/views/page_mapping_helper.rb
 - lib/generators/terrazzo/views/show_generator.rb
+- lib/generators/terrazzo/views/templates/components/AssociationSelect.jsx
 - lib/generators/terrazzo/views/templates/components/CollectionFilters.jsx
 - lib/generators/terrazzo/views/templates/components/CollectionItemActions.jsx
 - lib/generators/terrazzo/views/templates/components/CollectionToolbarActions.jsx