From 6d61cd19578749afef935d9bdd865852b12bddbd Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Wed, 18 Dec 2024 12:37:14 +0100
Subject: [PATCH 1/7] fix: cart refreshing issues

---
 client-app/core/api/graphql/cart/consts.ts           |  1 +
 .../graphql/cart/mutations/addBulkItemsCart/index.ts | 12 ++----------
 .../graphql/cart/mutations/addItemToCart/index.ts    | 12 ++----------
 .../api/graphql/cart/mutations/addItemsCart/index.ts | 12 ++----------
 .../mutations/changeShortCartItemQuantity/index.ts   | 12 ++----------
 .../api/graphql/cart/queries/getShortCart/index.ts   |  6 +-----
 client-app/pages/cart.vue                            |  2 +-
 7 files changed, 11 insertions(+), 46 deletions(-)

diff --git a/client-app/core/api/graphql/cart/consts.ts b/client-app/core/api/graphql/cart/consts.ts
index 3d104545eb..b2cfba3614 100644
--- a/client-app/core/api/graphql/cart/consts.ts
+++ b/client-app/core/api/graphql/cart/consts.ts
@@ -14,6 +14,7 @@ export const FULL_CART_MUTATION_NAMES = [
   OperationNames.Mutation.AddOrUpdateCartShipment,
   OperationNames.Mutation.ChangeCartComment,
   OperationNames.Mutation.ChangeFullCartItemQuantity,
+  OperationNames.Mutation.ChangeFullCartItemsQuantity,
   OperationNames.Mutation.ChangePurchaseOrderNumber,
   OperationNames.Mutation.ClearCart,
   OperationNames.Mutation.RejectGiftItems,
diff --git a/client-app/core/api/graphql/cart/mutations/addBulkItemsCart/index.ts b/client-app/core/api/graphql/cart/mutations/addBulkItemsCart/index.ts
index a7a9df0471..09c1c0a4da 100644
--- a/client-app/core/api/graphql/cart/mutations/addBulkItemsCart/index.ts
+++ b/client-app/core/api/graphql/cart/mutations/addBulkItemsCart/index.ts
@@ -1,19 +1,11 @@
-import { useApolloClient } from "@vue/apollo-composable";
 import { useCartMutationVariables } from "@/core/api/graphql/cart/composables";
 import { useMutation } from "@/core/api/graphql/composables";
-import { AddBulkItemsCartDocument, OperationNames } from "@/core/api/graphql/types";
-import { filterActiveQueryNames } from "@/core/api/graphql/utils";
+import { AddBulkItemsCartDocument } from "@/core/api/graphql/types";
 import type { BulkCartType, InputNewBulkItemType, CartIdFragment } from "@/core/api/graphql/types";
 import type { MaybeRef } from "vue";
 
 export function useAddBulkItemsCartMutation(cart?: MaybeRef<CartIdFragment | undefined>) {
-  const { client } = useApolloClient();
-  return useMutation(
-    AddBulkItemsCartDocument,
-    useCartMutationVariables(cart, {
-      refetchQueries: () => filterActiveQueryNames(client, [OperationNames.Query.GetFullCart]),
-    }),
-  );
+  return useMutation(AddBulkItemsCartDocument, useCartMutationVariables(cart, {}));
 }
 
 /** @deprecated Use {@link useAddBulkItemsCartMutation} instead. */
diff --git a/client-app/core/api/graphql/cart/mutations/addItemToCart/index.ts b/client-app/core/api/graphql/cart/mutations/addItemToCart/index.ts
index 9028e2943b..95bebfab86 100644
--- a/client-app/core/api/graphql/cart/mutations/addItemToCart/index.ts
+++ b/client-app/core/api/graphql/cart/mutations/addItemToCart/index.ts
@@ -1,19 +1,11 @@
-import { useApolloClient } from "@vue/apollo-composable";
 import { useCartMutationVariables } from "@/core/api/graphql/cart/composables";
 import { useMutation } from "@/core/api/graphql/composables";
-import { AddItemDocument, OperationNames } from "@/core/api/graphql/types";
-import { filterActiveQueryNames } from "@/core/api/graphql/utils";
+import { AddItemDocument } from "@/core/api/graphql/types";
 import type { CartType, CartIdFragment } from "@/core/api/graphql/types";
 import type { MaybeRef } from "vue";
 
 export function useAddItemToCartMutation(cart?: MaybeRef<CartIdFragment | undefined>) {
-  const { client } = useApolloClient();
-  return useMutation(
-    AddItemDocument,
-    useCartMutationVariables(cart, {
-      refetchQueries: () => filterActiveQueryNames(client, [OperationNames.Query.GetFullCart]),
-    }),
-  );
+  return useMutation(AddItemDocument, useCartMutationVariables(cart));
 }
 
 /** @deprecated Use {@link useAddItemToCartMutation} instead. */
diff --git a/client-app/core/api/graphql/cart/mutations/addItemsCart/index.ts b/client-app/core/api/graphql/cart/mutations/addItemsCart/index.ts
index 56254f687e..4c79bf7119 100644
--- a/client-app/core/api/graphql/cart/mutations/addItemsCart/index.ts
+++ b/client-app/core/api/graphql/cart/mutations/addItemsCart/index.ts
@@ -1,19 +1,11 @@
-import { useApolloClient } from "@vue/apollo-composable";
 import { useCartMutationVariables } from "@/core/api/graphql/cart/composables";
 import { useMutation } from "@/core/api/graphql/composables";
-import { AddItemsCartDocument, OperationNames } from "@/core/api/graphql/types";
-import { filterActiveQueryNames } from "@/core/api/graphql/utils";
+import { AddItemsCartDocument } from "@/core/api/graphql/types";
 import type { CartType, InputNewCartItemType, CartIdFragment } from "@/core/api/graphql/types";
 import type { MaybeRef } from "vue";
 
 export function useAddItemsCartMutation(cart?: MaybeRef<CartIdFragment | undefined>) {
-  const { client } = useApolloClient();
-  return useMutation(
-    AddItemsCartDocument,
-    useCartMutationVariables(cart, {
-      refetchQueries: () => filterActiveQueryNames(client, [OperationNames.Query.GetFullCart]),
-    }),
-  );
+  return useMutation(AddItemsCartDocument, useCartMutationVariables(cart, {}));
 }
 
 /** @deprecated Use {@link useAddItemsCartMutation} instead. */
diff --git a/client-app/core/api/graphql/cart/mutations/changeShortCartItemQuantity/index.ts b/client-app/core/api/graphql/cart/mutations/changeShortCartItemQuantity/index.ts
index ba652c5006..68055362e7 100644
--- a/client-app/core/api/graphql/cart/mutations/changeShortCartItemQuantity/index.ts
+++ b/client-app/core/api/graphql/cart/mutations/changeShortCartItemQuantity/index.ts
@@ -1,17 +1,9 @@
-import { useApolloClient } from "@vue/apollo-composable";
 import { useCartMutationVariables } from "@/core/api/graphql/cart/composables";
 import { useMutation } from "@/core/api/graphql/composables";
-import { ChangeShortCartItemQuantityDocument, OperationNames } from "@/core/api/graphql/types";
-import { filterActiveQueryNames } from "@/core/api/graphql/utils";
+import { ChangeShortCartItemQuantityDocument } from "@/core/api/graphql/types";
 import type { CartIdFragment } from "@/core/api/graphql/types";
 import type { MaybeRef } from "vue";
 
 export function useChangeShortCartItemQuantityMutation(cart?: MaybeRef<CartIdFragment | undefined>) {
-  const { client } = useApolloClient();
-  return useMutation(
-    ChangeShortCartItemQuantityDocument,
-    useCartMutationVariables(cart, {
-      refetchQueries: () => filterActiveQueryNames(client, [OperationNames.Query.GetFullCart]),
-    }),
-  );
+  return useMutation(ChangeShortCartItemQuantityDocument, useCartMutationVariables(cart, {}));
 }
diff --git a/client-app/core/api/graphql/cart/queries/getShortCart/index.ts b/client-app/core/api/graphql/cart/queries/getShortCart/index.ts
index 0a5cc3f9bc..7fe1ce427d 100644
--- a/client-app/core/api/graphql/cart/queries/getShortCart/index.ts
+++ b/client-app/core/api/graphql/cart/queries/getShortCart/index.ts
@@ -1,14 +1,10 @@
 import { useQuery } from "@vue/apollo-composable";
-import { computed } from "vue";
-import { useRoute } from "vue-router";
 import { useCartQueryVariables } from "@/core/api/graphql/cart/composables";
 import { GetShortCartDocument } from "@/core/api/graphql/types";
 
 export function useGetShortCartQuery() {
-  const route = useRoute();
-  const isCartPage = computed(() => route.name === "Cart");
   return useQuery(GetShortCartDocument, useCartQueryVariables(), {
     notifyOnNetworkStatusChange: true,
-    fetchPolicy: isCartPage.value ? "cache-only" : "cache-first",
+    fetchPolicy: "cache-first",
   });
 }
diff --git a/client-app/pages/cart.vue b/client-app/pages/cart.vue
index 716f13e53f..5a7fb6026d 100644
--- a/client-app/pages/cart.vue
+++ b/client-app/pages/cart.vue
@@ -1,5 +1,5 @@
 <template>
-  <VcLoaderOverlay v-if="loading" no-bg />
+  <VcLoaderOverlay v-if="loading && !cart?.items?.length" no-bg />
 
   <VcEmptyPage
     v-else-if="!cart?.items?.length"

From e873d37fcd216a5aa26b3be7d500bd8b691f24fc Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Wed, 18 Dec 2024 12:51:37 +0100
Subject: [PATCH 2/7] fix: cart refreshing issues

---
 client-app/pages/cart.vue | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/client-app/pages/cart.vue b/client-app/pages/cart.vue
index 5a7fb6026d..2cb30a1af8 100644
--- a/client-app/pages/cart.vue
+++ b/client-app/pages/cart.vue
@@ -1,20 +1,22 @@
 <template>
-  <VcLoaderOverlay v-if="loading && !cart?.items?.length" no-bg />
-
-  <VcEmptyPage
-    v-else-if="!cart?.items?.length"
-    :title="$t('pages.cart.title')"
-    :description="$t('pages.cart.empty_cart_description')"
-    image="/static/images/errors/emptyCart.webp"
-    mobile-image="/static/images/errors/emptyCartMobile.webp"
-    :breadcrumbs="breadcrumbs"
-  >
-    <template #actions>
-      <VcButton :to="{ name: 'Catalog' }" size="lg">
-        {{ $t("common.buttons.continue_shopping") }}
-      </VcButton>
-    </template>
-  </VcEmptyPage>
+  <template v-if="!cart?.items?.length">
+    <VcLoaderOverlay v-if="loading" no-bg />
+
+    <VcEmptyPage
+      v-else
+      :title="$t('pages.cart.title')"
+      :description="$t('pages.cart.empty_cart_description')"
+      image="/static/images/errors/emptyCart.webp"
+      mobile-image="/static/images/errors/emptyCartMobile.webp"
+      :breadcrumbs="breadcrumbs"
+    >
+      <template #actions>
+        <VcButton :to="{ name: 'Catalog' }" size="lg">
+          {{ $t("common.buttons.continue_shopping") }}
+        </VcButton>
+      </template>
+    </VcEmptyPage>
+  </template>
 
   <VcContainer v-else class="relative z-0 max-lg:pb-12">
     <VcLoaderOverlay :visible="isCartLoked" fixed-spinner />

From d51c63963fa98f4fe86efdcbdc0dec5876c236e4 Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Wed, 18 Dec 2024 13:16:55 +0100
Subject: [PATCH 3/7] fix: cart refreshing issues

---
 client-app/core/api/graphql/cart/consts.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client-app/core/api/graphql/cart/consts.ts b/client-app/core/api/graphql/cart/consts.ts
index b2cfba3614..fe50a3ae64 100644
--- a/client-app/core/api/graphql/cart/consts.ts
+++ b/client-app/core/api/graphql/cart/consts.ts
@@ -15,6 +15,7 @@ export const FULL_CART_MUTATION_NAMES = [
   OperationNames.Mutation.ChangeCartComment,
   OperationNames.Mutation.ChangeFullCartItemQuantity,
   OperationNames.Mutation.ChangeFullCartItemsQuantity,
+  OperationNames.Mutation.ChangeCartConfiguredItem,
   OperationNames.Mutation.ChangePurchaseOrderNumber,
   OperationNames.Mutation.ClearCart,
   OperationNames.Mutation.RejectGiftItems,

From 3a08badc8ebd8fbb571e8510c16b946d14205c5a Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Wed, 18 Dec 2024 16:39:34 +0100
Subject: [PATCH 4/7] fix: cart refreshing issues

---
 client-app/core/api/graphql/cart/consts.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client-app/core/api/graphql/cart/consts.ts b/client-app/core/api/graphql/cart/consts.ts
index fe50a3ae64..1eda152103 100644
--- a/client-app/core/api/graphql/cart/consts.ts
+++ b/client-app/core/api/graphql/cart/consts.ts
@@ -13,9 +13,9 @@ export const FULL_CART_MUTATION_NAMES = [
   OperationNames.Mutation.AddOrUpdateCartPayment,
   OperationNames.Mutation.AddOrUpdateCartShipment,
   OperationNames.Mutation.ChangeCartComment,
+  OperationNames.Mutation.ChangeCartConfiguredItem,
   OperationNames.Mutation.ChangeFullCartItemQuantity,
   OperationNames.Mutation.ChangeFullCartItemsQuantity,
-  OperationNames.Mutation.ChangeCartConfiguredItem,
   OperationNames.Mutation.ChangePurchaseOrderNumber,
   OperationNames.Mutation.ClearCart,
   OperationNames.Mutation.RejectGiftItems,

From 081a07c460d63a6b0d3b9ed6317d51f367fa1f6d Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Wed, 18 Dec 2024 16:42:18 +0100
Subject: [PATCH 5/7] fix: cart refreshing issues

---
 .../core/api/graphql/cart/mutations/addBulkItemsCart/index.ts   | 2 +-
 .../core/api/graphql/cart/mutations/addItemsCart/index.ts       | 2 +-
 .../graphql/cart/mutations/changeShortCartItemQuantity/index.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client-app/core/api/graphql/cart/mutations/addBulkItemsCart/index.ts b/client-app/core/api/graphql/cart/mutations/addBulkItemsCart/index.ts
index 09c1c0a4da..dd1e527928 100644
--- a/client-app/core/api/graphql/cart/mutations/addBulkItemsCart/index.ts
+++ b/client-app/core/api/graphql/cart/mutations/addBulkItemsCart/index.ts
@@ -5,7 +5,7 @@ import type { BulkCartType, InputNewBulkItemType, CartIdFragment } from "@/core/
 import type { MaybeRef } from "vue";
 
 export function useAddBulkItemsCartMutation(cart?: MaybeRef<CartIdFragment | undefined>) {
-  return useMutation(AddBulkItemsCartDocument, useCartMutationVariables(cart, {}));
+  return useMutation(AddBulkItemsCartDocument, useCartMutationVariables(cart));
 }
 
 /** @deprecated Use {@link useAddBulkItemsCartMutation} instead. */
diff --git a/client-app/core/api/graphql/cart/mutations/addItemsCart/index.ts b/client-app/core/api/graphql/cart/mutations/addItemsCart/index.ts
index 4c79bf7119..97b644ee5c 100644
--- a/client-app/core/api/graphql/cart/mutations/addItemsCart/index.ts
+++ b/client-app/core/api/graphql/cart/mutations/addItemsCart/index.ts
@@ -5,7 +5,7 @@ import type { CartType, InputNewCartItemType, CartIdFragment } from "@/core/api/
 import type { MaybeRef } from "vue";
 
 export function useAddItemsCartMutation(cart?: MaybeRef<CartIdFragment | undefined>) {
-  return useMutation(AddItemsCartDocument, useCartMutationVariables(cart, {}));
+  return useMutation(AddItemsCartDocument, useCartMutationVariables(cart));
 }
 
 /** @deprecated Use {@link useAddItemsCartMutation} instead. */
diff --git a/client-app/core/api/graphql/cart/mutations/changeShortCartItemQuantity/index.ts b/client-app/core/api/graphql/cart/mutations/changeShortCartItemQuantity/index.ts
index 68055362e7..ca5dda5436 100644
--- a/client-app/core/api/graphql/cart/mutations/changeShortCartItemQuantity/index.ts
+++ b/client-app/core/api/graphql/cart/mutations/changeShortCartItemQuantity/index.ts
@@ -5,5 +5,5 @@ import type { CartIdFragment } from "@/core/api/graphql/types";
 import type { MaybeRef } from "vue";
 
 export function useChangeShortCartItemQuantityMutation(cart?: MaybeRef<CartIdFragment | undefined>) {
-  return useMutation(ChangeShortCartItemQuantityDocument, useCartMutationVariables(cart, {}));
+  return useMutation(ChangeShortCartItemQuantityDocument, useCartMutationVariables(cart));
 }

From 477be6472681d11a98f008d87a9880d011ea9c5d Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Wed, 18 Dec 2024 16:51:48 +0100
Subject: [PATCH 6/7] fix: reecently browsed product - wrong quantity after
 removing from cart

---
 .../shared/catalog/components/product-card-recently-browsed.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client-app/shared/catalog/components/product-card-recently-browsed.vue b/client-app/shared/catalog/components/product-card-recently-browsed.vue
index 59583beb39..ac90125be1 100644
--- a/client-app/shared/catalog/components/product-card-recently-browsed.vue
+++ b/client-app/shared/catalog/components/product-card-recently-browsed.vue
@@ -101,6 +101,6 @@ function onValidationUpdate(validation: { isValid: true } | { isValid: false; er
 }
 
 watch(countInCart, (newCount) => {
-  quantity.value = newCount || 1;
+  quantity.value = newCount || product.value.minQuantity || 1;
 });
 </script>

From fc42b6f9c42a825e6080f12c7630e0e8d1bf1a5e Mon Sep 17 00:00:00 2001
From: Ivan Kalachikov <ivan.kalachikov@gmail.com>
Date: Thu, 19 Dec 2024 09:57:35 +0100
Subject: [PATCH 7/7] fix: loading status

---
 client-app/shared/cart/composables/useCart.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/client-app/shared/cart/composables/useCart.ts b/client-app/shared/cart/composables/useCart.ts
index 387fecf1c4..6f5a037420 100644
--- a/client-app/shared/cart/composables/useCart.ts
+++ b/client-app/shared/cart/composables/useCart.ts
@@ -305,9 +305,12 @@ export function _useFullCart() {
     await _changeItemQuantity({ command: { lineItemId, quantity } });
   }
 
-  const { mutate: _changeItemsQuantity, loading: changeItemsQuantityLoading } =
-    useChangeFullCartItemsQuantityMutation(cart);
-  const { add, overflowed: changeItemQuantityBatchedOverflowed } = useMutationBatcher(_changeItemsQuantity, {
+  const { mutate: _changeItemsQuantity } = useChangeFullCartItemsQuantityMutation(cart);
+  const {
+    add,
+    overflowed: changeItemQuantityBatchedOverflowed,
+    loading: changeItemsQuantityLoading,
+  } = useMutationBatcher(_changeItemsQuantity, {
     mergeStrategy: getMergeStrategyUniqueBy("lineItemId"),
   });
   async function changeItemQuantityBatched(lineItemId: string, quantity: number): Promise<void> {