@akinon/next 1.23.0-rc.3 → 1.23.0-rc.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @akinon/next
 
+## 1.23.0-rc.4
+
+### Minor Changes
+
+- 8bc6085: ZERO-2472: RTK Query Invalidate
+
+### Patch Changes
+
+- 2e9476c: ZERO-2434: remove error throwing in appFetch
+
 ## 1.23.0-rc.3
 
 ### Minor Changes

package/data/client/address.ts

@@ -32,10 +32,12 @@ const addressApi = api.injectEndpoints({
       query: () => buildClientRequestUrl(address.getRetailStore)
     }),
     getRetailStoreCities: builder.query<GetResponse<any>, string>({
-      query: (country) => buildClientRequestUrl(address.getRetailStoreCities(country))
+      query: (country) =>
+        buildClientRequestUrl(address.getRetailStoreCities(country))
     }),
     getRetailStoreTownships: builder.query<GetResponse<any>, string>({
-      query: (city) => buildClientRequestUrl(address.getRetailStoreTownships(city))
+      query: (city) =>
+        buildClientRequestUrl(address.getRetailStoreTownships(city))
     }),
     addAddress: builder.mutation<Address, Partial<Address>>({
       query: (body) => ({
@@ -48,7 +50,7 @@ const addressApi = api.injectEndpoints({
           type: body.is_corporate === 'true' ? 'corporate' : 'personal'
         }
       }),
-      invalidatesTags: ['Addresses', 'Checkout'] // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout'])
     }),
     editAddress: builder.mutation<Address, Partial<Address>>({
       query: ({ pk, ...body }) => ({
@@ -62,14 +64,14 @@ const addressApi = api.injectEndpoints({
           type: body.is_corporate === 'true' ? 'corporate' : 'personal'
         }
       }),
-      invalidatesTags: ['Addresses', 'Checkout'] // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout']) // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
     }),
     removeAddress: builder.mutation<void, number>({
       query: (id) => ({
         url: buildClientRequestUrl(address.removeAddress(id)),
         method: 'DELETE'
       }),
-      invalidatesTags: ['Addresses', 'Checkout'] // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout']) // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
     }),
     setDefaultAddress: builder.mutation<Address, Partial<Address>>({
       query: ({ pk, primary }) => ({
@@ -79,7 +81,7 @@ const addressApi = api.injectEndpoints({
         method: 'PATCH',
         body: { primary }
       }),
-      invalidatesTags: ['Addresses']
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses'])
     }),
     getStores: builder.query<GetResponse<Address>, void>({
       query: () => ({

package/data/client/wishlist.ts

@@ -73,14 +73,14 @@ export const wishlistApi = api.injectEndpoints({
           product: productPk
         }
       }),
-      invalidatesTags: ['Favorite']
+      invalidatesTags: (_, error) => (error ? [] : ['Favorite'])
     }),
     removeFavorite: build.mutation<RemoteFavoriteResponse, number>({
       query: (favPk: number) => ({
         url: buildClientRequestUrl(wishlist.removeFavorite(favPk)),
         method: 'DELETE'
       }),
-      invalidatesTags: ['Favorite']
+      invalidatesTags: (_, error) => (error ? [] : ['Favorite'])
     }),
     addStockAlert: build.mutation<AddStockAlertResponse, AddStockAlertRequest>({
       query: ({ productPk, email }) => ({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.23.0-rc.3",
+  "version": "1.23.0-rc.4",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -32,7 +32,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.23.0-rc.3",
+    "@akinon/eslint-plugin-projectzero": "1.23.0-rc.4",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/utils/app-fetch.ts

@@ -28,7 +28,7 @@ const appFetch = async <T>(
 
     if (commerceUrl === 'default') {
       logger.error('Commerce URL is not set. Current value is "default"');
-      throw new Error('Commerce URL is not set');
+      return undefined;
     }
 
     const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
@@ -48,10 +48,6 @@ const appFetch = async <T>(
     status = req.status;
     logger.debug(`FETCH END ${url}`, { status: req.status, ip });
 
-    if (!req.ok) {
-      throw new Error(`Request failed with status ${status}`);
-    }
-
     if (responseType === FetchResponseType.JSON) {
       response = (await req.json()) as T;
     } else {
@@ -65,13 +61,6 @@ const appFetch = async <T>(
     if (!url.toString().includes('/cms/seo/')) {
       logger[logType](`FETCH FAILED`, { url, status, error, ip });
     }
-
-    // throw the error if it's fatal, so it can be caught and handled at higher levels
-    if (logType === 'fatal') {
-      throw error;
-    }
-
-    return Promise.reject(error);
   }
 
   return response;