@akinon/next 1.0.0 → 1.1.1

package/CHANGELOG.md

@@ -0,0 +1,13 @@
+# @akinon/next
+
+## 1.1.1
+
+### Patch Changes
+
+- Refactor Sentry configs
+
+## 1.1.0
+
+### Minor Changes
+
+- Add retail stores to redux

package/components/client-root.tsx

@@ -22,13 +22,13 @@ export default function ClientRoot({
   const pathname = usePathname();
   const router = useRouter();
   const { isMobileApp } = useAppSelector((state) => state.root);
-  const { data: basketData } = useGetBasketQuery();
+  const { data: basketData, isSuccess } = useGetBasketQuery();
   const [clearBasket] = useClearBasketMutation();
   const resetClientCache = getCookie('pz-reset-client-cache') === 'true';
   const resetBasket = getCookie('pz-reset-basket') === 'true';
 
   useEffect(() => {
-    if (basketData?.basketitem_set.length) {
+    if (basketData?.basketitem_set.length && resetBasket) {
       dispatch(
         api.util.invalidateTags([
           'Checkout',
@@ -39,13 +39,11 @@ export default function ClientRoot({
         ])
       );
 
-      if (resetBasket) {
-        clearBasket();
-      }
+      clearBasket();
     }
 
     removeCookie('pz-reset-basket');
-  }, [resetBasket]);
+  }, [resetBasket, isSuccess, basketData]);
 
   useEffect(() => {
     if (resetClientCache) {

package/package.json

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

package/redux/middlewares/checkout.ts

@@ -14,6 +14,7 @@ import {
   setPaymentChoices,
   setPaymentOptions,
   setPreOrder,
+  setRetailStores,
   setShippingOptions,
   setShippingStepCompleted
 } from '../../redux/reducers/checkout';
@@ -223,6 +224,10 @@ export const contextListMiddleware: Middleware = ({
         if (context.page_context.balance) {
           dispatch(setLoyaltyBalance(context.page_context.balance));
         }
+
+        if (context.page_context.retail_stores) {
+          dispatch(setRetailStores(context.page_context.retail_stores));
+        }
       });
     }
 

package/redux/reducers/checkout.ts

@@ -12,6 +12,7 @@ import {
   PaymentChoice,
   PaymentOption,
   PreOrder,
+  RetailStore,
   ShippingOption
 } from '../../types';
 
@@ -42,6 +43,7 @@ export interface CheckoutState {
   bankAccounts: BankAccount[];
   selectedBankAccountPk: number;
   loyaltyBalance?: string;
+  retailStores: RetailStore[];
 }
 
 const initialState: CheckoutState = {
@@ -68,7 +70,8 @@ const initialState: CheckoutState = {
   cardType: null,
   installmentOptions: [],
   bankAccounts: [],
-  selectedBankAccountPk: null
+  selectedBankAccountPk: null,
+  retailStores: []
 };
 
 const checkoutSlice = createSlice({
@@ -134,6 +137,9 @@ const checkoutSlice = createSlice({
     },
     setLoyaltyBalance(state, { payload }) {
       state.loyaltyBalance = payload;
+    },
+    setRetailStores(state, { payload }) {
+      state.retailStores = payload;
     }
   }
 });
@@ -158,7 +164,8 @@ export const {
   setInstallmentOptions,
   setBankAccounts,
   setSelectedBankAccountPk,
-  setLoyaltyBalance
+  setLoyaltyBalance,
+  setRetailStores
 } = checkoutSlice.actions;
 
 export default checkoutSlice.reducer;

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/checkout.ts

@@ -103,6 +103,7 @@ export interface CheckoutContext {
     card_type: CreditCardType;
     installments?: InstallmentOption[];
     bank_accounts?: BankAccount[];
+    retail_stores?: RetailStore[];
     redirect_url?: string;
     context_data?: any;
     balance?: string;

package/utils/index.ts

@@ -36,6 +36,10 @@ export function removeCookie(name: string) {
 }
 
 export function setCurrency(currency: string) {
+  if (getCookie('pz-currency') !== currency) {
+    setCookie('pz-reset-basket', 'true');
+  }
+
   setCookie('pz-currency', currency);
 }
 

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) => {