Wap Proxy and PLP filters and sort (#441)

* fix: proxy route * feat: add filters and order in wap plp loader * Update wap/loaders/productListingPage.ts --------- Co-authored-by: guitavano <[email protected]>
deco-cx · Mar 6, 2024 · 3511bf9 · 3511bf9
1 parent 22a7fa6
commit 3511bf9
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 9 deletions.
diff --git a/wap/loaders/productListingPage.ts b/wap/loaders/productListingPage.ts
@@ -9,14 +9,39 @@ import {
 import { WapProductsListPage } from "../utils/type.ts";
 import { TypedResponse } from "../../utils/http.ts";
 
-export interface Props {
+type ORDER_OPTS = "Favoritos" | "Maior Preço" | "Menor Preço" | "Popularidade";
+
+export interface FilterItem {
+  /**
+   * @title Filter type
+   */
+  key: string;
+  /**
+   * @title Filter value
+   */
+  value: string;
+}
+
+export type Props = {
   busca?: string;
   /**
    * @max 100
    * @default 12
    */
   limit?: number;
-}
+  /**
+   * @description page number
+   */
+  page?: number;
+  /**
+   * @description order of products
+   */
+  order?: ORDER_OPTS;
+  /**
+   * @title filters
+   */
+  filterParams?: FilterItem[];
+};
 
 const endPoint = {
   "product/listing/category":
@@ -43,12 +68,24 @@ const loader = async (
   const rawSearch = url.searchParams.get("busca") ?? props.busca;
   const busca = rawSearch && encodeURIComponent(rawSearch);
 
-  const page = Number(url.searchParams.get("pg") || 1);
+  const page = Number(url.searchParams.get("pg") ?? props.page ?? 1);
 
   const limit = Number(url.searchParams.get("ipp") ?? props.limit ?? 12);
 
+  const order = url.searchParams.get("order") ?? props.order;
+
   const offset = page <= 1 ? 0 : (page - 1) * limit;
 
+  const filterParams = props.filterParams?.reduce((acc, { key, value }) => {
+    if (acc[key]) {
+      acc[key] = [...acc[key], value];
+    } else {
+      acc[key] = value;
+    }
+
+    return acc;
+  }, {} as Record<string, string | string[]>) ?? {};
+
   if (!busca && url.pathname.startsWith("%2F_fresh")) return null;
 
   const { nivel } = await api
@@ -58,23 +95,29 @@ const loader = async (
 
   if (!busca && !nivel) return null;
 
-  const params: Record<string, string | string[]> = {};
+  const searchParams: Record<string, string | string[]> = {};
+
   url.searchParams.delete("busca");
   url.searchParams.delete("pg");
+  url.searchParams.delete("order");
+
   url.searchParams.forEach((v, k) => {
-    if (params[k]) {
-      params[k] = [...params[k], v];
+    if (searchParams[k]) {
+      searchParams[k] = [...searchParams[k], v];
     }
-    params[k] = v;
+    searchParams[k] = v;
   });
 
+  const params = { ...filterParams, ...searchParams };
+
   const endpoint = nivel && endPoint[nivel as keyof typeof endPoint];
 
   const data = endpoint
     ? await api[endpoint]({
       url: url.pathname,
       limit: String(limit),
       offset: String(offset),
+      order,
       ...params,
     }).then((response: TypedResponse<unknown>) =>
       response.json()
@@ -84,6 +127,7 @@ const loader = async (
         busca,
         limit: String(limit),
         offset: String(offset),
+        order,
         ...params,
       }).then((response) => response.json()) as WapProductsListPage;
 

diff --git a/wap/loaders/proxy.ts b/wap/loaders/proxy.ts
@@ -26,13 +26,12 @@ function loader(
   const checkout = [
     ...DEFAULT_PROXY_PATHS,
     ...pagesToProxy,
-  ].map(([pathTemplate, basePath]) => ({
+  ].map((pathTemplate) => ({
     pathTemplate,
     handler: {
       value: {
         __resolveType: "website/handlers/proxy.ts",
         url: baseUrl,
-        basePath,
         customHeaders: [{
           Host: baseUrl,
         }],

diff --git a/wap/utils/openapi/api.openapi.gen.ts b/wap/utils/openapi/api.openapi.gen.ts
@@ -520,6 +520,7 @@ url?: string
 searchParams: {
 url?: string
 offset?: string
+order?: string
 limit?: string
 }
 }
@@ -542,6 +543,7 @@ limit?: string
 searchParams: {
 url?: string
 offset?: string
+order?: string
 limit?: string
 }
 }
@@ -552,6 +554,7 @@ limit?: string
 searchParams: {
 url?: string
 offset?: string
+order?: string
 limit?: string
 }
 }
@@ -562,6 +565,7 @@ limit?: string
 searchParams: {
 url?: string
 offset?: string
+order?: string
 limit?: string
 }
 }
@@ -572,6 +576,7 @@ limit?: string
 searchParams: {
 busca?: string
 offset?: string
+order?: string
 limit?: string
 }
 }

diff --git a/wap/utils/openapi/api.openapi.json b/wap/utils/openapi/api.openapi.json
@@ -2997,6 +2997,14 @@
               "example": "0"
             }
           },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "example": "Popularidade"
+            }
+          },
           {
             "name": "limit",
             "in": "query",
@@ -3099,6 +3107,14 @@
               "example": "0"
             }
           },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "example": "Popularidade"
+            }
+          },
           {
             "name": "limit",
             "in": "query",
@@ -3149,6 +3165,14 @@
               "example": "0"
             }
           },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "example": "Popularidade"
+            }
+          },
           {
             "name": "limit",
             "in": "query",
@@ -3199,6 +3223,14 @@
               "example": "0"
             }
           },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "example": "Popularidade"
+            }
+          },
           {
             "name": "limit",
             "in": "query",
@@ -3249,6 +3281,14 @@
               "example": "0"
             }
           },
+          {
+            "name": "order",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "example": "Popularidade"
+            }
+          },
           {
             "name": "limit",
             "in": "query",