@akinon/next 1.14.0 → 1.14.1

package/components/trans.tsx

@@ -1,39 +1,39 @@
-'use client';
-
-import { Fragment, useMemo } from 'react';
-import reactStringReplace from 'react-string-replace';
-import { useLocalization } from '@akinon/next/hooks';
-
-interface TransProps {
-  i18nKey: string;
-  components?: {
-    [key: string]: React.ReactElement;
-  };
-}
-
-export const Trans = ({ i18nKey, components }: TransProps) => {
-  const { t } = useLocalization();
-  const value = t(i18nKey);
-
-  const replacedValue = useMemo(() => {
-    if (!components) {
-      return value;
-    }
-
-    let text;
-
-    for (const [k] of Object.entries(components)) {
-      text = reactStringReplace(
-        text ?? value,
-        new RegExp(`(<${k}/>|<${k} />)`),
-        (_match, i) => (
-          <Fragment key={`trans-${k}-${i}`}>{components[k]}</Fragment>
-        )
-      );
-    }
-
-    return text;
-  }, [value, components]);
-
-  return <>{replacedValue}</>;
-};
+'use client';
+
+import { Fragment, useMemo } from 'react';
+import reactStringReplace from 'react-string-replace';
+import { useLocalization } from '@akinon/next/hooks';
+
+interface TransProps {
+  i18nKey: string;
+  components?: {
+    [key: string]: React.ReactElement;
+  };
+}
+
+export const Trans = ({ i18nKey, components }: TransProps) => {
+  const { t } = useLocalization();
+  const value = t(i18nKey);
+
+  const replacedValue = useMemo(() => {
+    if (!components) {
+      return value;
+    }
+
+    let text;
+
+    for (const [k] of Object.entries(components)) {
+      text = reactStringReplace(
+        text ?? value,
+        new RegExp(`(<${k}/>|<${k} />)`),
+        (_match, i) => (
+          <Fragment key={`trans-${k}-${i}`}>{components[k]}</Fragment>
+        )
+      );
+    }
+
+    return text;
+  }, [value, components]);
+
+  return <>{replacedValue}</>;
+};

package/data/client/account.ts

@@ -1,208 +1,208 @@
-import { api } from './api';
-import { account, user } from '../urls';
-import { buildClientRequestUrl } from '../../utils';
-import {
-  AccountChangeEmailFormType,
-  AccountChangePasswordFormType,
-  AccountOrderCancellation,
-  AccountOrderCancellationReason,
-  ContactFormType,
-  Order,
-  Quotations
-} from '../../types';
-
-interface GetOrdersResponse {
-  count: number;
-  results: Order[];
-}
-
-interface GetOrdersParams {
-  limit?: number;
-  page?: number;
-  createdDate?: string;
-}
-
-export interface GetQuotationsResponse {
-  count: number;
-  results: Quotations[];
-}
-
-export type PasswordResetType = {
-  password: string;
-  repeatPassword: string;
-  slug: string;
-};
-
-export type AccountProfileFormFilteredType = {
-  first_name: string;
-  last_name: string;
-  phone: string;
-  date_of_birth: string;
-  gender: string;
-  sms_allowed: boolean;
-  email_allowed: boolean;
-};
-
-export type ContactFormSubject = [
-  {
-    id: string;
-    is_order_needed: boolean;
-    text: string;
-  }
-];
-
-interface LoyaltyTransactions {
-  count: number;
-  results: {
-    amount: string;
-    created_date: string;
-    transaction: {
-      created_date: string;
-      order: string;
-    };
-  }[];
-}
-
-const accountApi = api.injectEndpoints({
-  endpoints: (builder) => ({
-    updatePassword: builder.mutation<void, AccountChangePasswordFormType>({
-      query: (body) => ({
-        url: buildClientRequestUrl(account.updatePassword, {
-          contentType: 'application/json'
-        }),
-        method: 'POST',
-        body
-      })
-    }),
-    updateEmail: builder.mutation<void, AccountChangeEmailFormType>({
-      query: (body) => ({
-        url: buildClientRequestUrl(account.updateEmail, {
-          contentType: 'application/json'
-        }),
-        method: 'POST',
-        body
-      })
-    }),
-    updateProfile: builder.mutation<void, AccountProfileFormFilteredType>({
-      query: (body) => ({
-        url: buildClientRequestUrl(account.updateProfile, {
-          accept: 'application/json',
-          contentType: 'application/json'
-        }),
-        method: 'PATCH',
-        body
-      }),
-      invalidatesTags: ['Profile']
-    }),
-    getProfileInfo: builder.query<any, void>({
-      query: () => buildClientRequestUrl(user.profiles),
-      providesTags: ['Profile']
-    }),
-    getContactSubjects: builder.query<ContactFormSubject, void>({
-      query: () => buildClientRequestUrl(account.getContactSubjects)
-    }),
-    getOrder: builder.query<any, string>({
-      query: (id) => buildClientRequestUrl(account.orderId(id))
-    }),
-    getOrders: builder.query<GetOrdersResponse, GetOrdersParams>({
-      query: ({ page, limit, createdDate } = {}) =>
-        buildClientRequestUrl(account.getOrders({ page, limit, createdDate }))
-    }),
-    getQuotations: builder.query<GetQuotationsResponse, void>({
-      query: () => buildClientRequestUrl(account.getQuotations)
-    }),
-    sendContact: builder.mutation<void, ContactFormType>({
-      query: (body) => ({
-        url: buildClientRequestUrl(account.sendContact, {
-          contentType: 'application/json',
-          responseType: 'text'
-        }),
-        method: 'POST',
-        body
-      })
-    }),
-    cancelOrder: builder.mutation<void, AccountOrderCancellation>({
-      query: ({ id, ...body }) => ({
-        url: buildClientRequestUrl(account.cancelOrder(id), {
-          contentType: 'application/json'
-        }),
-        method: 'POST',
-        body
-      })
-    }),
-    bulkCancellation: builder.mutation<void, AccountOrderCancellation>({
-      query: (body) => ({
-        url: buildClientRequestUrl(account.bulkCancellationRequest, {
-          contentType: 'application/json'
-        }),
-        method: 'POST',
-        body
-      })
-    }),
-    getCancellationReasons: builder.query<AccountOrderCancellationReason, void>(
-      {
-        query: () => buildClientRequestUrl(account.cancellationReasons)
-      }
-    ),
-    passwordReset: builder.mutation<void, PasswordResetType>({
-      query: ({ slug, password, repeatPassword }) => ({
-        url: buildClientRequestUrl(account.passwordReset(slug), {
-          useFormData: true
-        }),
-        method: 'POST',
-        body: {
-          new_password1: password,
-          new_password2: repeatPassword
-        }
-      })
-    }),
-    getBasketOffers: builder.query<any, void>({
-      query: () => buildClientRequestUrl('/account/basket-offers')
-    }),
-    getFutureBasketOffers: builder.query<any, void>({
-      query: () => buildClientRequestUrl('/account/future-basket-offers')
-    }),
-    getExpiredBasketOffers: builder.query<any, void>({
-      query: () => buildClientRequestUrl('/account/expired-basket-offers')
-    }),
-    getDiscountItems: builder.query<any, void>({
-      query: () => buildClientRequestUrl('/account/discount-items')
-    }),
-    anonymize: builder.mutation<string, void>({
-      query: () => ({
-        url: buildClientRequestUrl(account.anonymize),
-        method: 'PATCH'
-      })
-    }),
-    getLoyaltyBalance: builder.query<{ balance: number }, void>({
-      query: () => buildClientRequestUrl(account.loyaltyBalance)
-    }),
-    getLoyaltyTransactions: builder.query<LoyaltyTransactions, void>({
-      query: () => buildClientRequestUrl(account.loyaltyTransactions)
-    })
-  }),
-  overrideExisting: true
-});
-
-export const {
-  useGetContactSubjectsQuery,
-  useGetOrderQuery,
-  useGetOrdersQuery,
-  useGetQuotationsQuery,
-  useSendContactMutation,
-  useUpdateEmailMutation,
-  useUpdatePasswordMutation,
-  useUpdateProfileMutation,
-  useGetProfileInfoQuery,
-  useCancelOrderMutation,
-  useBulkCancellationMutation,
-  useGetCancellationReasonsQuery,
-  useGetBasketOffersQuery,
-  useGetFutureBasketOffersQuery,
-  useGetExpiredBasketOffersQuery,
-  useGetDiscountItemsQuery,
-  usePasswordResetMutation,
-  useAnonymizeMutation,
-  useGetLoyaltyBalanceQuery,
-  useGetLoyaltyTransactionsQuery
-} = accountApi;
+import { api } from './api';
+import { account, user } from '../urls';
+import { buildClientRequestUrl } from '../../utils';
+import {
+  AccountChangeEmailFormType,
+  AccountChangePasswordFormType,
+  AccountOrderCancellation,
+  AccountOrderCancellationReason,
+  ContactFormType,
+  Order,
+  Quotations
+} from '../../types';
+
+interface GetOrdersResponse {
+  count: number;
+  results: Order[];
+}
+
+interface GetOrdersParams {
+  limit?: number;
+  page?: number;
+  createdDate?: string;
+}
+
+export interface GetQuotationsResponse {
+  count: number;
+  results: Quotations[];
+}
+
+export type PasswordResetType = {
+  password: string;
+  repeatPassword: string;
+  slug: string;
+};
+
+export type AccountProfileFormFilteredType = {
+  first_name: string;
+  last_name: string;
+  phone: string;
+  date_of_birth: string;
+  gender: string;
+  sms_allowed: boolean;
+  email_allowed: boolean;
+};
+
+export type ContactFormSubject = [
+  {
+    id: string;
+    is_order_needed: boolean;
+    text: string;
+  }
+];
+
+interface LoyaltyTransactions {
+  count: number;
+  results: {
+    amount: string;
+    created_date: string;
+    transaction: {
+      created_date: string;
+      order: string;
+    };
+  }[];
+}
+
+const accountApi = api.injectEndpoints({
+  endpoints: (builder) => ({
+    updatePassword: builder.mutation<void, AccountChangePasswordFormType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.updatePassword, {
+          contentType: 'application/json'
+        }),
+        method: 'POST',
+        body
+      })
+    }),
+    updateEmail: builder.mutation<void, AccountChangeEmailFormType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.updateEmail, {
+          contentType: 'application/json'
+        }),
+        method: 'POST',
+        body
+      })
+    }),
+    updateProfile: builder.mutation<void, AccountProfileFormFilteredType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.updateProfile, {
+          accept: 'application/json',
+          contentType: 'application/json'
+        }),
+        method: 'PATCH',
+        body
+      }),
+      invalidatesTags: ['Profile']
+    }),
+    getProfileInfo: builder.query<any, void>({
+      query: () => buildClientRequestUrl(user.profiles),
+      providesTags: ['Profile']
+    }),
+    getContactSubjects: builder.query<ContactFormSubject, void>({
+      query: () => buildClientRequestUrl(account.getContactSubjects)
+    }),
+    getOrder: builder.query<any, string>({
+      query: (id) => buildClientRequestUrl(account.orderId(id))
+    }),
+    getOrders: builder.query<GetOrdersResponse, GetOrdersParams>({
+      query: ({ page, limit, createdDate } = {}) =>
+        buildClientRequestUrl(account.getOrders({ page, limit, createdDate }))
+    }),
+    getQuotations: builder.query<GetQuotationsResponse, void>({
+      query: () => buildClientRequestUrl(account.getQuotations)
+    }),
+    sendContact: builder.mutation<void, ContactFormType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.sendContact, {
+          contentType: 'application/json',
+          responseType: 'text'
+        }),
+        method: 'POST',
+        body
+      })
+    }),
+    cancelOrder: builder.mutation<void, AccountOrderCancellation>({
+      query: ({ id, ...body }) => ({
+        url: buildClientRequestUrl(account.cancelOrder(id), {
+          contentType: 'application/json'
+        }),
+        method: 'POST',
+        body
+      })
+    }),
+    bulkCancellation: builder.mutation<void, AccountOrderCancellation>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.bulkCancellationRequest, {
+          contentType: 'application/json'
+        }),
+        method: 'POST',
+        body
+      })
+    }),
+    getCancellationReasons: builder.query<AccountOrderCancellationReason, void>(
+      {
+        query: () => buildClientRequestUrl(account.cancellationReasons)
+      }
+    ),
+    passwordReset: builder.mutation<void, PasswordResetType>({
+      query: ({ slug, password, repeatPassword }) => ({
+        url: buildClientRequestUrl(account.passwordReset(slug), {
+          useFormData: true
+        }),
+        method: 'POST',
+        body: {
+          new_password1: password,
+          new_password2: repeatPassword
+        }
+      })
+    }),
+    getBasketOffers: builder.query<any, void>({
+      query: () => buildClientRequestUrl('/account/basket-offers')
+    }),
+    getFutureBasketOffers: builder.query<any, void>({
+      query: () => buildClientRequestUrl('/account/future-basket-offers')
+    }),
+    getExpiredBasketOffers: builder.query<any, void>({
+      query: () => buildClientRequestUrl('/account/expired-basket-offers')
+    }),
+    getDiscountItems: builder.query<any, void>({
+      query: () => buildClientRequestUrl('/account/discount-items')
+    }),
+    anonymize: builder.mutation<string, void>({
+      query: () => ({
+        url: buildClientRequestUrl(account.anonymize),
+        method: 'PATCH'
+      })
+    }),
+    getLoyaltyBalance: builder.query<{ balance: number }, void>({
+      query: () => buildClientRequestUrl(account.loyaltyBalance)
+    }),
+    getLoyaltyTransactions: builder.query<LoyaltyTransactions, void>({
+      query: () => buildClientRequestUrl(account.loyaltyTransactions)
+    })
+  }),
+  overrideExisting: true
+});
+
+export const {
+  useGetContactSubjectsQuery,
+  useGetOrderQuery,
+  useGetOrdersQuery,
+  useGetQuotationsQuery,
+  useSendContactMutation,
+  useUpdateEmailMutation,
+  useUpdatePasswordMutation,
+  useUpdateProfileMutation,
+  useGetProfileInfoQuery,
+  useCancelOrderMutation,
+  useBulkCancellationMutation,
+  useGetCancellationReasonsQuery,
+  useGetBasketOffersQuery,
+  useGetFutureBasketOffersQuery,
+  useGetExpiredBasketOffersQuery,
+  useGetDiscountItemsQuery,
+  usePasswordResetMutation,
+  useAnonymizeMutation,
+  useGetLoyaltyBalanceQuery,
+  useGetLoyaltyTransactionsQuery
+} = accountApi;

package/data/client/api.ts

@@ -1,85 +1,85 @@
-import {
-  createApi,
-  fetchBaseQuery,
-  retry,
-  BaseQueryFn,
-  FetchBaseQueryError,
-  FetchBaseQueryMeta,
-  FetchArgs,
-  BaseQueryApi
-} from '@reduxjs/toolkit/query/react';
-import settings from 'settings';
-import { getCookie } from '../../utils';
-import { RootState } from '@theme/redux/store';
-
-interface CustomBaseQueryApi extends BaseQueryApi {
-  getState: () => RootState;
-}
-
-const customBaseQuery: BaseQueryFn<
-  string | FetchArgs,
-  unknown,
-  FetchBaseQueryError,
-  {},
-  FetchBaseQueryMeta
-> = async (args, api: CustomBaseQueryApi, extraOptions) => {
-  const mutations = Object.entries(api.getState()?.api?.mutations ?? {}).map(
-    (x) => x[1]
-  );
-
-  if (
-    api.type === 'mutation' &&
-    mutations.filter(
-      (m) => m.status === 'pending' && m.endpointName === api.endpoint
-    ).length > 1
-  ) {
-    api.abort('Mutation already in progress.');
-  }
-
-  const baseQuery = fetchBaseQuery({
-    prepareHeaders: async (headers) => {
-      const csrfCookie = getCookie('csrftoken');
-      const activeLocale = getCookie('pz-locale');
-      const localeApiValue = settings.localization.locales.find(
-        (locale) => locale.value === activeLocale
-      )?.apiValue;
-      const activeCurrency = getCookie('pz-currency');
-
-      headers.set('Accept-Language', `${localeApiValue}`);
-      headers.set('x-currency', `${activeCurrency}`);
-
-      if (csrfCookie) {
-        headers.set('x-csrftoken', `${csrfCookie}`);
-      }
-      return headers;
-    },
-    credentials: 'include'
-  });
-  try {
-    const result = await baseQuery(args, api, extraOptions);
-    return result;
-  } catch (error) {
-    return { error };
-  }
-};
-
-export const api = createApi({
-  reducerPath: 'api',
-  baseQuery: retry(customBaseQuery, { maxRetries: 3 }),
-  tagTypes: [
-    'Basket',
-    'BasketB2b',
-    'DraftsB2b',
-    'Product',
-    'Checkout',
-    'Favorite',
-    'Addresses',
-    'Profile',
-    'StockAlert'
-  ],
-  endpoints: () => ({})
-});
-
-export const {
-  util: { invalidateTags }
-} = api;
+import {
+  createApi,
+  fetchBaseQuery,
+  retry,
+  BaseQueryFn,
+  FetchBaseQueryError,
+  FetchBaseQueryMeta,
+  FetchArgs,
+  BaseQueryApi
+} from '@reduxjs/toolkit/query/react';
+import settings from 'settings';
+import { getCookie } from '../../utils';
+import { RootState } from '@theme/redux/store';
+
+interface CustomBaseQueryApi extends BaseQueryApi {
+  getState: () => RootState;
+}
+
+const customBaseQuery: BaseQueryFn<
+  string | FetchArgs,
+  unknown,
+  FetchBaseQueryError,
+  {},
+  FetchBaseQueryMeta
+> = async (args, api: CustomBaseQueryApi, extraOptions) => {
+  const mutations = Object.entries(api.getState()?.api?.mutations ?? {}).map(
+    (x) => x[1]
+  );
+
+  if (
+    api.type === 'mutation' &&
+    mutations.filter(
+      (m) => m.status === 'pending' && m.endpointName === api.endpoint
+    ).length > 1
+  ) {
+    api.abort('Mutation already in progress.');
+  }
+
+  const baseQuery = fetchBaseQuery({
+    prepareHeaders: async (headers) => {
+      const csrfCookie = getCookie('csrftoken');
+      const activeLocale = getCookie('pz-locale');
+      const localeApiValue = settings.localization.locales.find(
+        (locale) => locale.value === activeLocale
+      )?.apiValue;
+      const activeCurrency = getCookie('pz-currency');
+
+      headers.set('Accept-Language', `${localeApiValue}`);
+      headers.set('x-currency', `${activeCurrency}`);
+
+      if (csrfCookie) {
+        headers.set('x-csrftoken', `${csrfCookie}`);
+      }
+      return headers;
+    },
+    credentials: 'include'
+  });
+  try {
+    const result = await baseQuery(args, api, extraOptions);
+    return result;
+  } catch (error) {
+    return { error };
+  }
+};
+
+export const api = createApi({
+  reducerPath: 'api',
+  baseQuery: retry(customBaseQuery, { maxRetries: 3 }),
+  tagTypes: [
+    'Basket',
+    'BasketB2b',
+    'DraftsB2b',
+    'Product',
+    'Checkout',
+    'Favorite',
+    'Addresses',
+    'Profile',
+    'StockAlert'
+  ],
+  endpoints: () => ({})
+});
+
+export const {
+  util: { invalidateTags }
+} = api;