W-21241548: resolve conflicts

Author: rvishwanathbhat

packages/commerce-sdk-react/src/hooks/ShopperBaskets/cache.ts

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: BSD-3-Clause
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import {ShopperBasketsV2Types, ShopperCustomers, ShopperCustomersTypes} from 'commerce-sdk-isomorphic'
+import {
+    ShopperBasketsV2Types,
+    ShopperCustomers,
+    ShopperCustomersTypes
+} from 'commerce-sdk-isomorphic'
 import {
     ApiClients,
     Argument,

packages/commerce-sdk-react/src/hooks/ShopperBaskets/query.ts

@@ -40,7 +40,10 @@ export const useBasket = (
     // Parameters can be set in `apiOptions` or `client.clientConfig`;
     // we must merge them in order to generate the correct query key.
     const netOptions = omitNullableParameters(mergeOptions(client, apiOptions))
-    const parameters = pickValidParams(netOptions.parameters, ShopperBasketsV2.paramKeys[methodName])
+    const parameters = pickValidParams(
+        netOptions.parameters,
+        ShopperBasketsV2.paramKeys[methodName]
+    )
     const queryKey = queryKeyHelpers[methodName].queryKey(netOptions.parameters)
     // We don't use `netOptions` here because we manipulate the options in `useQuery`.
     const method = async (options: Options) => await client[methodName](options)
@@ -82,7 +85,10 @@ export const usePaymentMethodsForBasket = (
     // Parameters can be set in `apiOptions` or `client.clientConfig`;
     // we must merge them in order to generate the correct query key.
     const netOptions = omitNullableParameters(mergeOptions(client, apiOptions))
-    const parameters = pickValidParams(netOptions.parameters, ShopperBasketsV2.paramKeys[methodName])
+    const parameters = pickValidParams(
+        netOptions.parameters,
+        ShopperBasketsV2.paramKeys[methodName]
+    )
     const queryKey = queryKeyHelpers[methodName].queryKey(netOptions.parameters)
     // We don't use `netOptions` here because we manipulate the options in `useQuery`.
     const method = async (options: Options) => await client[methodName](options)
@@ -124,7 +130,10 @@ export const usePriceBooksForBasket = (
     // Parameters can be set in `apiOptions` or `client.clientConfig`;
     // we must merge them in order to generate the correct query key.
     const netOptions = omitNullableParameters(mergeOptions(client, apiOptions))
-    const parameters = pickValidParams(netOptions.parameters, ShopperBasketsV2.paramKeys[methodName])
+    const parameters = pickValidParams(
+        netOptions.parameters,
+        ShopperBasketsV2.paramKeys[methodName]
+    )
     const queryKey = queryKeyHelpers[methodName].queryKey(netOptions.parameters)
     // We don't use `netOptions` here because we manipulate the options in `useQuery`.
     const method = async (options: Options) => await client[methodName](options)
@@ -166,7 +175,10 @@ export const useShippingMethodsForShipment = (
     // Parameters can be set in `apiOptions` or `client.clientConfig`;
     // we must merge them in order to generate the correct query key.
     const netOptions = omitNullableParameters(mergeOptions(client, apiOptions))
-    const parameters = pickValidParams(netOptions.parameters, ShopperBasketsV2.paramKeys[methodName])
+    const parameters = pickValidParams(
+        netOptions.parameters,
+        ShopperBasketsV2.paramKeys[methodName]
+    )
     const queryKey = queryKeyHelpers[methodName].queryKey(netOptions.parameters)
     // We don't use `netOptions` here because we manipulate the options in `useQuery`.
     const method = async (options: Options) => await client[methodName](options)
@@ -208,7 +220,10 @@ export const useTaxesFromBasket = (
     // Parameters can be set in `apiOptions` or `client.clientConfig`;
     // we must merge them in order to generate the correct query key.
     const netOptions = omitNullableParameters(mergeOptions(client, apiOptions))
-    const parameters = pickValidParams(netOptions.parameters, ShopperBasketsV2.paramKeys[methodName])
+    const parameters = pickValidParams(
+        netOptions.parameters,
+        ShopperBasketsV2.paramKeys[methodName]
+    )
     const queryKey = queryKeyHelpers[methodName].queryKey(netOptions.parameters)
     // We don't use `netOptions` here because we manipulate the options in `useQuery`.
     const method = async (options: Options) => await client[methodName](options)

packages/commerce-sdk-react/src/hooks/ShopperPayments/queryKeyHelpers.ts

@@ -41,10 +41,12 @@ export const getPaymentConfiguration: QueryKeyHelper<'getPaymentConfiguration'>
     queryKey: (params: Params<'getPaymentConfiguration'>) => {
         return [
             ...getPaymentConfiguration.path(params),
-            // pickValidParams returns the filtered parameters, TypeScript sees that zoneId 
+            // pickValidParams returns the filtered parameters, TypeScript sees that zoneId
             // could be string | null, and complains because null isn't allowed in the query key.
             // omitNullable removes null values from the parameters (zoneId is optional but NOT nullable)
-            omitNullable(pickValidParams(params || {}, ShopperPayments.paramKeys.getPaymentConfiguration))
+            omitNullable(
+                pickValidParams(params || {}, ShopperPayments.paramKeys.getPaymentConfiguration)
+            )
         ]
     }
 }