fix: DAH-3176 hide directory 1.5 change (#2508)

SFDigitalServices · Jan 21, 2025 · 6d35c4d · 6d35c4d
1 parent 38f1cda
commit 6d35c4d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/app/javascript/modules/listings/DirectoryHelpers.tsx b/app/javascript/modules/listings/DirectoryHelpers.tsx
@@ -326,9 +326,12 @@ export const getListingGroup = (
   hasFiltersSet?: boolean,
   subtitle?: string,
   icon?: IconTypes,
-  isOpen?: boolean
+  isOpen?: boolean,
+  newDirectoryEnabled?: boolean
 ) => {
-  const showListingsGroup = section !== DIRECTORY_SECTION_ADDITIONAL_LISTINGS || listings.length > 0
+  const showListingsGroup =
+    (newDirectoryEnabled && section !== DIRECTORY_SECTION_ADDITIONAL_LISTINGS) ||
+    listings.length > 0
   return (
     showListingsGroup && (
       <ListingsGroup
@@ -357,7 +360,8 @@ export const upcomingLotteriesView = (
   directoryType,
   stackedDataFxn: StackedDataFxnType,
   observerRef: React.MutableRefObject<null | IntersectionObserver>,
-  isOpen: boolean
+  isOpen: boolean,
+  newDirectoryEnabled?: boolean
 ) => {
   return getListingGroup(
     listings,
@@ -372,7 +376,8 @@ export const upcomingLotteriesView = (
     undefined,
     t("listings.upcomingLotteries.subtitle"),
     null,
-    isOpen
+    isOpen,
+    newDirectoryEnabled
   )
 }
 
@@ -381,7 +386,8 @@ export const lotteryResultsView = (
   directoryType,
   stackedDataFxn: StackedDataFxnType,
   observerRef: React.MutableRefObject<null | IntersectionObserver>,
-  isOpen?: boolean
+  isOpen?: boolean,
+  newDirectoryEnabled?: boolean
 ) => {
   return getListingGroup(
     listings,
@@ -396,7 +402,8 @@ export const lotteryResultsView = (
     undefined,
     t("listings.lotteryResults.subtitle"),
     "result",
-    isOpen
+    isOpen,
+    newDirectoryEnabled
   )
 }
 
@@ -406,7 +413,8 @@ export const additionalView = (
   stackedDataFxn: StackedDataFxnType,
   observerRef: React.MutableRefObject<null | IntersectionObserver>,
   filtersSet?: boolean,
-  isOpen?: boolean
+  isOpen?: boolean,
+  newDirectoryEnabled?: boolean
 ) => {
   return getListingGroup(
     listings,
@@ -421,7 +429,8 @@ export const additionalView = (
     filtersSet,
     t("listings.additional.subtitle"),
     "doubleHouse",
-    isOpen
+    isOpen,
+    newDirectoryEnabled
   )
 }
 

diff --git a/app/javascript/modules/listings/GenericDirectory.tsx b/app/javascript/modules/listings/GenericDirectory.tsx
@@ -193,21 +193,24 @@ export const GenericDirectory = (props: RentalDirectoryProps) => {
                   props.getSummaryTable,
                   observerRef,
                   hasFiltersSet,
-                  additionalIsOpen
+                  additionalIsOpen,
+                  newDirectoryEnabled
                 )}
               {upcomingLotteriesView(
                 listings.upcoming,
                 props.directoryType,
                 props.getSummaryTable,
                 observerRef,
-                upcomingIsOpen
+                upcomingIsOpen,
+                newDirectoryEnabled
               )}
               {lotteryResultsView(
                 listings.results,
                 props.directoryType,
                 props.getSummaryTable,
                 observerRef,
-                resultsIsOpen
+                resultsIsOpen,
+                newDirectoryEnabled
               )}
             </div>
           </>