From 381d4a987fc7c425a3e28bf2dbbe8a9e55e54d82 Mon Sep 17 00:00:00 2001 From: Chloe Date: Thu, 9 Mar 2023 21:03:33 +0700 Subject: [PATCH] add missing types to site Signed-off-by: Chloe --- .../src/checkout/use-submit-checkout.tsx | 19 ++----------------- .../src/customer/address/use-update-item.tsx | 19 ++----------------- packages/commerce/src/types/site.ts | 3 +++ .../ShippingMethodView/ShippingMethodView.tsx | 2 +- site/components/common/Layout/Layout.tsx | 3 +-- site/components/common/Navbar/Navbar.tsx | 2 +- site/tsconfig.json | 4 ++-- 7 files changed, 12 insertions(+), 40 deletions(-) diff --git a/packages/bigcommerce/src/checkout/use-submit-checkout.tsx b/packages/bigcommerce/src/checkout/use-submit-checkout.tsx index a00b87960..ee968767d 100644 --- a/packages/bigcommerce/src/checkout/use-submit-checkout.tsx +++ b/packages/bigcommerce/src/checkout/use-submit-checkout.tsx @@ -1,17 +1,2 @@ -import { MutationHook } from '@vercel/commerce/utils/types' -import useSubmitCheckout, { - UseSubmitCheckout, -} from '@vercel/commerce/checkout/use-submit-checkout' - -export default useSubmitCheckout as UseSubmitCheckout - -export const handler: MutationHook = { - fetchOptions: { - query: '', - }, - async fetcher({ input, options, fetch }) {}, - useHook: - ({ fetch }) => - () => - async () => ({}), -} +export * from '@vercel/commerce/checkout/use-submit-checkout' +export { default } from '@vercel/commerce/checkout/use-submit-checkout' diff --git a/packages/bigcommerce/src/customer/address/use-update-item.tsx b/packages/bigcommerce/src/customer/address/use-update-item.tsx index b9aba9629..923eef163 100644 --- a/packages/bigcommerce/src/customer/address/use-update-item.tsx +++ b/packages/bigcommerce/src/customer/address/use-update-item.tsx @@ -1,17 +1,2 @@ -import { MutationHook } from '@vercel/commerce/utils/types' -import useUpdateItem, { - UseUpdateItem, -} from '@vercel/commerce/customer/address/use-update-item' - -export default useUpdateItem as UseUpdateItem - -export const handler: MutationHook = { - fetchOptions: { - query: '', - }, - async fetcher({ input, options, fetch }) {}, - useHook: - ({ fetch }) => - () => - async () => ({}), -} +export * from '@vercel/commerce/customer/address/use-update-item' +export { default } from '@vercel/commerce/customer/address/use-update-item' diff --git a/packages/commerce/src/types/site.ts b/packages/commerce/src/types/site.ts index 3552db08f..f97778f37 100644 --- a/packages/commerce/src/types/site.ts +++ b/packages/commerce/src/types/site.ts @@ -40,6 +40,8 @@ export interface Brand { path: string } +export type Navigation = any + /** * Operation to get site information. This includes categories and brands. */ @@ -47,5 +49,6 @@ export type GetSiteInfoOperation = { data: { categories: Category[] brands: Brand[] + navigation?: Navigation[] } } diff --git a/site/components/checkout/ShippingMethodView/ShippingMethodView.tsx b/site/components/checkout/ShippingMethodView/ShippingMethodView.tsx index af455479b..147cec51a 100644 --- a/site/components/checkout/ShippingMethodView/ShippingMethodView.tsx +++ b/site/components/checkout/ShippingMethodView/ShippingMethodView.tsx @@ -31,7 +31,7 @@ const ShippingMethod = () => { await updateShippingMethod({ id: cart!.id, ...addressFields, - shippingMethodId: event.target.shippingMethod.value, + ...(event.target.shippingMethod.value ? {shippingMethodId: event.target.shippingMethod.value} : {}) }) setSidebarView('CHECKOUT_VIEW') diff --git a/site/components/common/Layout/Layout.tsx b/site/components/common/Layout/Layout.tsx index 8e5749c14..5d1170281 100644 --- a/site/components/common/Layout/Layout.tsx +++ b/site/components/common/Layout/Layout.tsx @@ -16,8 +16,7 @@ import ShippingMethodView from '@components/checkout/ShippingMethodView' import { CheckoutProvider } from '@components/checkout/context' import { MenuSidebarView } from '@components/common/UserNav' import type { Page } from '@commerce/types/page' -import type { Category } from '@commerce/types/site' -import type { Navigation } from '@framework/types/site' +import type { Category, Navigation } from '@commerce/types/site' import type { Link as LinkProps } from '../UserNav/MenuSidebarView' const Loading = () => ( diff --git a/site/components/common/Navbar/Navbar.tsx b/site/components/common/Navbar/Navbar.tsx index 491303a8e..378996cea 100644 --- a/site/components/common/Navbar/Navbar.tsx +++ b/site/components/common/Navbar/Navbar.tsx @@ -5,7 +5,7 @@ import s from './Navbar.module.css' import NavbarRoot from './NavbarRoot' import { Logo, Container } from '@components/ui' import { Searchbar, UserNav } from '@components/common' -import type { Navigation } from '@framework/types/site' +import type { Navigation } from '@commerce/types/site' import CustomNavbar from './CustomNavbar' interface Link { diff --git a/site/tsconfig.json b/site/tsconfig.json index 7aaf090c8..868794504 100644 --- a/site/tsconfig.json +++ b/site/tsconfig.json @@ -23,8 +23,8 @@ "@components/*": ["components/*"], "@commerce": ["../packages/commerce/src"], "@commerce/*": ["../packages/commerce/src/*"], - "@framework": ["../packages/opencommerce/src"], - "@framework/*": ["../packages/opencommerce/src/*"] + "@framework": ["../packages/bigcommerce/src"], + "@framework/*": ["../packages/bigcommerce/src/*"] } }, "include": ["next-env.d.ts", "**/*.d.ts", "**/*.ts", "**/*.tsx", "**/*.js"],