Fix removing from cart and add Not Found UI

components/cart/actions.ts

@@ -1,7 +1,7 @@
 'use server';
 
-import { TAGS } from 'lib/constants';
 import { addToCart, removeFromCart, updateCart } from 'lib/bigcommerce';
+import { TAGS } from 'lib/constants';
 import { revalidateTag } from 'next/cache';
 import { cookies } from 'next/headers';
 
@@ -70,8 +70,13 @@ export async function updateItemQuantity(
 
   try {
     if (quantity === 0) {
-      await removeFromCart(cartId, [lineId]);
+      const response = await removeFromCart(cartId, [lineId]);
       revalidateTag(TAGS.cart);
+
+      if (!response && cartId) {
+        cookies().delete('cartId');
+      }
+
       return;
     }
 

lib/bigcommerce/index.ts

@@ -1,4 +1,5 @@
 import { isVercelCommerceError } from 'lib/type-guards';
+import { notFound } from 'next/navigation';
 import { NextRequest, NextResponse } from 'next/server';
 import { BIGCOMMERCE_GRAPHQL_API_ENDPOINT } from './constants';
 
@@ -81,7 +82,7 @@ const getEntityIdByHandle = async (entityHandle: string) => {
     }
   });
 
-  return res.body.data.site.route.node.entityId;
+  return res.body.data.site.route.node?.entityId;
 };
 
 export async function bigCommerceFetch<T>({
@@ -300,7 +301,10 @@ export async function addToCart(
   return bigCommerceToVercelCart(bigCommerceCart, productsByIdList, checkout, checkoutUrl);
 }
 
-export async function removeFromCart(cartId: string, lineIds: string[]): Promise<VercelCart | undefined> {
+export async function removeFromCart(
+  cartId: string,
+  lineIds: string[]
+): Promise<VercelCart | undefined> {
   let cartState: { status: number; body: BigCommerceDeleteCartItemOperation };
   const removeCartItem = async (itemId: string) => {
     const res = await bigCommerceFetch<BigCommerceDeleteCartItemOperation>({
@@ -331,7 +335,7 @@ export async function removeFromCart(cartId: string, lineIds: string[]): Promise
 
   const cart = cartState!.body.data.cart.deleteCartLineItem.cart;
 
-  if (cart === null)  {
+  if (cart === null) {
     return undefined;
   }
 
@@ -585,6 +589,11 @@ export async function getMenu(handle: string): Promise<VercelMenu[]> {
 
 export async function getPage(handle: string): Promise<VercelPage> {
   const entityId = await getEntityIdByHandle(handle);
+
+  if (!entityId) {
+    notFound();
+  }
+
   const res = await bigCommerceFetch<BigCommercePageOperation>({
     query: getPageQuery,
     variables: {