simplified year param

ConductionNL · Oct 24, 2023 · 8c16738 · 8c16738
1 parent 8e5b789
commit 8c16738
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/pwa/src/services/filtersToQueryParams.ts b/pwa/src/services/filtersToQueryParams.ts
@@ -1,3 +1,5 @@
+import { generateYearsArray } from "../data/years";
+
 export const filtersToQueryParams = (filters: any): string => {
   const cleanedFilters = Object.fromEntries(
     Object.entries(filters).filter(([key]) => !filterKeysToRemove.includes(key)),
@@ -20,6 +22,9 @@ export const filtersToQueryParams = (filters: any): string => {
 };
 
 export const filtersToUrlQueryParams = (filters: Record<string, any>): string => {
+  const today = new Date();
+  const currentYear = today.getFullYear();
+
   const cleanedFilters = Object.fromEntries(
     Object.entries(filters).filter(([key]) => !filterKeysToRemove.includes(key)),
   );
@@ -32,6 +37,13 @@ export const filtersToUrlQueryParams = (filters: Record<string, any>): string =>
         ? value.map((v: string) => v.replace(/\s+/g, "_")).join(`&${key}[]=`)
         : (value as string).replace(/\s+/g, "_");
 
+      if (key == "Publicatiedatum[after]") return;
+      if (key == "Publicatiedatum[before]")
+        return `year=${
+          generateYearsArray(currentYear - 1995).find((year: any) => {
+            return year.before === value;
+          })?.value
+        }`;
       return `${Array.isArray(value) ? `${key}[]` : key}=${formattedValue}`;
     })
     .filter(Boolean)

diff --git a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx
@@ -52,7 +52,7 @@ export const FiltersTemplate: React.FC<FiltersTemplateProps> = ({ isLoading }) =
     setValue(
       "year",
       generateYearsArray(currentYear - 1995).find((year: any) => {
-        return year.after === params.Publicatiedatum?.after && year.before === params.Publicatiedatum?.before;
+        return year.value === params.year;
       }),
     );