@akinon/next 2.0.0-beta.2 → 2.0.0-beta.21

package/data/client/misc.ts

@@ -1,7 +1,9 @@
 import {
   EmailSubscriptionType,
   MenuItemType,
-  WidgetResultType
+  WidgetResultType,
+  WidgetSchemaType,
+  DynamicWidgetResultType
 } from '../../types';
 import { buildClientRequestUrl } from '../../utils';
 import { misc, widgets } from '../urls';
@@ -80,11 +82,20 @@ export const miscApi = api.injectEndpoints({
         };
       }
     }),
+    // change any type
     getWidget: builder.query<WidgetResultType<any>, string>({
       query: (slug: string) => ({
         url: buildClientRequestUrl(widgets.getWidget(slug))
       })
     }),
+    getWidgetSchema: builder.query<
+      WidgetSchemaType<DynamicWidgetResultType>,
+      string
+    >({
+      query: (widgetSlug: string) => ({
+        url: buildClientRequestUrl(widgets.getWidgetSchema(widgetSlug))
+      })
+    }),
     getMenu: builder.query<MenuItemType[], GetMenuParams>({
       query: ({ depth, parent }) => ({
         url: buildClientRequestUrl(misc.menus(depth, parent))
@@ -92,6 +103,29 @@ export const miscApi = api.injectEndpoints({
       transformResponse: (response: { menu: MenuItemType[] }) => {
         return response.menu;
       }
+    }),
+    getBukalemunImageUrl: builder.query<
+      any,
+      { current_chapter: string; sku: string; selected_attributes: any }
+    >({
+      query: ({ current_chapter, sku, selected_attributes }) => {
+        const data = {
+          ...selected_attributes,
+          current_chapter,
+          sku
+        };
+
+        const params = new URLSearchParams(data);
+
+        return {
+          url: buildClientRequestUrl(
+            misc.bukalemunImageUrl(params.toString()),
+            {
+              responseType: 'json'
+            }
+          )
+        };
+      }
     })
   }),
   overrideExisting: true
@@ -102,5 +136,7 @@ export const {
   useEmailSubscriptionMutation,
   useSetLanguageMutation,
   useGetWidgetQuery,
-  useGetMenuQuery
+  useGetWidgetSchemaQuery,
+  useGetMenuQuery,
+  useGetBukalemunImageUrlQuery
 } = miscApi;

package/data/client/product.ts

@@ -69,12 +69,28 @@ export const productApi = api.injectEndpoints({
         }),
         method: 'POST',
         body
-      })
+      }),
+      invalidatesTags: ['MiniBasket']
     }),
     getInstallments: build.query<any, any>({
       query: (productPk) => ({
         url: buildClientRequestUrl(product.installments(productPk))
       })
+    }),
+    getBundleProductData: build.query<
+      any,
+      { productPk: string; queryString: string }
+    >({
+      query: ({ productPk, queryString }) => {
+        return {
+          url: buildClientRequestUrl(
+            product.bundleProduct(productPk, queryString),
+            {
+              responseType: 'json'
+            }
+          )
+        };
+      }
     })
   }),
   overrideExisting: true
@@ -85,5 +101,6 @@ export const {
   useGetProductByPkQuery,
   useGetRetailStoreStockMutation,
   useGetInstallmentsQuery,
-  useGetProductByParamsQuery
+  useGetProductByParamsQuery,
+  useGetBundleProductDataQuery
 } = productApi;

package/data/client/user.ts

@@ -1,7 +1,7 @@
 import { api } from './api';
 import { user } from '../urls';
 import { ForgotPasswordFormType, Order } from '../../types';
-import { buildClientRequestUrl } from '../../utils';
+import { buildClientRequestUrl, getCookie } from '../../utils';
 
 interface GetCaptchaResponse {
   siteKey: string;
@@ -64,13 +64,21 @@ const userApi = api.injectEndpoints({
       })
     }),
     forgotPassword: build.mutation<void, ForgotPasswordFormType>({
-      query: (body) => ({
-        url: buildClientRequestUrl(user.forgotPassword, {
-          contentType: 'application/json'
-        }),
-        method: 'POST',
-        body
-      })
+      query: (body) => {
+        const frontendId = getCookie('pz-frontend-id');
+        const headers = frontendId
+          ? { 'x-frontend-id': frontendId }
+          : undefined;
+
+        return {
+          url: buildClientRequestUrl(user.forgotPassword, {
+            contentType: 'application/json'
+          }),
+          method: 'POST',
+          body,
+          headers
+        };
+      }
     }),
     otpLogin: build.mutation<void, { phone: string }>({
       query: ({ phone }) => ({

package/data/server/category.ts

@@ -1,4 +1,4 @@
-import { GetCategoryResponse } from '../../types';
+import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { category, product } from '../urls';
@@ -12,7 +12,7 @@ function getCategoryDataHandler(
   pk: number,
   locale: string,
   currency: string,
-  searchParams?: URLSearchParams,
+  searchParams?: SearchParams,
   headers?: Record<string, string>
 ) {
   return async function () {
@@ -48,8 +48,8 @@ function getCategoryDataHandler(
       logger.fatal('Error while parsing category data', {
         handler: 'getCategoryDataHandler',
         error,
-        rawData: rawData.startsWith('<!DOCTYPE html>')
-          ? `${rawData.substring(0, 50)}...`
+        rawData: rawData?.startsWith?.('<!DOCTYPE html>')
+          ? `${rawData?.substring(0, 50)}...`
           : rawData
       });
     }
@@ -90,7 +90,7 @@ export const getCategoryData = ({
   pk: number;
   locale?: string;
   currency?: string;
-  searchParams?: URLSearchParams;
+  searchParams?: SearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
@@ -98,7 +98,8 @@ export const getCategoryData = ({
     locale,
     getCategoryDataHandler(pk, locale, currency, searchParams, headers),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };
@@ -138,8 +139,8 @@ function getCategoryBySlugDataHandler(
       logger.fatal('Error while parsing category data', {
         handler: 'getCategoryBySlugDataHandler',
         error,
-        rawData: rawData.startsWith('<!DOCTYPE html>')
-          ? `${rawData.substring(0, 50)}...`
+        rawData: rawData?.startsWith?.('<!DOCTYPE html>')
+          ? `${rawData?.substring(0, 50)}...`
           : rawData
       });
     }
@@ -158,7 +159,8 @@ export const getCategoryBySlugData = async ({
     locale,
     getCategoryBySlugDataHandler(slug, locale, currency),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };

package/data/server/flatpage.ts

@@ -7,7 +7,8 @@ import { ServerVariables } from '../../utils/server-variables';
 const getFlatPageDataHandler = (
   pk: number,
   locale: string,
-  currency: string
+  currency: string,
+  headers?: Record<string, string>
 ) => {
   return async function () {
     const data = await appFetch<FlatPage>({
@@ -17,7 +18,8 @@ const getFlatPageDataHandler = (
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       }
     });
@@ -29,15 +31,20 @@ const getFlatPageDataHandler = (
 export const getFlatPageData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency
+  currency = ServerVariables.currency,
+  headers
 }: {
   pk: number;
   locale?: string;
   currency?: string;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.FlatPage(pk),
     locale,
-    getFlatPageDataHandler(pk, locale, currency)
+    getFlatPageDataHandler(pk, locale, currency, headers),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/form.ts

@@ -5,7 +5,12 @@ import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
 import { form } from '../urls';
 
-const getFormDataHandler = (pk: number, locale: string, currency: string) => {
+const getFormDataHandler = (
+  pk: number,
+  locale: string,
+  currency: string,
+  headers?: Record<string, string>
+) => {
   return async function () {
     const data = await appFetch<FormType>({
       url: form.getForm(pk),
@@ -14,7 +19,8 @@ const getFormDataHandler = (pk: number, locale: string, currency: string) => {
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       }
     });
@@ -26,15 +32,20 @@ const getFormDataHandler = (pk: number, locale: string, currency: string) => {
 export const getFormData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency
+  currency = ServerVariables.currency,
+  headers
 }: {
   pk: number;
   locale?: string;
   currency?: string;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.Form(pk),
     locale,
-    getFormDataHandler(pk, locale, currency)
+    getFormDataHandler(pk, locale, currency, headers),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/landingpage.ts

@@ -7,7 +7,8 @@ import { ServerVariables } from '../../utils/server-variables';
 const getLandingPageHandler = (
   pk: number,
   locale: string,
-  currency: string
+  currency: string,
+  headers?: Record<string, string>
 ) => {
   return async function () {
     const data = await appFetch<LandingPage>({
@@ -17,7 +18,8 @@ const getLandingPageHandler = (
       init: {
         headers: {
           Accept: 'application/json',
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
       }
     });
@@ -29,15 +31,20 @@ const getLandingPageHandler = (
 export const getLandingPageData = ({
   pk,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency
+  currency = ServerVariables.currency,
+  headers
 }: {
   pk: number;
   locale?: string;
   currency?: string;
+  headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
     CacheKey.LandingPage(pk),
     locale,
-    getLandingPageHandler(pk, locale, currency)
+    getLandingPageHandler(pk, locale, currency, headers),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/list.ts

@@ -1,6 +1,6 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { category } from '../urls';
-import { GetCategoryResponse } from '../../types';
+import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
 import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
@@ -10,7 +10,7 @@ import { ServerVariables } from '../../utils/server-variables';
 const getListDataHandler = (
   locale,
   currency,
-  searchParams: URLSearchParams,
+  searchParams: SearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
@@ -63,7 +63,7 @@ export const getListData = async ({
 }: {
   locale?: string;
   currency?: string;
-  searchParams: URLSearchParams;
+  searchParams: SearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(
@@ -71,7 +71,8 @@ export const getListData = async ({
     locale,
     getListDataHandler(locale, currency, searchParams, headers),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
 };

package/data/server/menu.ts

@@ -13,6 +13,7 @@ interface MenuHandlerParams {
   currency?: string;
   depth?: number;
   parent?: string;
+  headers?: Record<string, string>;
 }
 
 const DEFAULT_DEPTH = 3;
@@ -22,13 +23,17 @@ const getMenuHandler =
     locale = ServerVariables.locale,
     currency = ServerVariables.currency,
     depth,
-    parent
+    parent,
+    headers
   }: MenuHandlerParams = {}) =>
   async () => {
     const response = await appFetch<MenuResponse>({
       url: misc.menus(depth ?? DEFAULT_DEPTH, parent),
       locale,
-      currency
+      currency,
+      init: {
+        headers
+      }
     });
 
     return response?.menu;
@@ -43,6 +48,9 @@ export const getMenu = async (params?: MenuHandlerParams) => {
   return Cache.wrap(
     CacheKey.Menu(params?.depth ?? DEFAULT_DEPTH, params?.parent),
     params?.locale ?? ServerVariables.locale,
-    getMenuHandler(params)
+    getMenuHandler(params),
+    {
+      compressed: true
+    }
   );
 };

package/data/server/product.ts

@@ -1,16 +1,17 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
-import { ProductCategoryResult, ProductResult } from '../../types';
+import { ProductCategoryResult, ProductResult, SearchParams } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
 
 type GetProduct = {
-  pk: number;
+  pk: number | string;
   locale?: string;
   currency?: string;
-  searchParams?: URLSearchParams;
+  searchParams?: SearchParams;
   groupProduct?: boolean;
+  headers?: Record<string, string>;
 };
 
 const getProductDataHandler = ({
@@ -18,75 +19,109 @@ const getProductDataHandler = ({
   locale,
   currency,
   searchParams,
-  groupProduct
+  groupProduct,
+  headers
 }: GetProduct) => {
   return async function () {
+    // Convert pk to number if it's a string and validate
+    const numericPk = typeof pk === 'string' ? parseInt(pk, 10) : pk;
+
+    if (isNaN(numericPk)) {
+      logger.warn('Invalid product pk provided', {
+        handler: 'getProductDataHandler',
+        pk,
+        numericPk
+      });
+      return null;
+    }
+
     let url = groupProduct
-      ? product.getGroupProductByPk(pk)
-      : product.getProductByPk(pk);
+      ? product.getGroupProductByPk(numericPk)
+      : product.getProductByPk(numericPk);
 
     if (searchParams) {
       url +=
         '?' +
         Object.keys(searchParams)
-          .map((key) => `${key}=${searchParams[key]}`)
+          .map((key) => `${key}=${encodeURIComponent(searchParams[key])}`)
           .join('&');
     }
 
-    const data = await appFetch<ProductResult>({
-      url,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+    try {
+      const data = await appFetch<ProductResult>({
+        url,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            ...(headers ?? {})
+          }
         }
+      });
+
+      // If product data is not found, return null to trigger 404
+      if (!data?.product?.pk) {
+        logger.warn('Product not found', {
+          handler: 'getProductDataHandler',
+          pk: numericPk,
+          hasData: !!data,
+          hasProduct: !!data?.product
+        });
+        return null;
       }
-    });
 
-    const categoryUrl = product.categoryUrl(data.product.pk);
+      const categoryUrl = product.categoryUrl(data.product.pk);
 
-    const productCategoryData = await appFetch<ProductCategoryResult>({
-      url: categoryUrl,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+      const productCategoryData = await appFetch<ProductCategoryResult>({
+        url: categoryUrl,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
         }
-      }
-    });
+      });
 
-    const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
+      const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
 
-    if (!menuItemModel) {
-      logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
-        handler: 'getProductDataHandler',
-        pk
-      });
-      return { data, breadcrumbData: undefined };
-    }
+      if (!menuItemModel) {
+        logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
+          handler: 'getProductDataHandler',
+          pk: numericPk
+        });
+        return { data, breadcrumbData: undefined };
+      }
 
-    const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
+      const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
-    const breadcrumbData = await appFetch<any>({
-      url: breadcrumbUrl,
-      locale,
-      currency,
-      init: {
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json'
+      const breadcrumbData = await appFetch<any>({
+        url: breadcrumbUrl,
+        locale,
+        currency,
+        init: {
+          headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json'
+          }
         }
-      }
-    });
+      });
 
-    return {
-      data,
-      breadcrumbData: breadcrumbData?.menu
-    };
+      return {
+        data,
+        breadcrumbData: breadcrumbData?.menu
+      };
+    } catch (error) {
+      logger.error('Error in getProductDataHandler', {
+        handler: 'getProductDataHandler',
+        pk: numericPk,
+        error: error.message
+      });
+      return null;
+    }
   };
 };
 
@@ -95,17 +130,38 @@ export const getProductData = async ({
   locale = ServerVariables.locale,
   currency = ServerVariables.currency,
   searchParams,
-  groupProduct
+  groupProduct,
+  headers
 }: GetProduct) => {
-  return Cache.wrap(
+  // Convert pk to number for cache key if it's a string
+  const numericPkForCache = typeof pk === 'string' ? parseInt(pk, 10) : pk;
+
+  const result = await Cache.wrap(
     CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
-      pk,
+      numericPkForCache,
       searchParams ?? new URLSearchParams()
     ),
     locale,
-    getProductDataHandler({ pk, locale, currency, searchParams, groupProduct }),
+    getProductDataHandler({
+      pk,
+      locale,
+      currency,
+      searchParams,
+      groupProduct,
+      headers
+    }),
     {
-      expire: 300
+      expire: 300,
+      compressed: true
     }
   );
+
+  // If product data is not found, throw 404 error
+  if (!result) {
+    const error = new Error('Product not found') as Error & { status: number };
+    error.status = 404;
+    throw error;
+  }
+
+  return result;
 };

package/data/server/seo.ts

@@ -7,9 +7,10 @@ interface SeoDataParams {
   url: string;
   locale?: string;
   currency?: string;
+  headers?: Record<string, string>;
 }
 
-function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
+function getSeoDataHandler({ url, locale, currency, headers }: SeoDataParams) {
   return async function () {
     let data = {} as {
       title: string;
@@ -19,7 +20,12 @@ function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
     };
 
     try {
-      data = await appFetch({ url: misc.cmsSeo(url), locale, currency });
+      data = await appFetch({
+        url: misc.cmsSeo(url),
+        locale,
+        currency,
+        init: { headers }
+      });
     } catch (error) {
       // logger.error('Error while fetching seo data', { url, error });
     }
@@ -31,11 +37,15 @@ function getSeoDataHandler({ url, locale, currency }: SeoDataParams) {
 export const getSeoData = async (
   url,
   locale = ServerVariables.locale,
-  currency = ServerVariables.currency
+  currency = ServerVariables.currency,
+  headers?: Record<string, string>
 ) => {
   return Cache.wrap(
     CacheKey.Seo(url),
     locale,
-    getSeoDataHandler({ url, locale, currency })
+    getSeoDataHandler({ url, locale, currency, headers }),
+    {
+      compressed: true
+    }
   );
 };