@akinon/next 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/next
 
+## 1.2.0
+
+### Minor Changes
+
+- Refactor Sentry config.
+- Add localeIncludedPrettyUrlPattern option to settings.
+- Refactor getRetailStoreStock mutation.
+
 ## 1.1.0
 
 ### Minor Changes

package/components/selected-payment-option-view.tsx

@@ -51,6 +51,9 @@ export default function SelectedPaymentOptionView() {
             } else if (payment_option.payment_type === 'loyalty_money') {
               promise = import(`views/checkout/steps/payment/options/loyalty`);
             }
+            // else if (payment_option.payment_type === 'gpay') {
+            //   promise = import(`views/checkout/steps/payment/options/gpay`);
+            // }
           } catch (error) {}
 
           return promise

package/data/client/product.ts

@@ -23,7 +23,7 @@ type GetProduct = {
   pk: number;
   searchParams?: URLSearchParams;
   groupProduct?: boolean;
-  [key:string]: any;
+  [key: string]: any;
 };
 
 export const productApi = api.injectEndpoints({
@@ -34,7 +34,7 @@ export const productApi = api.injectEndpoints({
       })
     }),
     getProductByParams: build.query<ProductResult, GetProduct>({
-      query: ({pk, searchParams, groupProduct, ...params}) => {
+      query: ({ pk, searchParams, groupProduct, ...params }) => {
         let url = groupProduct
           ? product.getGroupProductByPk(pk)
           : product.getProductByPk(pk);
@@ -50,11 +50,10 @@ export const productApi = api.injectEndpoints({
     }),
     getRetailStoreStock: build.mutation<StockResultType, FindInStoreFormType>({
       query: (body) => {
-        const { productPk, store, variant } = body;
-        const hasVariant = variant ? `&integration_beden=${variant}` : '';
+        const { productPk, queryString } = body;
         return {
           url: buildClientRequestUrl(
-            product.getRetailStoreStock(productPk, store, hasVariant),
+            product.getRetailStoreStock(productPk, queryString),
             {
               contentType: 'application/json'
             }

package/data/urls.ts

@@ -116,8 +116,8 @@ export const product = {
   installments: (productId: number) => `/payments/cards/product/${productId}`,
   getProductByPk: (pk: number) => `/product/${pk}`,
   getGroupProductByPk: (pk: number) => `/group-product/${pk}`,
-  getRetailStoreStock: (productPk: string, store: string, hasVariant: string) =>
-    `/retail_store_stock/${productPk}?city_id=${store}${hasVariant}`,
+  getRetailStoreStock: (productPk: string, queryString: string) =>
+    `/retail_store_stock/${productPk}?${queryString}`,
   addProduct: '/baskets/basket',
   slug: (slug: string) => `/${slug}`,
   categoryUrl: (pk: number) => `/products/${pk}/category_nodes/?limit=1`,

package/middlewares/pretty-url.ts

@@ -76,7 +76,13 @@ const withPrettyUrl =
       return middleware(req, event);
     }
 
-    const prettyUrlResult = await resolvePrettyUrl(prettyUrlPathname);
+    const prettyUrlResult = await resolvePrettyUrl(
+      Settings.localization.localeIncludedPrettyUrlPattern?.test(
+        prettyUrlPathname
+      )
+        ? url.pathname
+        : prettyUrlPathname
+    );
 
     if (prettyUrlResult.matched) {
       req.middlewareParams.rewrites.prettyUrl = prettyUrlResult.path;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": false,
   "license": "MIT",
   "bin": {

package/plugins.js

@@ -4,4 +4,5 @@ module.exports = [
   'pz-one-click-checkout',
   'pz-pay-on-delivery',
   'pz-checkout-gift-pack',
+  'pz-gpay'
 ];

package/sentry/index.ts

@@ -0,0 +1,27 @@
+import * as Sentry from '@sentry/nextjs';
+
+const SENTRY_DSN: string =
+  process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
+
+export const initSentry = (
+  type: 'Server' | 'Client' | 'Edge',
+  options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
+) => {
+  // TODO: Handle options with ESLint rules
+
+  // TODO: Remove Zero Project DSN
+
+  Sentry.init({
+    dsn:
+      SENTRY_DSN ||
+      'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
+    initialScope: {
+      tags: {
+        APP_TYPE: 'ProjectZeroNext',
+        TYPE: type
+      }
+    },
+    tracesSampleRate: 1.0,
+    integrations: []
+  });
+};

package/types/commerce/product.ts

@@ -83,9 +83,8 @@ export type StockResultType = [
 ];
 
 export type FindInStoreFormType = {
-  store: string;
-  variant: string;
   productPk: string;
+  queryString: string;
 };
 
 export interface ProductCategoryResult {

package/types/index.ts

@@ -148,6 +148,20 @@ export interface Settings {
       locale: string;
       defaultCurrencyCode: string;
     }) => string;
+    /**
+     * By default, pretty url resolver excludes locale from url.
+     * In some cases, you may want to create flatpages and include locale in urls.
+     * This is useful if you want to manage your flatpages for different countries by using locale value.
+     *
+     * @example
+     * // URL entered in Omnitron: /en-us/pages/about-us
+     * // Locale Strategy: LocaleUrlStrategy.ShowAllLocales
+     *
+     * // If you don't use this option, pretty url resolver will remove the locale and it will be resolved as '/pages/about-us' and you will get 404. Because there is no page with this url. But if you use this option, it will be resolved as '/en-us/pages/about-us' and you will get the page.
+     * // Following pattern will include locale for all urls including '/pages/'.
+     * localeIncludedPrettyUrlPattern: new RegExp('.+/pages/.+$')
+     */
+    localeIncludedPrettyUrlPattern?: RegExp;
   };
   rewrites?: Array<{
     source: string;

package/utils/log.ts

@@ -1,3 +1,5 @@
+import * as Sentry from '@sentry/nextjs';
+
 enum LogLevel {
   TRACE = 'trace',
   DEBUG = 'debug',
@@ -92,6 +94,15 @@ const error: LoggerFn = (message, payload) => {
     message,
     payload
   });
+
+  Sentry.withScope(function (scope) {
+    scope.setLevel('error');
+
+    Sentry.captureException({
+      message,
+      extra: payload
+    });
+  });
 };
 
 const warn: LoggerFn = (message, payload) => {
@@ -100,6 +111,15 @@ const warn: LoggerFn = (message, payload) => {
     message,
     payload
   });
+
+  Sentry.withScope(function (scope) {
+    scope.setLevel('warning');
+
+    Sentry.captureEvent({
+      message,
+      extra: payload
+    });
+  });
 };
 
 const debug: LoggerFn = (message, payload) => {