Merge branch '25086-idra-news-events-split' into main

eaudeweb · Jun 4, 2024 · 0515777 · 0515777
2 parents 726aafc + de036cb
commit 0515777
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 21 deletions.
diff --git a/packages/next-drupal/src/components/blocks/FacetedSearch/FacetedSearch/FacetedSearch.tsx b/packages/next-drupal/src/components/blocks/FacetedSearch/FacetedSearch/FacetedSearch.tsx
@@ -106,13 +106,20 @@ const FacetedSearch: React.FC<FacetedSearchProps> = ({ searchIndex }) => {
                     )}
                 </Flex>
               )}
-              <SearchListing
-                appConfig={appConfig}
-                meta={meta}
-                results={items || []}
-                searchIndex={searchIndex}
-                searchText={searchText}
-              />
+              {total > 0 && (
+                <SearchListing
+                  appConfig={appConfig}
+                  meta={meta}
+                  results={items || []}
+                  searchIndex={searchIndex}
+                  searchText={searchText}
+                />
+              )}
+              {total == 0 && appConfig.emptyText && (
+                <Flex>
+                  {appConfig.emptyText}
+                </Flex>
+              )}
             </Container>
             {total > 0 && (
               <Pagination

diff --git a/packages/next-drupal/src/components/blocks/FacetedSearch/TabsFilters.tsx b/packages/next-drupal/src/components/blocks/FacetedSearch/TabsFilters.tsx
@@ -20,7 +20,8 @@ interface TabsFiltersProps {
   id: string
   onChange: (id: string, value: string) => void
   options: TabOption[]
-  value: string[]
+  value: string[],
+  hideShowAll?: boolean,
 }
 
 const TabsFilters: React.FC<TabsFiltersProps> = ({
@@ -29,24 +30,27 @@ const TabsFilters: React.FC<TabsFiltersProps> = ({
   onChange,
   options,
   value,
+  hideShowAll,
 }) => {
   return (
     <div className="search-tabs-filters">
-      <Button
-        className={classNames({
-          active: value.length === 0,
-        })}
-        shape="round"
-        onClick={() => onChange(id, '')}
-        {...ButtonOptionProps}
-      >
-        Show All
-      </Button>
+      {!hideShowAll && (
+        <Button
+          className={classNames({
+            active: value.length === 0,
+          })}
+          shape="round"
+          onClick={() => onChange(id, '')}
+          {...ButtonOptionProps}
+        >
+          Show All
+        </Button>
+      )}
       {options.map((option) => (
         <Button
           key={option.values.value}
           className={classNames({
-            active: value.includes(option.values.value),
+            active: value.includes(option.values.value)
           })}
           shape="round"
           onClick={() => onChange(id, option.values.value)}

diff --git a/packages/next-drupal/src/hooks/useSearchApp.ts b/packages/next-drupal/src/hooks/useSearchApp.ts
@@ -126,10 +126,29 @@ export const useSearchApp = (
     djap.addFilter('field_date', todayDate, '>')
   }
 
-  // EVENTS SORT
+  // EVENTS SORT/FILTER
   if (searchIndex === 'events') {
     if (sort?.date?.field) {
-      djap.addSort(sort.date.field)
+      let dateFilter = djap.getQueryObject()?.filter?.date;
+
+      // If there is no date filter, default to showing upcoming events.
+      if (!dateFilter) {
+        // relative_date_facets module transforms a single date filter
+        // into a range.
+        // We need to set a future date so that the module will return
+        // all future events between now and +100 years.
+        let futureDate = new Date();
+        futureDate.setFullYear(futureDate.getFullYear() + 100);
+        dateFilter = futureDate.toISOString().split('T')[0];
+        djap.addFilter('date', dateFilter)
+      }
+
+      let sortField = sort.date.field;
+      // Upcoming events should be sorted chronologically.
+      if (dateFilter >= todayDate) {
+        sortField = sortField.replace('-', '');
+      }
+      djap.addSort(sortField)
     }
   }