Merge pull request #11028 from neinteractiveliterature/nbudin/issue10759

Change event catalog search box to be full text, not just title

Author: nbudin

app/graphql/types/event_filters_input_type.rb

@@ -3,6 +3,7 @@ class Types::EventFiltersInputType < Types::BaseInputObject
   argument :category, [Integer, { null: true }], required: false
   argument :form_items, GraphQL::Types::JSON, required: false, camelize: false
   argument :my_rating, [Integer], required: false, camelize: false
+  argument :text_search, String, required: false, camelize: false
   argument :title, String, required: false
   argument :title_prefix, String, required: false, camelize: false
 end

app/javascript/EventsApp/EventCatalog/EventList/index.tsx

@@ -36,7 +36,7 @@ const PAGE_SIZE = 20;
 const filterCodecs = buildFieldFilterCodecs({
   category: FilterCodecs.integerArray,
   my_rating: FilterCodecs.integerArray,
-  title_prefix: FilterCodecs.nonEmptyString,
+  text_search: FilterCodecs.nonEmptyString,
   form_items: FilterCodecs.json,
 });
 
@@ -150,8 +150,8 @@ function EventList(): React.JSX.Element {
     [changeFilterValue],
   );
 
-  const titlePrefixChanged = useCallback(
-    (value: unknown) => changeFilterValue('title_prefix', value),
+  const textSearchChanged = useCallback(
+    (value: unknown) => changeFilterValue('text_search', value),
     [changeFilterValue],
   );
 
@@ -183,7 +183,7 @@ function EventList(): React.JSX.Element {
 
   return (
     <>
-      <h1>Event Catalog</h1>
+      <h1>{t('navigation.events.eventCatalog')}</h1>
 
       <EventCatalogNavTabs />
 
@@ -232,9 +232,9 @@ function EventList(): React.JSX.Element {
 
           <div className="ms-2 flex-grow-1">
             <SearchInput
-              label="Search"
-              value={effectiveFilters.find(({ id }) => id === 'title_prefix')?.value as string | undefined}
-              onChange={titlePrefixChanged}
+              label={t('events.catalog.textSearchLabel')}
+              value={effectiveFilters.find(({ id }) => id === 'text_search')?.value as string | undefined}
+              onChange={textSearchChanged}
               iconSet="bootstrap-icons"
             />
           </div>

app/javascript/graphqlTypes.generated.ts

@@ -2960,6 +2960,7 @@ export type EventFiltersInput = {
   category?: InputMaybe<Array<InputMaybe<Scalars['Int']['input']>>>;
   form_items?: InputMaybe<Scalars['JSON']['input']>;
   my_rating?: InputMaybe<Array<Scalars['Int']['input']>>;
+  text_search?: InputMaybe<Scalars['String']['input']>;
   title?: InputMaybe<Scalars['String']['input']>;
   title_prefix?: InputMaybe<Scalars['String']['input']>;
 };

app/presenters/tables/events_table_results_presenter.rb

@@ -37,6 +37,16 @@ def apply_filter(scope, value)
     end
   end
 
+  field :text_search, "Text search" do
+    def apply_filter(scope, value)
+      scope.where(id: PgSearch.multisearch(value).where(searchable_type: "Event").select(:searchable_id))
+    end
+
+    def sql_order(_direction)
+      nil
+    end
+  end
+
   field :my_rating, "My rating" do
     delegate :user_con_profile, :pundit_user, to: :presenter
 

locales/en.json

@@ -749,7 +749,8 @@
     "catalog": {
       "author_one": "Author",
       "author_other": "Authors",
-      "organization": "Organization"
+      "organization": "Organization",
+      "textSearchLabel": "Search"
     },
     "categoryDropdown": {
       "allCategoriesLabel": "All event types",

schema.graphql

@@ -3713,6 +3713,7 @@ input EventFiltersInput {
   category: [Int]
   form_items: JSON
   my_rating: [Int!]
+  text_search: String
   title: String
   title_prefix: String
 }

schema.json

@@ -15770,6 +15770,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "text_search",
+              "description": null,
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null,
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "title",
               "description": null,