terrazzo 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2485c82e85ed664ba929d42f7aba8b3fd05d06c0c98f0e72cdf023108827c9b
-  data.tar.gz: 936dc1c90978c9e5a034ad1a99994eca021d09494bde07ffa08b452bf99b6641
+  metadata.gz: 7598c68c1691318c48e26a9b47176857414e6b1d0b72df96215941bd6f809ea5
+  data.tar.gz: e6f744d7131f5481d2b4a2c8c25db6a0547e96d9417eddc6edad0192805ad223
 SHA512:
-  metadata.gz: 2526b14b6bcd42a5d4eaee4ed9d3c6ce95a98f345a6e67ede0935e7fcdf7d455ce5afa1f012b52b26c9930706dcbd32dacb6062860f8a5cffac466045274db5e
-  data.tar.gz: 69b436459fb552a8569b1b9250f50335b9383c2bc7490d0ec9ce0c8c366c99b57f3c6d6fa9d44de21d5bb306192d6e80ae5ba6ab1cd4d25da4eb0b9e85046171
+  metadata.gz: 2b50169a5535e19fe88c591f4d6f44881f1e7923fb6559d3f50ef6091e5addf971eb789a30d2c8fb92a09eb2180ee1bec7d89bb824a6783bf2244560e17b7d40
+  data.tar.gz: 91a647284864eddc2f1d3ba22e658a02b4800415008720256b3e1d868fe62e50af20d05d8ed54cf4064e9267fdaab13480688f4de9236be8f59321bc0fa74362

data/README.md

@@ -1,6 +1,6 @@
 # Terrazzo
 
-Association forms load selected values first. `HasMany` and `BelongsTo` use server search with pages of 25 options. 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).
+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).
 

data/app/controllers/terrazzo/application_controller.rb

@@ -282,7 +282,7 @@ module Terrazzo
       return head :not_found unless field.association_options?
 
       response.headers["Cache-Control"] = "no-store"
-      render json: field.association_options(search: params[:search], page: params[:page])
+      render json: field.association_options(search: params[:search])
     end
 
     def resolver

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

@@ -24,8 +24,7 @@ export function AssociationSelect({
   );
   const [open, setOpen] = useState(false);
   const [search, setSearch] = useState("");
-  const [page, setPage] = useState(1);
-  const [result, setResult] = useState({ resourceOptions: [], hasMore: false });
+  const [result, setResult] = useState({ resourceOptions: [] });
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState("");
   const [retry, setRetry] = useState(0);
@@ -40,7 +39,6 @@ export function AssociationSelect({
       try {
         const url = new URL(options.optionsUrl, window.location.origin);
         url.searchParams.set("search", search);
-        url.searchParams.set("page", String(page));
         const response = await window.fetch(url, {
           headers: { Accept: "application/json" },
           signal: controller.signal,
@@ -61,7 +59,7 @@ export function AssociationSelect({
       clearTimeout(timer);
       controller.abort();
     };
-  }, [open, search, page, options.optionsUrl, retry]);
+  }, [open, search, options.optionsUrl, retry]);
 
   const select = (option) => {
     const id = option[1];
@@ -150,7 +148,6 @@ export function AssociationSelect({
             className="w-full rounded border px-2 py-1"
             onChange={(event) => {
               setSearch(event.target.value);
-              setPage(1);
               setLoading(true);
             }}
           />
@@ -187,29 +184,6 @@ export function AssociationSelect({
               ))}
             </div>
           )}
-          <div className="flex items-center justify-between">
-            <button
-              type="button"
-              disabled={loading || page === 1}
-              onClick={() => {
-                setPage(page - 1);
-                setLoading(true);
-              }}
-            >
-              Previous
-            </button>
-            <span>Page {page}</span>
-            <button
-              type="button"
-              disabled={loading || !!error || !result.hasMore}
-              onClick={() => {
-                setPage(page + 1);
-                setLoading(true);
-              }}
-            >
-              Next
-            </button>
-          </div>
         </PopoverContent>
       </Popover>
       {!multiple && selectedIds.length > 0 && (

data/lib/terrazzo/field/associative.rb

@@ -1,20 +1,17 @@
 module Terrazzo
   module Field
     class Associative < Base
-      OPTION_PAGE_SIZE = 25
+      OPTION_LIMIT = 10
 
-      def association_options(search:, page:)
-        page = [page.to_i, 1].max
+      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.offset((page - 1) * OPTION_PAGE_SIZE).limit(OPTION_PAGE_SIZE + 1).to_a
+        records = scope.limit(OPTION_LIMIT).to_a
         {
-          resourceOptions: records.first(OPTION_PAGE_SIZE).map { |record| option_for(record) },
-          page: page,
-          hasMore: records.length > OPTION_PAGE_SIZE
+          resourceOptions: records.map { |record| option_for(record) }
         }
       end
 

data/lib/terrazzo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terrazzo
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Terrazzo Contributors