@akinon/next 1.71.0-rc.7 → 1.71.0

package/CHANGELOG.md

@@ -1,44 +1,11 @@
 # @akinon/next
 
-## 1.71.0-rc.7
-
-## 1.71.0-rc.6
+## 1.71.0
 
 ### Minor Changes
 
 - f34454a: ZERO-2953: Add hepsipay payment method
 
-## 1.71.0-rc.5
-
-## 1.71.0-rc.4
-
-## 1.71.0-rc.3
-
-### Minor Changes
-
-- 3344bca: ZERO-3013: Enable web vitals tracking in settings.js
-
-## 1.71.0-rc.2
-
-### Minor Changes
-
-- 56cdddc: ZERO-0000: SHOP-78125: Change unpaid_amount with total_amount_with_interest
-
-## 1.71.0-rc.1
-
-### Minor Changes
-
-- 9a50730: ZERO-3015: Add currency parameter to getOrders query
-
-## 1.71.0-rc.0
-
-### Minor Changes
-
-- 3bfa12a: ZERO-3003:Add fetchLoyaltyData and setLoyaltyData requests to RTK
-- 4d3deb4: ZERO-2935: sentry 8 upgrade
-- 3010514: ZERO-3011:add shipping_option_operator and custom filter to getOrders
-- ca774b3: ZERO-3002:add register with loyalty url
-
 ## 1.70.0
 
 ### Minor Changes
@@ -49,72 +16,12 @@
 
 ### Minor Changes
 
-- 3bfa12a: ZERO-3003:Add fetchLoyaltyData and setLoyaltyData requests to RTK
-- 4d3deb4: ZERO-2935: sentry 8 upgrade
-- 3010514: ZERO-3011:add shipping_option_operator and custom filter to getOrders
-- ca774b3: ZERO-3002:add register with loyalty url
-- f046f8e: ZERO-2575: update version for react-number-format
-
-## 1.69.0-rc.8
-
-### Minor Changes
-
-- 3010514: ZERO-3011:add shipping_option_operator and custom filter to getOrders
-- ca774b3: ZERO-3002:add register with loyalty url
-
-## 1.69.0-rc.7
-
-### Minor Changes
-
-- 3bfa12a: ZERO-3003:Add fetchLoyaltyData and setLoyaltyData requests to RTK
-
-## 1.69.0-rc.6
-
-### Minor Changes
-
-- 4d3deb4: ZERO-2935: sentry 8 upgrade
 - 063da74: ZERO-3010: Remove pz-iyzico-saved-card package
 - 72da021: ZERO-3010: Remove unused code in pretty-url.tsx
 - 5632a99: ZERO-3010: Remove iyzicoSavedCardReducer from reducers
 - cbdb0c8: ZERO-3010: Move pretty url page into project
 - 80c869b: ZERO-3010: Remove savedCardMiddleware from redux middlewares
 
-## 1.69.0-rc.5
-
-### Minor Changes
-
-- 80c869b: ZERO-3010: Remove savedCardMiddleware from redux middlewares
-
-## 1.69.0-rc.4
-
-### Minor Changes
-
-- 063da74: ZERO-3010: Remove pz-iyzico-saved-card package
-
-## 1.69.0-rc.3
-
-### Minor Changes
-
-- cbdb0c8: ZERO-3010: Move pretty url page into project
-
-## 1.69.0-rc.2
-
-### Minor Changes
-
-- 5632a99: ZERO-3010: Remove iyzicoSavedCardReducer from reducers
-
-## 1.69.0-rc.1
-
-### Minor Changes
-
-- 72da021: ZERO-3010: Remove unused code in pretty-url.tsx
-
-## 1.69.0-rc.0
-
-### Minor Changes
-
-- 4d3deb4: ZERO-2935: sentry 8 upgrade
-
 ## 1.68.0
 
 ### Minor Changes

package/components/pagination.tsx

@@ -1,12 +1,13 @@
+'use client';
+
 import { MouseEvent, useCallback, useEffect, useState } from 'react';
-import { PaginationProps } from '@theme/components/types';
+import { PaginationProps } from '../types';
 import { twMerge } from 'tailwind-merge';
 import clsx from 'clsx';
-import { Link, Button, LoaderSpinner } from '@theme/components';
 import usePagination from '@akinon/next/hooks/use-pagination';
 import { useLocalization } from '@akinon/next/hooks';
 import { useRouter } from '@akinon/next/hooks';
-import { useInView } from 'react-intersection-observer';
+import { Link } from './link';
 
 export const Pagination = (props: PaginationProps) => {
   const { t } = useLocalization();
@@ -20,13 +21,8 @@ export const Pagination = (props: PaginationProps) => {
     prevClassName,
     pageClassName,
     nextClassName,
-    moreButtonClassName,
     threshold = 1,
-    type = 'list',
-    onPageChange,
-    direction,
-    render,
-    isLoading
+    render
   } = props;
 
   const pagination = usePagination(total, limit, currentPage, numberOfPages);
@@ -37,16 +33,12 @@ export const Pagination = (props: PaginationProps) => {
     pageList,
     prev,
     next,
-    last,
     setTotal,
     setLimit
   } = pagination;
 
   const [paginationItems, setPaginationItems] = useState([]);
-  const showNext = currentPage * paginationLimit < paginationTotal;
-  const { ref, inView } = useInView({ threshold: 0.75 });
-  const [prevPage, setPrevPage] = useState(page);
-  const [nextPage, setNextPage] = useState(page);
+  const showNext = currentPage * paginationLimit < total;
 
   const createListItems = useCallback(() => {
     setPaginationItems([]);
@@ -106,38 +98,9 @@ export const Pagination = (props: PaginationProps) => {
     router.push(newUrl.pathname + newUrl.search, undefined);
   };
 
-  const handlePageChange = () => {
-    let changingPage;
-
-    if (direction === 'prev') {
-      changingPage = Number(type !== 'list' ? prevPage : page) - 1;
-      setPrevPage(changingPage);
-    } else {
-      changingPage = Number(type !== 'list' ? nextPage : page) + 1;
-      setNextPage(changingPage);
-    }
-
-    onPageChange(changingPage);
-  };
-
-  useEffect(() => {
-    if (type === 'infinite' && page === 1) {
-      setPrevPage(1);
-      setNextPage(1);
-    }
-  }, [page]);
-
-  useEffect(() => {
-    if (inView) {
-      handlePageChange();
-    }
-  }, [inView]); // eslint-disable-line react-hooks/exhaustive-deps
-
   useEffect(() => {
-    if (type === 'list') {
-      createListItems();
-    }
-  }, [page]); // eslint-disable-line react-hooks/exhaustive-deps
+    createListItems();
+  }, [createListItems, page]);
 
   useEffect(() => {
     if (total && total !== paginationTotal) {
@@ -155,128 +118,76 @@ export const Pagination = (props: PaginationProps) => {
     return <>{render(pagination)}</>;
   }
 
-  return direction === 'prev' && type !== 'list' ? (
-    <>
-      <div className="flex items-center justify-center">
-        <Button
-          className={twMerge('px-5', moreButtonClassName)}
-          onClick={() => handlePageChange()}
-        >
-          {isLoading ? (
-            <LoaderSpinner className="h-4 w-4" />
-          ) : (
-            t('category.pagination.load_previous_page')
-          )}
-        </Button>
-      </div>
-    </>
-  ) : (
-    <>
-      {type === 'more' && (
-        <div className="flex items-center justify-center">
-          <Button
+  return (
+    <ul
+      className={twMerge(
+        'flex mt-8 mb-4 justify-center items-center',
+        containerClassName
+      )}
+    >
+      {prev && (
+        <li>
+          <Link
+            onClick={(e) => handleClick(e, prev)}
+            href={prev}
             className={twMerge(
-              'px-5',
-              Number(nextPage) === Number(last)
-                ? 'bg-gray-600 border-gray-600 pointer-events-none'
-                : 'bg-black',
-              moreButtonClassName
+              'flex cursor-pointer text-sm px-2',
+              prevClassName
             )}
-            onClick={() => handlePageChange()}
-            disabled={Number(nextPage) === Number(last)}
           >
-            {isLoading ? (
-              <LoaderSpinner className="h-4 w-4" />
-            ) : (
-              t('category.pagination.more')
-            )}
-          </Button>
-        </div>
+            <span>&lt;</span>
+            <span className="hidden lg:inline-block ms-4">
+              {t('category.pagination.previous')}
+            </span>
+          </Link>
+        </li>
       )}
 
-      {type === 'infinite' && Number(nextPage) !== last && (
-        <div ref={ref}></div>
-      )}
-
-      {(type === 'infinite' || type === 'more') &&
-        Number(nextPage) === last &&
-        !isLoading && (
-          <p className="mt-8 text-center">
-            {t('category.pagination.shown_items')}
-          </p>
-        )}
-
-      {type === 'list' && (
-        <ul
-          className={twMerge(
-            'mb-4 mt-8 flex items-center justify-center',
-            containerClassName
-          )}
-        >
-          {prev && currentPage !== 1 && (
-            <li>
+      {paginationItems &&
+        paginationItems?.map((item, i) => (
+          <li key={i}>
+            {item?.url != '#' ? (
               <Link
-                onClick={(e) => handleClick(e, prev)}
-                href={prev}
+                onClick={(e) => handleClick(e, item.url)}
+                href={item.url}
                 className={twMerge(
-                  'flex cursor-pointer px-2 text-sm items-center',
-                  prevClassName
+                  clsx(
+                    'text-xs px-2 cursor-pointer',
+                    { 'pointer-events-none': item.url === null },
+                    Number(page) === Number(item?.page)
+                      ? 'font-semibold text-black-800'
+                      : 'text-gray-400'
+                  ),
+                  pageClassName
                 )}
               >
-                <span>&lt;</span>
-                <span className="ms-4 hidden lg:inline-block">
-                  {t('category.pagination.previous')}
-                </span>
+                {item?.page}
               </Link>
-            </li>
-          )}
-
-          {paginationItems.map((item, i) => (
-            <li key={i}>
-              {item?.url != '#' ? (
-                <Link
-                  onClick={(e) => handleClick(e, item.url)}
-                  href={item.url}
-                  className={twMerge(
-                    clsx(
-                      'cursor-pointer px-2 text-xs items-center',
-                      { 'pointer-events-none': item.url === null },
-                      Number(page) === Number(item?.page)
-                        ? 'font-semibold text-black-800'
-                        : 'text-gray-400'
-                    ),
-                    pageClassName
-                  )}
-                >
-                  {item?.page}
-                </Link>
-              ) : (
-                <span className="flex cursor-default items-center justify-center text-xs">
-                  {item?.page}
-                </span>
-              )}
-            </li>
-          ))}
-
-          {showNext && (
-            <li>
-              <Link
-                onClick={(e) => handleClick(e, next)}
-                href={next}
-                className={twMerge(
-                  'flex cursor-pointer px-2 text-xs items-center',
-                  nextClassName
-                )}
-              >
-                <span className="me-4 hidden lg:inline-block">
-                  {t('category.pagination.next')}
-                </span>
-                <span>&gt;</span>
-              </Link>
-            </li>
-          )}
-        </ul>
+            ) : (
+              <span className="cursor-default text-xs flex items-center justify-center">
+                {item?.page}
+              </span>
+            )}
+          </li>
+        ))}
+
+      {showNext && (
+        <li>
+          <Link
+            onClick={(e) => handleClick(e, next)}
+            href={next}
+            className={twMerge(
+              'flex cursor-pointer text-xs px-2',
+              nextClassName
+            )}
+          >
+            <span className="hidden lg:inline-block me-4">
+              {t('category.pagination.next')}
+            </span>
+            <span>&gt;</span>
+          </Link>
+        </li>
       )}
-    </>
+    </ul>
   );
 };

package/components/web-vitals.tsx

@@ -3,26 +3,24 @@
 import { useReportWebVitals } from 'next/web-vitals';
 import { useSelectedLayoutSegment } from 'next/navigation';
 import { usePathname } from 'next/navigation';
-import settings from 'settings';
 
 export function WebVitals() {
   let layoutSegment = useSelectedLayoutSegment();
   const pathname = usePathname();
-  const { enabled } = settings.webVitals || { enabled: false };
 
   if (pathname === '/' && layoutSegment === null) {
     layoutSegment = 'home';
   }
 
   useReportWebVitals((metric) => {
-    if (process.env.NODE_ENV !== 'development' || !enabled) {
+    if (process.env.NODE_ENV !== 'development') {
       return;
     }
 
     const { name, value, rating } = metric;
     const page = layoutSegment || 'unknown';
 
-    fetch(`/api/web-vitals`, {
+    fetch(`${process.env.NEXT_PUBLIC_URL}/api/web-vitals`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json'

package/data/client/account.ts

@@ -21,11 +21,6 @@ interface GetOrdersParams {
   page?: number;
   createdDate?: string;
   endDate?: string;
-  shipping_option_slug?: string;
-  shipping_option_operator?: string;
-  filterType?: string;
-  filterValue?: string;
-  currency?: string;
 }
 
 export interface GetQuotationsResponse {
@@ -119,29 +114,9 @@ const accountApi = api.injectEndpoints({
       query: (id) => buildClientRequestUrl(account.orderId(id))
     }),
     getOrders: builder.query<GetOrdersResponse, GetOrdersParams>({
-      query: ({
-        page,
-        limit,
-        createdDate,
-        endDate,
-        shipping_option_operator,
-        shipping_option_slug,
-        filterType,
-        filterValue,
-        currency
-      } = {}) =>
+      query: ({ page, limit, createdDate, endDate } = {}) =>
         buildClientRequestUrl(
-          account.getOrders({
-            page,
-            limit,
-            createdDate,
-            endDate,
-            shipping_option_operator,
-            shipping_option_slug,
-            filterType,
-            filterValue,
-            currency
-          })
+          account.getOrders({ page, limit, createdDate, endDate })
         )
     }),
     getQuotations: builder.query<GetQuotationsResponse, GetQuotationsParams>({

package/data/client/checkout.ts

@@ -106,7 +106,7 @@ const completeMasterpassPayment = async (
     referenceNo,
     merchantId: credentials?.merchant_id ?? null,
     msisdn,
-    amount: preOrder?.total_amount_with_interest?.replace('.', '') ?? '',
+    amount: preOrder?.unpaid_amount?.replace('.', '') ?? '',
     additionalParams: additionalParams ?? extras?.additionalParams,
     language,
     installmentCount: preOrder?.installment?.installment_count ?? 1
@@ -776,26 +776,6 @@ export const checkoutApi = api.injectEndpoints({
           extra_field
         }
       })
-    }),
-    fetchLoyaltyData: build.query<CheckoutResponse, void>({
-      query: () => ({
-        url: buildClientRequestUrl(checkout.loyaltyCardPage, {
-          accept: 'application/json',
-          contentType: 'application/json'
-        }),
-        method: 'GET'
-      })
-    }),
-    setLoyaltyData: build.mutation<CheckoutResponse, number>({
-      query: (amount) => ({
-        url: buildClientRequestUrl(checkout.loyaltyCardPage, {
-          useFormData: true
-        }),
-        method: 'POST',
-        body: {
-          selected_loyalty_amount: amount
-        }
-      })
     })
   }),
   overrideExisting: false
@@ -835,8 +815,6 @@ export const {
   useSetDeliveryBagsMutation,
   useSetAttributeBasedShippingOptionsMutation,
   useSetOrderSelectionPageMutation,
-  useFetchLoyaltyDataQuery,
-  useSetLoyaltyDataMutation,
   useSetWalletSelectionPageMutation,
   useSetWalletPaymentPageMutation,
   useSetWalletCompletePageMutation

package/data/urls.ts

@@ -18,30 +18,20 @@ export const account = {
     limit,
     createdDate,
     endDate,
-    shipping_option_slug,
-    shipping_option_operator = '=',
-    filterType,
-    filterValue,
-    currency
+    shipping_option_slug
   }: {
     page?: number;
     limit?: number;
     createdDate?: string;
     endDate?: string;
     shipping_option_slug?: string;
-    shipping_option_operator?: string;
-    filterType?: string;
-    filterValue?: string;
-    currency?: string;
   }) =>
     `/users/orders/?page=${page || 1}&limit=${limit || 12}${
       createdDate ? `&created_date__gte=${createdDate}` : ''
     }${endDate ? `&created_date__lte=${endDate}` : ''}${
       shipping_option_slug
-        ? `&shipping_option_slug${shipping_option_operator}${shipping_option_slug}`
+        ? `&shipping_option_slug=${shipping_option_slug}`
         : ''
-    }${filterType && filterValue ? `&${filterType}=${filterValue}` : ''}${
-      currency ? `&currency=${currency}` : ''
     }`,
   getQuotations: (page?: number, status?: string, limit?: number) =>
     `/b2b/my-quotations/?page=${page || 1}` +
@@ -133,8 +123,7 @@ export const checkout = {
   setAttributeBasedShippingOption:
     '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage',
   deliveryBagsPage: '/orders/checkout/?page=DeliveryBagsPage',
-  setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage',
-  loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage'
+  setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage'
 };
 
 export const flatpage = {
@@ -214,8 +203,7 @@ export const user = {
   confirmEmailVerification: (token: string) =>
     `/users/registration/account-confirm-email/${token}/`,
   csrfToken: '/csrf_token/',
-  anonymousOrderTracking: '/users/orders/anonymous',
-  loyaltyRegister: '/users/register-with-loyalty/'
+  anonymousOrderTracking: '/users/orders/anonymous'
 };
 
 export const b2b = {

package/instrumentation/index.ts

@@ -1,12 +1,5 @@
-import { initSentry } from '../sentry';
-
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
     await import('./node');
-    initSentry('Server');
-  }
-
-  if (process.env.NEXT_RUNTIME === 'edge') {
-    initSentry('Edge');
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.71.0-rc.7",
+  "version": "1.71.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.71.0-rc.7",
+    "@akinon/eslint-plugin-projectzero": "1.71.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/types/index.ts

@@ -78,9 +78,6 @@ export interface Currency {
 }
 
 export interface Settings {
-  webVitals?: {
-    enabled: boolean;
-  };
   usePrettyUrlRoute?: boolean;
   commerceUrl: string;
   redis: {

package/with-pz-config.js

@@ -61,6 +61,9 @@ const defaultConfig = {
       translations: false
     };
     return config;
+  },
+  sentry: {
+    hideSourceMaps: true
   }
 };