@faststore/api 2.2.30 → 2.2.35

package/dist/platforms/vtex/clients/commerce/index.d.ts

@@ -47,6 +47,9 @@ export declare const VtexCommerce: ({ account, environment, incrementAddress }:
             refreshOutdatedData?: boolean | undefined;
             channel?: Required<Channel> | undefined;
         }) => Promise<OrderForm>;
+        clearOrderFormMessages: ({ id }: {
+            id: string;
+        }) => Promise<any>;
         updateOrderFormItems: ({ id, orderItems, allowOutdatedData, salesChannel, shouldSplitItem, }: {
             id: string;
             orderItems: OrderFormInputItem[];

package/dist/platforms/vtex/clients/index.d.ts

@@ -40,6 +40,9 @@ export declare const getClients: (options: Options, ctx: Context) => {
                 refreshOutdatedData?: boolean | undefined;
                 channel?: Required<import("../utils/channel").Channel> | undefined;
             }) => Promise<import("./commerce/types/OrderForm").OrderForm>;
+            clearOrderFormMessages: ({ id }: {
+                id: string;
+            }) => Promise<any>;
             updateOrderFormItems: ({ id, orderItems, allowOutdatedData, salesChannel, shouldSplitItem, }: {
                 id: string;
                 orderItems: import("./commerce/types/OrderForm").OrderFormInputItem[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/api",
-  "version": "2.2.30",
+  "version": "2.2.35",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -37,8 +37,8 @@
   },
   "devDependencies": {
     "@envelop/core": "^2.6.0",
-    "@faststore/eslint-config": "^2.2.30",
-    "@faststore/shared": "^2.2.30",
+    "@faststore/eslint-config": "^2.2.33",
+    "@faststore/shared": "^2.2.33",
     "@graphql-codegen/cli": "2.2.0",
     "@graphql-codegen/typescript": "2.2.2",
     "@types/express": "^4.17.16",
@@ -58,5 +58,5 @@
     "@envelop/core": "^1 || ^2",
     "graphql": "^15.6.0"
   },
-  "gitHead": "f29b50a0f14b5447aa03ab71764bc30af80b3f80"
+  "gitHead": "dbb59ea5a444b7b542481b6842ab8bc230ed9a94"
 }

package/src/platforms/vtex/clients/commerce/index.ts

@@ -163,6 +163,17 @@ export const VtexCommerce = (
           requestInit
         )
       },
+
+      clearOrderFormMessages: ({ id }: { id: string }) => {
+        return fetchAPI(
+          `${base}/api/checkout/pub/orderForm/${id}/messages/clear`,
+          {
+            ...BASE_INIT,
+            body: '{}',
+          }
+        )
+      },
+
       updateOrderFormItems: ({
         id,
         orderItems,

package/src/platforms/vtex/resolvers/searchResult.ts

@@ -9,7 +9,12 @@ export type Root = {
   productSearchPromise: Promise<ProductSearchResult>
 }
 
-const isRootFacet = (facet: Facet) => facet.key === 'category-1'
+const isRootFacet = (facet: Facet, isDepartment: boolean, isBrand: boolean) =>
+  isDepartment
+    ? facet.key === 'category-1'
+    : isBrand
+    ? facet.key === 'brand'
+    : false
 
 export const StoreSearchResult: Record<string, Resolver<Root>> = {
   suggestions: async (root, _, ctx) => {
@@ -89,9 +94,21 @@ export const StoreSearchResult: Record<string, Resolver<Root>> = {
 
     const isCollectionPage = !searchArgs.query
 
+    const isDepartment = searchArgs.selectedFacets?.length
+      ? searchArgs.selectedFacets[0].key === 'category-1'
+      : false
+
+    const isBrand = searchArgs.selectedFacets?.length
+      ? searchArgs.selectedFacets[0].key === 'brand'
+      : false
+
     const filteredFacets = facets
-      // Remove root facet on category pages
-      .filter((facet) => !isCollectionPage || !isRootFacet(facet))
+      // Remove root facet on category and brand pages
+      // TODO: Hide category filters for category pages. E.g. /office/desks
+      .filter(
+        (facet) =>
+          !isCollectionPage || !isRootFacet(facet, isDepartment, isBrand)
+      )
 
     return filteredFacets
   },

package/src/platforms/vtex/resolvers/validateCart.ts

@@ -214,6 +214,15 @@ const getOrderForm = async (id: string, { clients: { commerce } }: Context) => {
   })
 }
 
+const clearOrderFormMessages = async (
+  id: string,
+  { clients: { commerce } }: Context
+) => {
+  return commerce.checkout.clearOrderFormMessages({
+    id,
+  })
+}
+
 const updateOrderFormShippingData = async (
   orderForm: OrderForm,
   session: Maybe<IStoreSession> | undefined,
@@ -310,6 +319,12 @@ export const validateCart = async (
   // Step1: Get OrderForm from VTEX Commerce
   const orderForm = await getOrderForm(orderNumber, ctx)
 
+  // Clear messages so it doesn't keep populating toasts on a loop
+  // In the next validateCart mutation it will only have messages if a new message is created on orderForm
+  if (orderForm.messages.length !== 0) {
+    await clearOrderFormMessages(orderNumber, ctx)
+  }
+
   // Step1.5: Check if another system changed the orderForm with this orderNumber
   // If so, this means the user interacted with this cart elsewhere and expects
   // to see this new cart state instead of what's stored on the user's browser.
@@ -386,8 +401,13 @@ export const validateCart = async (
     .then((form: OrderForm) => setOrderFormEtag(form, commerce))
     .then(joinItems)
 
+  const equalMessages = deepEquals(
+    orderForm.messages,
+    updatedOrderForm.messages
+  )
+
   // Step5: If no changes detected before/after updating orderForm, the order is validated
-  if (equals(order, updatedOrderForm)) {
+  if (equals(order, updatedOrderForm) && equalMessages) {
     return null
   }
   // Step6: There were changes, convert orderForm to StoreCart