From c5cef9393de5ea647db48a7a8df3ab70fb55efb1 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Sun, 2 Jul 2023 02:38:03 -0700
Subject: [PATCH] Implement filter changes

User profiles and saved teams won't use a user's filter cookies or persist filters anymore
---
 pages/[username].tsx | 24 +++++-------------------
 pages/saved.tsx      | 24 +++++-------------------
 pages/teams.tsx      |  2 ++
 3 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/pages/[username].tsx b/pages/[username].tsx
index cce9b03f..e1d25df8 100644
--- a/pages/[username].tsx
+++ b/pages/[username].tsx
@@ -12,7 +12,7 @@ import fetchLatestVersion from '~utils/fetchLatestVersion'
 import { setHeaders } from '~utils/userToken'
 import useDidMountEffect from '~utils/useDidMountEffect'
 import { appState } from '~utils/appState'
-import { defaultFilterset } from '~utils/defaultFilters'
+import { permissiveFilterset } from '~utils/defaultFilters'
 import { elements, allElement } from '~data/elements'
 import { emptyPaginationObject } from '~utils/emptyStates'
 
@@ -85,7 +85,7 @@ const ProfileRoute: React.FC<Props> = ({
     serialize: (value) => `${value}`,
   })
   const [advancedFilters, setAdvancedFilters] =
-    useState<FilterSet>(defaultFilterset)
+    useState<FilterSet>(permissiveFilterset)
 
   // Define transformers for element
   function parseElement(query: string) {
@@ -124,16 +124,6 @@ const ProfileRoute: React.FC<Props> = ({
     return () => window.removeEventListener('scroll', handleScroll)
   }, [])
 
-  // Fetch the user's advanced filters
-  useEffect(() => {
-    const filtersCookie = getCookie('filters')
-    const filters = filtersCookie
-      ? JSON.parse(filtersCookie as string)
-      : defaultFilterset
-
-    setAdvancedFilters(filters)
-  }, [])
-
   // Handle errors
   const handleError = useCallback((error: any) => {
     if (error.response != null) {
@@ -286,7 +276,9 @@ const ProfileRoute: React.FC<Props> = ({
       <div id="Profile">
         {pageHead()}
         <FilterBar
+          defaultFilterset={permissiveFilterset}
           onFilter={receiveFilters}
+          persistFilters={false}
           scrolled={scrolled}
           element={element}
           raidSlug={raidSlug ? raidSlug : undefined}
@@ -340,12 +332,6 @@ export const getServerSideProps = async ({ req, res, locale, query }: { req: Nex
   // Fetch latest version
   const version = await fetchLatestVersion()
 
-  // Fetch user's advanced filters
-  const filtersCookie = getCookie('filters', { req: req, res: res })
-  const advancedFilters = filtersCookie
-    ? JSON.parse(filtersCookie as string)
-    : undefined
-
   try {
     // Fetch and organize raids
     let raidGroups: RaidGroup[] = await api
@@ -355,7 +341,7 @@ export const getServerSideProps = async ({ req, res, locale, query }: { req: Nex
     // Create filter object
     const filters: FilterObject = extractFilters(query, raidGroups)
     const params = {
-      params: { ...filters, ...advancedFilters },
+      params: { ...filters, ...permissiveFilterset },
     }
 
     // Set up empty variables
diff --git a/pages/saved.tsx b/pages/saved.tsx
index d7903bf7..13e811f2 100644
--- a/pages/saved.tsx
+++ b/pages/saved.tsx
@@ -13,7 +13,7 @@ import extractFilters from '~utils/extractFilters'
 import fetchLatestVersion from '~utils/fetchLatestVersion'
 import useDidMountEffect from '~utils/useDidMountEffect'
 import { appState } from '~utils/appState'
-import { defaultFilterset } from '~utils/defaultFilters'
+import { permissiveFilterset } from '~utils/defaultFilters'
 import { elements, allElement } from '~data/elements'
 import { emptyPaginationObject } from '~utils/emptyStates'
 
@@ -84,7 +84,7 @@ const SavedRoute: React.FC<Props> = ({
     serialize: (value) => `${value}`,
   })
   const [advancedFilters, setAdvancedFilters] =
-    useState<FilterSet>(defaultFilterset)
+    useState<FilterSet>(permissiveFilterset)
 
   // Define transformers for element
   function parseElement(query: string) {
@@ -123,16 +123,6 @@ const SavedRoute: React.FC<Props> = ({
     return () => window.removeEventListener('scroll', handleScroll)
   }, [])
 
-  // Fetch the user's advanced filters
-  useEffect(() => {
-    const filtersCookie = getCookie('filters')
-    const filters = filtersCookie
-      ? JSON.parse(filtersCookie as string)
-      : defaultFilterset
-
-    setAdvancedFilters(filters)
-  }, [])
-
   // Handle errors
   const handleError = useCallback((error: any) => {
     if (error.response != null) {
@@ -326,7 +316,9 @@ const SavedRoute: React.FC<Props> = ({
       <div id="Teams">
         {pageHead()}
         <FilterBar
+          defaultFilterset={permissiveFilterset}
           onFilter={receiveFilters}
+          persistFilters={false}
           scrolled={scrolled}
           element={element}
           raidSlug={raidSlug ? raidSlug : undefined}
@@ -380,12 +372,6 @@ export const getServerSideProps = async ({ req, res, locale, query }: { req: Nex
   // Fetch latest version
   const version = await fetchLatestVersion()
 
-  // Fetch user's advanced filters
-  const filtersCookie = getCookie('filters', { req: req, res: res })
-  const advancedFilters = filtersCookie
-    ? JSON.parse(filtersCookie as string)
-    : undefined
-
   try {
     // Fetch and organize raids
     let raidGroups: RaidGroup[] = await api
@@ -395,7 +381,7 @@ export const getServerSideProps = async ({ req, res, locale, query }: { req: Nex
     // Create filter object
     const filters: FilterObject = extractFilters(query, raidGroups)
     const params = {
-      params: { ...filters, ...advancedFilters  },
+      params: { ...filters, ...permissiveFilterset  },
     }
 
     // Set up empty variables
diff --git a/pages/teams.tsx b/pages/teams.tsx
index 0b54f78a..00d2a63a 100644
--- a/pages/teams.tsx
+++ b/pages/teams.tsx
@@ -327,7 +327,9 @@ const TeamsRoute: React.FC<Props> = ({
       <div id="Teams">
         {pageHead()}
         <FilterBar
+          defaultFilterset={defaultFilterset}
           onFilter={receiveFilters}
+          persistFilters={true}
           scrolled={scrolled}
           element={element}
           raidSlug={raidSlug ? raidSlug : undefined}