corrections

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true
+}

package.json

@@ -15,15 +15,16 @@
     "generate": "graphql-codegen --config codegen.yml"
   },
   "devDependencies": {
+    "@graphql-codegen/cli": "2.6.2",
+    "@graphql-codegen/introspection": "2.1.1",
+    "@graphql-codegen/typescript": "2.4.8",
+    "@graphql-codegen/typescript-document-nodes": "2.2.8",
+    "@graphql-codegen/typescript-graphql-files-modules": "2.1.1",
+    "@graphql-codegen/typescript-operations": "2.3.5",
+    "@types/node": "^17.0.24",
     "husky": "^7.0.4",
     "prettier": "^2.5.1",
-    "turbo": "^1.1.2",
+    "turbo": "^1.1.2"
-    "@graphql-codegen/typescript-document-nodes": "2.2.8",
-    "@graphql-codegen/typescript": "2.4.8",
-    "@graphql-codegen/typescript-operations": "2.3.5",
-    "@graphql-codegen/typescript-graphql-files-modules": "2.1.1",
-    "@graphql-codegen/introspection": "2.1.1",
-    "@graphql-codegen/cli": "2.6.2"
   },
   "husky": {
     "hooks": {
@@ -31,4 +32,4 @@
     }
   },
   "packageManager": "yarn@1.22.17"
-}
+}

packages/commerce/src/api/endpoints/wishlist.ts

@@ -34,13 +34,13 @@ const wishlistEndpoint: GetAPISchema<
 
     // Add an item to the wishlist
     if (req.method === 'POST') {
-      const body = { ...req.body.variables, customerToken }
+      const body = { ...req.body, customerToken }
       return await handlers['addItem']({ ...ctx, body })
     }
 
     // Remove an item from the wishlist
     if (req.method === 'DELETE') {
-      const body = { ...req.body.variables, customerToken }
+      const body = { ...req.body, customerToken }
       return await handlers['removeItem']({ ...ctx, body })
     }
   } catch (error) {

packages/commerce/src/types/wishlist.ts

@@ -27,10 +27,11 @@ export type AddItemHook<T extends WishlistTypes = WishlistTypes> = {
 }
 
 export type RemoveItemHook<T extends WishlistTypes = WishlistTypes> = {
-  data: T['wishlist']
+  data: T['wishlist'] | null
-  body: { item: T['itemBody'] }
+  body: { itemId: string }
-  fetcherInput: { item: T['itemBody'] }
+  fetcherInput: { itemId: string }
-  actionInput: T['itemBody']
+  actionInput: { id: string }
+  input: { wishlist?: { includeProducts?: boolean } }
 }
 
 export type WishlistSchema<T extends WishlistTypes = WishlistTypes> = {

packages/shopify/.env.template

@@ -2,4 +2,4 @@ COMMERCE_PROVIDER=shopify
 
 NEXT_PUBLIC_SHOPIFY_STORE_DOMAIN=
 NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN=
-NEXT_PUBLIC_SHOPIFY_ADMIN_ACCESS_TOKEN=
+SHOPIFY_ADMIN_ACCESS_TOKEN=

packages/shopify/codegen.json

@@ -2,7 +2,7 @@
   "schema": {
     "https://${NEXT_PUBLIC_SHOPIFY_STORE_DOMAIN}/admin/api/2022-01/graphql.json": {
       "headers": {
-        "X-Shopify-Access-Token": "${NEXT_PUBLIC_SHOPIFY_ADMIN_ACCESS_TOKEN}"
+        "X-Shopify-Access-Token": "${SHOPIFY_ADMIN_ACCESS_TOKEN}"
       }
     }
   },

packages/shopify/src/api/endpoints/wishlist/add-item.ts

@@ -9,7 +9,7 @@ import { WishlistItem } from './../../../types/wishlist'
 
 const addWishlistItem: WishlistEndpoint['handlers']['addItem'] = async ({
   res,
-  body: { item, customerToken },
+  body: { variables: item, customerToken },
   config,
   commerce,
 }) => {

packages/shopify/src/api/endpoints/wishlist/remove-item.ts

@@ -5,10 +5,11 @@ import type {
   MutationCustomerUpdateArgs,
   Mutation,
 } from '../../../../admin-schema'
+import { debug } from 'util'
 
 const removeWishlistItem: WishlistEndpoint['handlers']['removeItem'] = async ({
   res,
-  body: { item, customerToken },
+  body: { variables: item, customerToken },
   config,
   commerce,
 }) => {
@@ -36,7 +37,15 @@ const removeWishlistItem: WishlistEndpoint['handlers']['removeItem'] = async ({
     })
 
     const WishlistItems: WishlistItemBody[] = wishlist?.items
-      ?.filter((wishlistItem) => wishlistItem.productId !== item.productId)
+      ?.filter((wishlistItem) => {
+        if (
+          wishlistItem.productId === item.itemId &&
+          wishlistItem.variantId === item.itemVariantId
+        ) {
+          return false
+        }
+        return true
+      })
       .map(({ product, ...rest }) => {
         return rest
       })!

packages/shopify/src/const.ts

@@ -13,4 +13,4 @@ export const ADMIN_API_URL = `https://${STORE_DOMAIN}/admin/api/2022-01/graphql.
 
 export const API_TOKEN = process.env.NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN
 export const ADMIN_ACCESS_TOKEN =
-  process.env.NEXT_PUBLIC_SHOPIFY_ADMIN_ACCESS_TOKEN
+  process.env.SHOPIFY_ADMIN_ACCESS_TOKEN

packages/shopify/src/types/wishlist.ts

@@ -19,7 +19,33 @@ export type WishlistTypes = {
   customer: Customer
 }
 
-export type WishlistSchema = Core.WishlistSchema<WishlistTypes>
+export type RemoveItemHook<T extends WishlistTypes = WishlistTypes> =
+  Core.RemoveItemHook & {
+    fetcherInput: { itemVariantId?: string | number }
+    actionInput: { itemVariantId?: string | number }
+  }
+
+export type WishlistSchema<T extends WishlistTypes = WishlistTypes> = {
+  endpoint: {
+    options: {}
+    handlers: {
+      getWishlist: Core.GetWishlistHook<T> & {
+        data: T['wishlist'] | null
+        body: { customerToken?: string }
+      }
+      addItem: Core.AddItemHook<T> & {
+        body: { variables?: T['itemBody']; customerToken?: string }
+      }
+      removeItem: RemoveItemHook<T> & {
+        body: {
+          variables?: { itemId: string; itemVariantId?: string | number }
+          customerToken?: string
+        }
+      }
+    }
+  }
+}
+
 export type GetCustomerWishlistOperation =
   Core.GetCustomerWishlistOperation<WishlistTypes>
 

packages/shopify/src/wishlist/use-add-item.tsx

@@ -14,7 +14,7 @@ export const handler: MutationHook<AddItemHook> = {
     url: '/api/wishlist',
     method: 'POST',
   },
-  async fetcher({ input: item, options, fetch }) {
+  async fetcher({ input: { item }, options, fetch }) {
     const data = await fetch({ ...options, variables: item })
 
     return data

packages/shopify/src/wishlist/use-remove-item.tsx

@@ -16,8 +16,8 @@ export const handler: MutationHook<RemoveItemHook> = {
     url: '/api/wishlist',
     method: 'DELETE',
   },
-  async fetcher({ input: item, options, fetch }) {
+  async fetcher({ input, options, fetch }) {
-    const data = await fetch({ ...options, variables: item })
+    const data = await fetch({ ...options, variables: input })
 
     return data
   },
@@ -28,7 +28,7 @@ export const handler: MutationHook<RemoveItemHook> = {
       const { mutate } = useWishlist()
 
       return useCallback(
-        async function removeItem(item) {
+        async function removeItem(input) {
           if (!customer) {
             // A signed customer is required in order to have a wishlist
             throw new CommerceError({
@@ -38,7 +38,9 @@ export const handler: MutationHook<RemoveItemHook> = {
 
           // TODO: add validations before doing the fetch
 
-          const data = await fetch({ input: { item } })
+          const data = await fetch({
+            input: { itemId: input.id, itemVariantId: input.itemVariantId },
+          })
           await mutate()
           return data
         },

packages/shopify/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "target": "esnext",
+    "target": "es6",
-    "module": "esnext",
+    "module": "es6",
     "outDir": "dist",
     "baseUrl": "src",
     "lib": ["dom", "dom.iterable", "esnext"],

site/.env.template

@@ -24,7 +24,7 @@ BIGCOMMERCE_STORE_API_CLIENT_SECRET=
 
 NEXT_PUBLIC_SHOPIFY_STORE_DOMAIN=
 NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN=
-NEXT_PUBLIC_SHOPIFY_ADMIN_ACCESS_TOKEN=
+SHOPIFY_ADMIN_ACCESS_TOKEN=
 
 NEXT_PUBLIC_SWELL_STORE_ID=
 NEXT_PUBLIC_SWELL_PUBLIC_KEY=

site/commerce.config.json

@@ -2,8 +2,8 @@
   "features": {
     "cart": true,
     "search": true,
-    "wishlist": true,
+    "wishlist": false,
-    "customerAuth": true,
+    "customerAuth": false,
     "customCheckout": false
   }
 }

site/components/cart/CartItem/CartItem.tsx

@@ -10,7 +10,7 @@ import useUpdateItem from '@framework/cart/use-update-item'
 import useRemoveItem from '@framework/cart/use-remove-item'
 import Quantity from '@components/ui/Quantity'
 
-type ItemOption = {
+export type ItemOption = {
   name: string
   nameId: number
   value: string
@@ -93,7 +93,7 @@ const CartItem = ({
                 width={150}
                 height={150}
                 src={item.variant.image?.url || placeholderImg}
-                alt={item.variant.image?.altText || "Product Image"}
+                alt={item.variant.image?.altText || 'Product Image'}
                 unoptimized
               />
             </a>

site/components/product/ProductSidebar/ProductSidebar.tsx

@@ -57,27 +57,29 @@ const ProductSidebar: FC<ProductSidebarProps> = ({ product, className }) => {
         <div className="text-accent-6 pr-1 font-medium text-sm">36 reviews</div>
       </div>
       <div>
-        {process.env.COMMERCE_CART_ENABLED && (
+        <div className="flex flex-row justify-between items-center">
-          <Button
+          {process.env.COMMERCE_CART_ENABLED && (
-            aria-label="Add to Cart"
+            <Button
-            type="button"
+              aria-label="Add to Cart"
-            className={s.button}
+              type="button"
-            onClick={addToCart}
+              className={s.button}
-            loading={loading}
+              onClick={addToCart}
-            disabled={variant?.availableForSale === false}
+              loading={loading}
-          >
+              disabled={variant?.availableForSale === false}
-            {variant?.availableForSale === false
+            >
-              ? 'Not Available'
+              {variant?.availableForSale === false
-              : 'Add To Cart'}
+                ? 'Not Available'
-          </Button>
+                : 'Add To Cart'}
-        )}
+            </Button>
-        {!variant?.availableForSale && (
+          )}
-          <WishlistButton
+          {!variant?.availableForSale && (
-            className={s.button}
+            <WishlistButton
-            productId={product.id}
+              className={s.button}
-            variant={variant!}
+              productId={product.id}
-          />
+              variant={variant!}
-        )}
+            />
+          )}
+        </div>
       </div>
       <div className="mt-6">
         <Collapse title="Care">

site/components/wishlist/WishlistButton/WishlistButton.tsx

@@ -48,7 +48,11 @@ const WishlistButton: FC<Props> = ({
 
     try {
       if (itemInWishlist) {
-        await removeItem({ productId, variantId: variant?.id! })
+        await removeItem({
+          id: itemInWishlist.productId,
+          //TODO: enable itemVariantId when using shopify provider
+          itemVariantId: itemInWishlist.variantId,
+        })
       } else {
         await addItem({
           productId,

site/components/wishlist/WishlistCard/WishlistCard.tsx

@@ -7,7 +7,11 @@ import { Trash } from '@components/icons'
 import { Button, Text } from '@components/ui'
 
 import { useUI } from '@components/ui/context'
-import type { Product } from '@commerce/types/product'
+import type {
+  Product,
+  ProductOption,
+  ProductVariant,
+} from '@commerce/types/product'
 import usePrice from '@framework/product/use-price'
 import useAddItem from '@framework/cart/use-add-item'
 import useRemoveItem from '@framework/wishlist/use-remove-item'
@@ -15,22 +19,24 @@ import type { Wishlist } from '@commerce/types/wishlist'
 
 const placeholderImg = '/product-img-placeholder.svg'
 
-interface Props {
+const WishlistCard: React.FC<{
-  item: Product
+  item: Wishlist
-  variant: string | number
+}> = ({ item }) => {
-}
+  const product: Product = item.product
-
-const WishlistCard: FC<Props> = ({ item, variant }) => {
   const { price } = usePrice({
-    amount: item.price?.value,
+    amount: product.price?.value,
-    baseAmount: item.price?.retailPrice,
+    baseAmount: product.price?.retailPrice,
-    currencyCode: item.price?.currencyCode!,
+    currencyCode: product.price?.currencyCode!,
   })
   // @ts-ignore Wishlist is not always enabled
-  const removeItem = useRemoveItem({ item })
+  const removeItem = useRemoveItem({ wishlist: { includeProducts: true } })
   const [loading, setLoading] = useState(false)
   const [removing, setRemoving] = useState(false)
 
+  const { options } = item.product.variants.find(
+    (variant: ProductVariant) => item.variantId === variant.id
+  )
+
   // TODO: fix this missing argument issue
   /* @ts-ignore */
   const addItem = useAddItem()
@@ -42,7 +48,11 @@ const WishlistCard: FC<Props> = ({ item, variant }) => {
     try {
       // If this action succeeds then there's no need to do `setRemoving(true)`
       // because the component will be removed from the view
-      await removeItem({ productId: item.id, variantId: variant })
+      await removeItem({
+        id: item.productId,
+        //TODO: enable itemVariantId when using shopify provider
+        itemVariantId: item.variantId,
+      })
     } catch (error) {
       setRemoving(false)
     }
@@ -51,8 +61,11 @@ const WishlistCard: FC<Props> = ({ item, variant }) => {
     setLoading(true)
     try {
       await addItem({
-        productId: String(item.id),
+        //for shopify provider, use the productId and variantId stored in wishlist
-        variantId: String(item.variants[0].id),
+        productId: item.productId,
+        variantId: item.variantId,
+        // productId: String(product.id),
+        // variantId: String(product.variants[0].id),
       })
       openSidebar()
       setLoading(false)
@@ -67,20 +80,46 @@ const WishlistCard: FC<Props> = ({ item, variant }) => {
         <Image
           width={230}
           height={230}
-          src={item.images[0]?.url || placeholderImg}
+          src={product.images[0]?.url || placeholderImg}
-          alt={item.images[0]?.alt || 'Product Image'}
+          alt={product.images[0]?.alt || 'Product Image'}
         />
       </div>
 
       <div className={s.description}>
         <div className="flex-1 mb-6">
           <h3 className="text-2xl mb-2 -mt-1">
-            <Link href={`/product${item.path}`}>
+            <Link href={`/product${product.path}`}>
-              <a>{item.name}</a>
+              <a>{product.name}</a>
             </Link>
           </h3>
+
+          {options && options.length > 0 && (
+            <div className="flex items-center pb-1">
+              {options.map((option: ProductOption, i: number) => (
+                <div
+                  key={`${option.id}`}
+                  className="text-sm font-semibold text-accent-7 inline-flex items-center justify-center"
+                >
+                  {option.displayName}
+                  {option.displayName === 'Color' ? (
+                    <span
+                      className="mx-2 rounded-full bg-transparent border w-5 h-5 p-1 text-accent-9 inline-flex items-center justify-center overflow-hidden"
+                      style={{
+                        backgroundColor: `${option.values[0].label}`,
+                      }}
+                    ></span>
+                  ) : (
+                    <span className="mx-2 rounded-full bg-transparent border h-5 p-1 text-accent-9 inline-flex items-center justify-center overflow-hidden">
+                      {option.values[0].label}
+                    </span>
+                  )}
+                  {i === options.length - 1 ? '' : <span className="mr-3" />}
+                </div>
+              ))}
+            </div>
+          )}
           <div className="mb-4">
-            <Text html={item.description} />
+            <Text html={product.description} />
           </div>
         </div>
         <div>

site/pages/wishlist.tsx

@@ -37,7 +37,7 @@ export async function getStaticProps({
 export default function Wishlist() {
   const { data: customer } = useCustomer()
   // @ts-ignore Shopify - Fix this types
-  const { data: wishlist, isLoading, isEmpty } = useWishlist()
+  const { data, isLoading, isEmpty } = useWishlist()
 
   return (
     <Container className="pt-4">
@@ -66,14 +66,10 @@ export default function Wishlist() {
             </div>
           ) : (
             <div className="grid grid-cols-1 gap-6 ">
-              {wishlist &&
+              {data &&
                 // @ts-ignore - Wishlist Item Type
-                wishlist.items?.map((item) => (
+                data.items?.map((item) => (
-                  <WishlistCard
+                  <WishlistCard key={item.productId} item={item!} />
-                    key={item.productId}
-                    item={item.product!}
-                    variant={item.variantId}
-                  />
                 ))}
             </div>
           )}