diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/general/index.tsx b/packages/admin-ui/ui/src/components/organisms/product-general-section/index.tsx
similarity index 80%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/general/index.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-general-section/index.tsx
index 0c98ee0a06..852a3e6eac 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/general/index.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-general-section/index.tsx
@@ -1,19 +1,19 @@
import { Product } from "@medusajs/medusa"
-import FeatureToggle from "../../../../../components/fundamentals/feature-toggle"
-import ChannelsIcon from "../../../../../components/fundamentals/icons/channels-icon"
-import EditIcon from "../../../../../components/fundamentals/icons/edit-icon"
-import TrashIcon from "../../../../../components/fundamentals/icons/trash-icon"
-import { ActionType } from "../../../../../components/molecules/actionables"
-import SalesChannelsDisplay from "../../../../../components/molecules/sales-channels-display"
-import StatusSelector from "../../../../../components/molecules/status-selector"
-import DelimitedList from "../../../../../components/molecules/delimited-list"
-import Section from "../../../../../components/organisms/section"
+import useEditProductActions from "../../../hooks/use-edit-product-actions"
+import useToggleState from "../../../hooks/use-toggle-state"
import {
- useFeatureFlag,
FeatureFlag,
-} from "../../../../../providers/feature-flag-provider"
-import useToggleState from "../../../../../hooks/use-toggle-state"
-import useEditProductActions from "../../hooks/use-edit-product-actions"
+ useFeatureFlag,
+} from "../../../providers/feature-flag-provider"
+import FeatureToggle from "../../fundamentals/feature-toggle"
+import ChannelsIcon from "../../fundamentals/icons/channels-icon"
+import EditIcon from "../../fundamentals/icons/edit-icon"
+import TrashIcon from "../../fundamentals/icons/trash-icon"
+import { ActionType } from "../../molecules/actionables"
+import DelimitedList from "../../molecules/delimited-list"
+import SalesChannelsDisplay from "../../molecules/sales-channels-display"
+import StatusSelector from "../../molecules/status-selector"
+import Section from "../section"
import ChannelsModal from "./channels-modal"
import GeneralModal from "./general-modal"
@@ -21,7 +21,7 @@ type Props = {
product: Product
}
-const GeneralSection = ({ product }: Props) => {
+const ProductGeneralSection = ({ product }: Props) => {
const { onDelete, onStatusChange } = useEditProductActions(product.id)
const {
state: infoState,
@@ -174,4 +174,4 @@ const ProductSalesChannels = ({ product }: Props) => {
)
}
-export default GeneralSection
+export default ProductGeneralSection
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/media/index.tsx b/packages/admin-ui/ui/src/components/organisms/product-media-section/index.tsx
similarity index 79%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/media/index.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-media-section/index.tsx
index 7986ad09f7..c275c72781 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/media/index.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-media-section/index.tsx
@@ -1,14 +1,14 @@
import { Product } from "@medusajs/medusa"
-import { ActionType } from "../../../../../components/molecules/actionables"
-import Section from "../../../../../components/organisms/section"
-import useToggleState from "../../../../../hooks/use-toggle-state"
+import useToggleState from "../../../hooks/use-toggle-state"
+import { ActionType } from "../../molecules/actionables"
+import Section from "../../organisms/section"
import MediaModal from "./media-modal"
type Props = {
product: Product
}
-const MediaSection = ({ product }: Props) => {
+const ProductMediaSection = ({ product }: Props) => {
const { state, close, toggle } = useToggleState()
const actions: ActionType[] = [
@@ -46,4 +46,4 @@ const MediaSection = ({ product }: Props) => {
)
}
-export default MediaSection
+export default ProductMediaSection
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/media/media-modal.tsx b/packages/admin-ui/ui/src/components/organisms/product-media-section/media-modal.tsx
similarity index 85%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/media/media-modal.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-media-section/media-modal.tsx
index 03d52d245d..0cdd177cb6 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/media/media-modal.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-media-section/media-modal.tsx
@@ -1,14 +1,14 @@
import { Product } from "@medusajs/medusa"
import { useEffect } from "react"
import { useForm } from "react-hook-form"
-import Button from "../../../../../components/fundamentals/button"
-import Modal from "../../../../../components/molecules/modal"
-import useNotification from "../../../../../hooks/use-notification"
-import { FormImage } from "../../../../../types/shared"
-import { prepareImages } from "../../../../../utils/images"
-import { nestedForm } from "../../../../../utils/nested-form"
-import MediaForm, { MediaFormType } from "../../../components/media-form"
-import useEditProductActions from "../../hooks/use-edit-product-actions"
+import useEditProductActions from "../../../hooks/use-edit-product-actions"
+import useNotification from "../../../hooks/use-notification"
+import { FormImage } from "../../../types/shared"
+import { prepareImages } from "../../../utils/images"
+import { nestedForm } from "../../../utils/nested-form"
+import MediaForm, { MediaFormType } from "../../forms/product/media-form"
+import Button from "../../fundamentals/button"
+import Modal from "../../molecules/modal"
type Props = {
product: Product
@@ -36,7 +36,7 @@ const MediaModal = ({ product, open, onClose }: Props) => {
useEffect(() => {
reset(getDefaultValues(product))
- }, [product])
+ }, [product, reset])
const onReset = () => {
reset(getDefaultValues(product))
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/raw/index.tsx b/packages/admin-ui/ui/src/components/organisms/product-raw-section/index.tsx
similarity index 59%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/raw/index.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-raw-section/index.tsx
index 99833c62a2..4863c56e90 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/raw/index.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-raw-section/index.tsx
@@ -1,15 +1,15 @@
import { Product } from "@medusajs/medusa"
-import JSONView from "../../../../../components/molecules/json-view"
-import Section from "../../../../../components/organisms/section"
+import JSONView from "../../molecules/json-view"
+import Section from "../section"
type Props = {
product: Product
}
/** Temporary component, should be replaced with
but since the design is different we will use this to not break the existing design across admin. */
-const RawSection = ({ product }: Props) => {
+const ProductRawSection = ({ product }: Props) => {
return (
-
+
@@ -17,4 +17,4 @@ const RawSection = ({ product }: Props) => {
)
}
-export default RawSection
+export default ProductRawSection
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/thumbnail/index.tsx b/packages/admin-ui/ui/src/components/organisms/product-thumbnail-section/index.tsx
similarity index 76%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/thumbnail/index.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-thumbnail-section/index.tsx
index 556bb860fc..259237dc15 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/thumbnail/index.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-thumbnail-section/index.tsx
@@ -1,19 +1,19 @@
import { Product } from "@medusajs/medusa"
import clsx from "clsx"
-import TwoStepDelete from "../../../../../components/atoms/two-step-delete"
-import Button from "../../../../../components/fundamentals/button"
-import Section from "../../../../../components/organisms/section"
-import useNotification from "../../../../../hooks/use-notification"
-import useToggleState from "../../../../../hooks/use-toggle-state"
-import { getErrorMessage } from "../../../../../utils/error-messages"
-import useEditProductActions from "../../hooks/use-edit-product-actions"
+import useEditProductActions from "../../../hooks/use-edit-product-actions"
+import useNotification from "../../../hooks/use-notification"
+import useToggleState from "../../../hooks/use-toggle-state"
+import { getErrorMessage } from "../../../utils/error-messages"
+import TwoStepDelete from "../../atoms/two-step-delete"
+import Button from "../../fundamentals/button"
+import Section from "../../organisms/section"
import ThumbnailModal from "./thumbnail-modal"
type Props = {
product: Product
}
-const TumbnailSection = ({ product }: Props) => {
+const ProductThumbnailSection = ({ product }: Props) => {
const { onUpdate, updating } = useEditProductActions(product.id)
const { state, toggle, close } = useToggleState()
@@ -78,4 +78,4 @@ const TumbnailSection = ({ product }: Props) => {
)
}
-export default TumbnailSection
+export default ProductThumbnailSection
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/thumbnail/thumbnail-modal.tsx b/packages/admin-ui/ui/src/components/organisms/product-thumbnail-section/thumbnail-modal.tsx
similarity index 86%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/thumbnail/thumbnail-modal.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-thumbnail-section/thumbnail-modal.tsx
index 9713ba3b38..ab95a7f705 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/thumbnail/thumbnail-modal.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-thumbnail-section/thumbnail-modal.tsx
@@ -1,16 +1,16 @@
import { Product } from "@medusajs/medusa"
import { useEffect } from "react"
import { useForm } from "react-hook-form"
-import Button from "../../../../../components/fundamentals/button"
-import Modal from "../../../../../components/molecules/modal"
-import useNotification from "../../../../../hooks/use-notification"
-import { FormImage } from "../../../../../types/shared"
-import { prepareImages } from "../../../../../utils/images"
-import { nestedForm } from "../../../../../utils/nested-form"
+import useEditProductActions from "../../../hooks/use-edit-product-actions"
+import useNotification from "../../../hooks/use-notification"
+import { FormImage } from "../../../types/shared"
+import { prepareImages } from "../../../utils/images"
+import { nestedForm } from "../../../utils/nested-form"
import ThumbnailForm, {
ThumbnailFormType,
-} from "../../../components/thumbnail-form"
-import useEditProductActions from "../../hooks/use-edit-product-actions"
+} from "../../forms/product/thumbnail-form"
+import Button from "../../fundamentals/button"
+import Modal from "../../molecules/modal"
type Props = {
product: Product
@@ -38,7 +38,7 @@ const ThumbnailModal = ({ product, open, onClose }: Props) => {
useEffect(() => {
reset(getDefaultValues(product))
- }, [product])
+ }, [product, reset])
const onReset = () => {
reset(getDefaultValues(product))
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/add-variant-modal.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/add-variant-modal.tsx
similarity index 92%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/add-variant-modal.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/add-variant-modal.tsx
index 5cbed27904..ee1dd55642 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/add-variant-modal.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/add-variant-modal.tsx
@@ -1,17 +1,17 @@
import { AdminPostProductsProductVariantsReq, Product } from "@medusajs/medusa"
+import { useContext, useEffect } from "react"
import EditFlowVariantForm, {
EditFlowVariantFormType,
-} from "../../../components/variant-form/edit-flow-variant-form"
+} from "../../forms/product/variant-form/edit-flow-variant-form"
import LayeredModal, {
LayeredModalContext,
-} from "../../../../../components/molecules/modal/layered-modal"
-import { useContext, useEffect } from "react"
+} from "../../molecules/modal/layered-modal"
-import Button from "../../../../../components/fundamentals/button"
-import Modal from "../../../../../components/molecules/modal"
-import useEditProductActions from "../../hooks/use-edit-product-actions"
-import { useForm } from "react-hook-form"
import { useMedusa } from "medusa-react"
+import { useForm } from "react-hook-form"
+import useEditProductActions from "../../../hooks/use-edit-product-actions"
+import Button from "../../fundamentals/button"
+import Modal from "../../molecules/modal"
type Props = {
onClose: () => void
@@ -32,7 +32,7 @@ const AddVariantModal = ({ open, onClose, product }: Props) => {
useEffect(() => {
reset(getDefaultValues(product))
- }, [product])
+ }, [product, reset])
const resetAndClose = () => {
reset(getDefaultValues(product))
@@ -40,7 +40,7 @@ const AddVariantModal = ({ open, onClose, product }: Props) => {
}
const createStockLocationsForVariant = async (
- productRes,
+ productRes: Product,
stock_locations: { stocked_quantity: number; location_id: string }[]
) => {
const { variants } = productRes
@@ -48,9 +48,11 @@ const AddVariantModal = ({ open, onClose, product }: Props) => {
const pvMap = new Map(product.variants.map((v) => [v.id, true]))
const addedVariant = variants.find((variant) => !pvMap.get(variant.id))
- const inventory = await client.admin.variants.getInventory(addedVariant.id)
+ if (!addedVariant) {
+ return
+ }
- console.log(inventory)
+ const inventory = await client.admin.variants.getInventory(addedVariant.id)
await Promise.all(
inventory.variant.inventory
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variant-inventory-modal.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-inventory-modal.tsx
similarity index 93%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variant-inventory-modal.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-inventory-modal.tsx
index 3211c53e41..a9f83f3e4c 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variant-inventory-modal.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-inventory-modal.tsx
@@ -4,21 +4,20 @@ import {
ProductVariant,
VariantInventory,
} from "@medusajs/medusa"
-import { useMedusa } from "medusa-react"
-import { useAdminVariantsInventory } from "medusa-react"
+import { useAdminVariantsInventory, useMedusa } from "medusa-react"
import { useContext } from "react"
import { useForm } from "react-hook-form"
+import useEditProductActions from "../../../hooks/use-edit-product-actions"
+import { removeNullish } from "../../../utils/remove-nullish"
import EditFlowVariantForm, {
EditFlowVariantFormType,
-} from "../../../components/variant-inventory-form/edit-flow-variant-form"
+} from "../../forms/product/variant-form/edit-flow-variant-form"
+import Button from "../../fundamentals/button"
+import Modal from "../../molecules/modal"
import LayeredModal, {
LayeredModalContext,
-} from "../../../../../components/molecules/modal/layered-modal"
-import Button from "../../../../../components/fundamentals/button"
-import Modal from "../../../../../components/molecules/modal"
+} from "../../molecules/modal/layered-modal"
import { createUpdatePayload } from "./edit-variants-modal/edit-variant-screen"
-import useEditProductActions from "../../hooks/use-edit-product-actions"
-import { removeNullish } from "../../../../../utils/remove-nullish"
type Props = {
onClose: () => void
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variant-modal.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-modal.tsx
similarity index 92%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variant-modal.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-modal.tsx
index 13ccce6d55..0665067b75 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variant-modal.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variant-modal.tsx
@@ -1,20 +1,20 @@
+import { Product, ProductVariant } from "@medusajs/medusa"
import EditFlowVariantForm, {
EditFlowVariantFormType,
-} from "../../../components/variant-form/edit-flow-variant-form"
+} from "../../forms/product/variant-form/edit-flow-variant-form"
import LayeredModal, {
LayeredModalContext,
-} from "../../../../../components/molecules/modal/layered-modal"
-import { Product, ProductVariant } from "@medusajs/medusa"
+} from "../../molecules/modal/layered-modal"
-import Button from "../../../../../components/fundamentals/button"
-import Modal from "../../../../../components/molecules/modal"
-import { countries } from "../../../../../utils/countries"
+import { useMedusa } from "medusa-react"
+import { useContext } from "react"
+import { useForm } from "react-hook-form"
+import useEditProductActions from "../../../hooks/use-edit-product-actions"
+import { countries } from "../../../utils/countries"
+import Button from "../../fundamentals/button"
+import Modal from "../../molecules/modal"
import { createAddPayload } from "./add-variant-modal"
import { createUpdatePayload } from "./edit-variants-modal/edit-variant-screen"
-import { useContext } from "react"
-import useEditProductActions from "../../hooks/use-edit-product-actions"
-import { useForm } from "react-hook-form"
-import { useMedusa } from "medusa-react"
type Props = {
onClose: () => void
@@ -51,7 +51,7 @@ const EditVariantModal = ({
const { client } = useMedusa()
const createStockLocationsForVariant = async (
- productRes,
+ productRes: Product,
stock_locations: { stocked_quantity: number; location_id: string }[]
) => {
const { variants } = productRes
@@ -59,6 +59,10 @@ const EditVariantModal = ({
const pvMap = new Map(product.variants.map((v) => [v.id, true]))
const addedVariant = variants.find((variant) => !pvMap.get(variant.id))
+ if (!addedVariant) {
+ return
+ }
+
const inventory = await client.admin.variants.getInventory(addedVariant.id)
await Promise.all(
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/edit-variant-screen.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/edit-variant-screen.tsx
similarity index 86%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/edit-variant-screen.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/edit-variant-screen.tsx
index 7dffa6c091..49e3ef36a4 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/edit-variant-screen.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/edit-variant-screen.tsx
@@ -3,18 +3,18 @@ import {
Product,
ProductVariant,
} from "@medusajs/medusa"
+import React, { useContext, useEffect, useMemo } from "react"
import EditFlowVariantForm, {
EditFlowVariantFormType,
-} from "../../../../components/variant-form/edit-flow-variant-form"
-import React, { useContext, useEffect, useMemo } from "react"
+} from "../../../forms/product/variant-form/edit-flow-variant-form"
-import Button from "../../../../../../components/fundamentals/button"
-import { LayeredModalContext } from "../../../../../../components/molecules/modal/layered-modal"
-import Modal from "../../../../../../components/molecules/modal"
-import { getEditVariantDefaultValues } from "../edit-variant-modal"
-import useEditProductActions from "../../../hooks/use-edit-product-actions"
-import { useEditVariantsModal } from "./use-edit-variants-modal"
import { useForm } from "react-hook-form"
+import useEditProductActions from "../../../../hooks/use-edit-product-actions"
+import Button from "../../../fundamentals/button"
+import Modal from "../../../molecules/modal"
+import { LayeredModalContext } from "../../../molecules/modal/layered-modal"
+import { getEditVariantDefaultValues } from "../edit-variant-modal"
+import { useEditVariantsModal } from "./use-edit-variants-modal"
type Props = {
variant: ProductVariant
@@ -27,23 +27,25 @@ const EditVariantScreen = ({ variant, product }: Props) => {
defaultValues: getEditVariantDefaultValues(variant, product),
})
+ const { reset: formReset } = form
+
const { pop, reset } = useContext(LayeredModalContext)
const { updatingVariant, onUpdateVariant } = useEditProductActions(product.id)
const popAndReset = () => {
- form.reset(getEditVariantDefaultValues(variant, product))
+ formReset(getEditVariantDefaultValues(variant, product))
pop()
}
const closeAndReset = () => {
- form.reset(getEditVariantDefaultValues(variant, product))
+ formReset(getEditVariantDefaultValues(variant, product))
reset()
onClose()
}
useEffect(() => {
- form.reset(getEditVariantDefaultValues(variant, product))
- }, [variant, product])
+ formReset(getEditVariantDefaultValues(variant, product))
+ }, [variant, product, formReset])
const onSubmitAndBack = form.handleSubmit((data) => {
// @ts-ignore
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/index.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/index.tsx
similarity index 94%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/index.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/index.tsx
index 6e207f8bbf..0da967bd7e 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/index.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/index.tsx
@@ -6,12 +6,12 @@ import {
useFieldArray,
useForm,
} from "react-hook-form"
-import Button from "../../../../../../components/fundamentals/button"
-import Modal from "../../../../../../components/molecules/modal"
+import useEditProductActions from "../../../../hooks/use-edit-product-actions"
+import Button from "../../../fundamentals/button"
+import Modal from "../../../molecules/modal"
import LayeredModal, {
LayeredModalContext,
-} from "../../../../../../components/molecules/modal/layered-modal"
-import useEditProductActions from "../../../hooks/use-edit-product-actions"
+} from "../../../molecules/modal/layered-modal"
import { EditVariantsModalContext } from "./use-edit-variants-modal"
import { VariantCard } from "./variant-card"
@@ -56,6 +56,7 @@ const EditVariantsModal = ({ open, onClose, product }: Props) => {
const moveCard = useCallback((dragIndex: number, hoverIndex: number) => {
move(dragIndex, hoverIndex)
+ // eslint-disable-next-line react-hooks/exhaustive-deps
}, [])
const renderCard = useCallback(
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/use-edit-variants-modal.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/use-edit-variants-modal.tsx
similarity index 77%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/use-edit-variants-modal.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/use-edit-variants-modal.tsx
index 7f463b16ae..b47f8cfee9 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/use-edit-variants-modal.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/use-edit-variants-modal.tsx
@@ -1,11 +1,11 @@
import React, { useContext } from "react"
-type EditVariantsModalContext = {
+type EditVariantsModalContextType = {
onClose: () => void
}
export const EditVariantsModalContext =
- React.createContext(null)
+ React.createContext(null)
export const useEditVariantsModal = () => {
const context = useContext(EditVariantsModalContext)
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/variant-card.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/variant-card.tsx
similarity index 85%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/variant-card.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/variant-card.tsx
index c0b7ae8b4a..d72d7f511c 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/edit-variants-modal/variant-card.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/edit-variants-modal/variant-card.tsx
@@ -5,17 +5,15 @@ import { useContext, useMemo, useRef } from "react"
import { useDrag, useDrop } from "react-dnd"
import { useFormContext } from "react-hook-form"
import { VariantItem } from "."
-import Button from "../../../../../../components/fundamentals/button"
-import EditIcon from "../../../../../../components/fundamentals/icons/edit-icon"
-import GripIcon from "../../../../../../components/fundamentals/icons/grip-icon"
-import MoreHorizontalIcon from "../../../../../../components/fundamentals/icons/more-horizontal-icon"
-import Actionables, {
- ActionType,
-} from "../../../../../../components/molecules/actionables"
-import InputField from "../../../../../../components/molecules/input"
-import { LayeredModalContext } from "../../../../../../components/molecules/modal/layered-modal"
-import { DragItem } from "../../../../../../types/shared"
-import FormValidator from "../../../../../../utils/form-validator"
+import { DragItem } from "../../../../types/shared"
+import FormValidator from "../../../../utils/form-validator"
+import Button from "../../../fundamentals/button"
+import EditIcon from "../../../fundamentals/icons/edit-icon"
+import GripIcon from "../../../fundamentals/icons/grip-icon"
+import MoreHorizontalIcon from "../../../fundamentals/icons/more-horizontal-icon"
+import Actionables, { ActionType } from "../../../molecules/actionables"
+import InputField from "../../../molecules/input"
+import { LayeredModalContext } from "../../../molecules/modal/layered-modal"
import { useEditVariantScreen } from "./edit-variant-screen"
const ItemTypes = {
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/index.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/index.tsx
similarity index 88%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/index.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/index.tsx
index 24fd35cf7a..4234857c34 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/index.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/index.tsx
@@ -1,29 +1,26 @@
-import OptionsProvider, { useOptionsContext } from "./options-provider"
import { Product, ProductVariant } from "@medusajs/medusa"
+import OptionsProvider, { useOptionsContext } from "./options-provider"
-import { ActionType } from "../../../../../components/molecules/actionables"
+import { useState } from "react"
+import useEditProductActions from "../../../hooks/use-edit-product-actions"
+import useToggleState from "../../../hooks/use-toggle-state"
+import EditIcon from "../../fundamentals/icons/edit-icon"
+import GearIcon from "../../fundamentals/icons/gear-icon"
+import PlusIcon from "../../fundamentals/icons/plus-icon"
+import { ActionType } from "../../molecules/actionables"
+import Section from "../../organisms/section"
import AddVariantModal from "./add-variant-modal"
-import EditIcon from "../../../../../components/fundamentals/icons/edit-icon"
import EditVariantInventoryModal from "./edit-variant-inventory-modal"
import EditVariantModal from "./edit-variant-modal"
import EditVariantsModal from "./edit-variants-modal"
-import GearIcon from "../../../../../components/fundamentals/icons/gear-icon"
import OptionsModal from "./options-modal"
-import PlusIcon from "../../../../../components/fundamentals/icons/plus-icon"
-import Section from "../../../../../components/organisms/section"
import VariantsTable from "./table"
-import useEditProductActions from "../../hooks/use-edit-product-actions"
-import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
-import { useState } from "react"
-import useToggleState from "../../../../../hooks/use-toggle-state"
type Props = {
product: Product
}
-const VariantsSection = ({ product }: Props) => {
- const { isFeatureEnabled } = useFeatureFlag()
-
+const ProductVariantsSection = ({ product }: Props) => {
const [variantToEdit, setVariantToEdit] = useState<
| {
base: ProductVariant
@@ -202,4 +199,4 @@ const ProductOptions = () => {
)
}
-export default VariantsSection
+export default ProductVariantsSection
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/options-modal.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/options-modal.tsx
similarity index 92%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/options-modal.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/options-modal.tsx
index a1216d65af..9a7b3a73a9 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/options-modal.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/options-modal.tsx
@@ -6,13 +6,13 @@ import {
} from "medusa-react"
import { useEffect, useMemo } from "react"
import { useFieldArray, useForm } from "react-hook-form"
-import Button from "../../../../../components/fundamentals/button"
-import PlusIcon from "../../../../../components/fundamentals/icons/plus-icon"
-import TrashIcon from "../../../../../components/fundamentals/icons/trash-icon"
-import InputField from "../../../../../components/molecules/input"
-import Modal from "../../../../../components/molecules/modal"
-import useNotification from "../../../../../hooks/use-notification"
-import FormValidator from "../../../../../utils/form-validator"
+import useNotification from "../../../hooks/use-notification"
+import FormValidator from "../../../utils/form-validator"
+import Button from "../../fundamentals/button"
+import PlusIcon from "../../fundamentals/icons/plus-icon"
+import TrashIcon from "../../fundamentals/icons/trash-icon"
+import InputField from "../../molecules/input"
+import Modal from "../../molecules/modal"
import { useOptionsContext } from "./options-provider"
type Props = {
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/options-provider.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/options-provider.tsx
similarity index 81%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/options-provider.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/options-provider.tsx
index a5b37ed43e..19a8acc826 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/options-provider.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/options-provider.tsx
@@ -8,7 +8,7 @@ type OptionsContext = {
refetch: () => void
}
-const OptionsContext = createContext(null)
+const OptionsContextType = createContext(null)
type Props = {
product: Product
@@ -30,14 +30,14 @@ const OptionsProvider = ({ product, children }: Props) => {
}, [products, status])
return (
-
+
{children}
-
+
)
}
export const useOptionsContext = () => {
- const context = useContext(OptionsContext)
+ const context = useContext(OptionsContextType)
if (!context) {
throw new Error("useOptionsContext must be used within a OptionsProvider")
}
diff --git a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/table.tsx b/packages/admin-ui/ui/src/components/organisms/product-variants-section/table.tsx
similarity index 89%
rename from packages/admin-ui/ui/src/domain/products/edit/sections/variants/table.tsx
rename to packages/admin-ui/ui/src/components/organisms/product-variants-section/table.tsx
index 872455c92f..ef99e88f50 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/sections/variants/table.tsx
+++ b/packages/admin-ui/ui/src/components/organisms/product-variants-section/table.tsx
@@ -1,14 +1,14 @@
import { Column, useTable } from "react-table"
-import Actionables from "../../../../../components/molecules/actionables"
-import BuildingsIcon from "../../../../../components/fundamentals/icons/buildings-icon"
-import DuplicateIcon from "../../../../../components/fundamentals/icons/duplicate-icon"
-import EditIcon from "../../../../../components/fundamentals/icons/edit-icon"
import { ProductVariant } from "@medusajs/medusa"
-import Table from "../../../../../components/molecules/table"
-import TrashIcon from "../../../../../components/fundamentals/icons/trash-icon"
-import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
import { useMemo } from "react"
+import { useFeatureFlag } from "../../../providers/feature-flag-provider"
+import BuildingsIcon from "../../fundamentals/icons/buildings-icon"
+import DuplicateIcon from "../../fundamentals/icons/duplicate-icon"
+import EditIcon from "../../fundamentals/icons/edit-icon"
+import TrashIcon from "../../fundamentals/icons/trash-icon"
+import Actionables from "../../molecules/actionables"
+import Table from "../../molecules/table"
type Props = {
variants: ProductVariant[]
diff --git a/packages/admin-ui/ui/src/domain/gift-cards/manage/denomination-table.tsx b/packages/admin-ui/ui/src/domain/gift-cards/manage/denomination-table.tsx
deleted file mode 100644
index c20fa161af..0000000000
--- a/packages/admin-ui/ui/src/domain/gift-cards/manage/denomination-table.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { useAdminDeleteVariant } from "medusa-react"
-import React, { useState } from "react"
-import EditIcon from "../../../components/fundamentals/icons/edit-icon"
-import TrashIcon from "../../../components/fundamentals/icons/trash-icon"
-import Table from "../../../components/molecules/table"
-import DeletePrompt from "../../../components/organisms/delete-prompt"
-import { stringDisplayPrice } from "../../../utils/prices"
-
-type DenominationTableProps = {
- giftCardId: string
- denominations: any[]
- defaultCurrency: string
- setEditDenom: (denom) => void
-}
-
-const DenominationTable: React.FC = ({
- giftCardId,
- denominations,
- defaultCurrency,
- setEditDenom,
-}) => {
- const [selectedDenom, setSelectedDenom] = useState(null)
-
- const deleteDenomination = useAdminDeleteVariant(giftCardId)
-
- const getDenominationPrices = (denomination) => {
- const sortHelper = (p1, p2) => {
- const curr1 = p1.currency_code
- const curr2 = p2.currency_code
-
- if (curr1 < curr2) {
- return -1
- }
- if (curr1 > curr2) {
- return 1
- }
- return 0
- }
-
- return denomination.prices
- .filter((p) => p.currency_code !== defaultCurrency) // without default
- .sort(sortHelper) // sort by currency code
- .map((p) =>
- stringDisplayPrice({ currencyCode: p.currency_code, amount: p.amount })
- ) // get formatted price
- .join(", ") // concatenate to single comma separated string
- }
-
- const getDenominationRow = (denomination, index) => {
- let defaultPrice = denomination.prices.find(
- (p) => p.currency_code === defaultCurrency
- )
-
- if (!defaultPrice) {
- defaultPrice = denomination.prices[0]
- }
-
- return (
- setEditDenom(denomination),
- icon: ,
- },
- {
- label: "Delete denomination",
- variant: "danger",
- onClick: () => setSelectedDenom(denomination.id),
- icon: ,
- },
- ]}
- >
-
- {stringDisplayPrice({
- currencyCode: defaultPrice.currency_code,
- amount: defaultPrice.amount,
- })}
-
- {getDenominationPrices(denomination)}
-
-
- )
- }
-
- const handleDeleteDenomination = async () => {
- deleteDenomination.mutateAsync(selectedDenom!)
- }
-
- return (
-
-
-
-
- Default Value
- Other Values
-
-
-
- {denominations?.map((d, idx) => getDenominationRow(d, idx))}
-
-
- {selectedDenom && (
-
setSelectedDenom(null)}
- text="Are you sure you want to delete this denomination from your Medusa Store?"
- heading="Delete denomination"
- onDelete={() => handleDeleteDenomination()}
- successText="Successfully deleted denomination"
- confirmText="Yes, delete"
- />
- )}
-
-
-
-
+
)
}
-const TOAST_ID = "edit-gc-dirty"
-
-const UpdateNotification = ({ isLoading = false }) => {
- const {
- form: { formState },
- onUpdate,
- resetForm,
- additionalDirtyState,
- } = useGiftCardForm()
- const [visible, setVisible] = useState(false)
- const [blocking, setBlocking] = useState(true)
-
- useEffect(() => {
- const timeout = setTimeout(setBlocking, 300, false)
- return () => clearTimeout(timeout)
- }, [])
-
- const isDirty = checkForDirtyState(
- formState.dirtyFields,
- additionalDirtyState
- )
-
- useEffect(() => {
- if (!blocking) {
- setVisible(isDirty)
- }
-
- return () => {
- toast.dismiss(TOAST_ID)
- }
- }, [isDirty])
-
- return (
-
-
-
-
- Save
-
-
- Discard
-
-
-
-
- )
-}
-
-export default ManageGiftCard
+export default Manage
diff --git a/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/denominations.tsx b/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/denominations.tsx
deleted file mode 100644
index 912d69e68e..0000000000
--- a/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/denominations.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import { Product, ProductVariant } from "@medusajs/medusa"
-import {
- useAdminDeleteVariant,
- useAdminStore,
- useAdminUpdateVariant,
-} from "medusa-react"
-import React, { useState } from "react"
-import PlusIcon from "../../../../components/fundamentals/icons/plus-icon"
-import AddDenominationModal from "../../../../components/organisms/add-denomination-modal"
-import BodyCard from "../../../../components/organisms/body-card"
-import EditDenominationsModal from "../../../../components/organisms/edit-denominations-modal"
-import useNotification from "../../../../hooks/use-notification"
-import { getErrorMessage } from "../../../../utils/error-messages"
-import DenominationTable from "../denomination-table"
-
-type DenominationsProps = {
- giftCard: Product
-}
-
-const Denominations: React.FC
= ({ giftCard }) => {
- const [editDenom, setEditDenom] = useState | null>(null)
- const [addDenom, setAddDenom] = useState(false)
-
- const { store } = useAdminStore()
- const updateGiftCardVariant = useAdminUpdateVariant(giftCard.id)
- const deleteGiftCardVariant = useAdminDeleteVariant(giftCard.id)
- const notification = useNotification()
-
- const currencyCodes =
- store?.currencies
- .filter((currency) => currency.code !== store.default_currency_code)
- .map((currency) => currency.code) || []
-
- const submitDenomations = (denoms) => {
- if (!denoms.length) {
- // if a update would result in the variant having 0 prices, then we delete it instead
- deleteGiftCardVariant.mutate(editDenom!.id, {
- onSuccess: () => {
- notification(
- "Success",
- "Successfully updated denominations",
- "success"
- )
- setEditDenom(null)
- },
- onError: (err) => notification("Error", getErrorMessage(err), "error"),
- })
- return
- }
-
- updateGiftCardVariant.mutate(
- {
- variant_id: editDenom!.id,
- prices: denoms.map(({ amount, currency_code }) => ({
- amount,
- currency_code,
- })),
- title: editDenom!.title,
- inventory_quantity: editDenom!.inventory_quantity,
- options: editDenom!.options.map((opt) => ({
- option_id: opt.option_id,
- value: opt.value,
- })),
- },
- {
- onSuccess: () => {
- notification(
- "Success",
- "Successfully updated denominations",
- "success"
- )
- setEditDenom(null)
- },
- onError: (err) => notification("Error", getErrorMessage(err), "error"),
- }
- )
- }
- return (
- <>
- setAddDenom(true),
- icon: ,
- },
- ]}
- >
-
-
- {editDenom && (
- c.code)}
- onSubmit={submitDenomations}
- defaultDenominations={editDenom.prices.map((p) => ({
- amount: p.amount,
- currency_code: p.currency_code,
- id: p.id,
- }))}
- handleClose={() => setEditDenom(null)}
- />
- )}
- {addDenom && (
- setAddDenom(false)}
- storeCurrency={store?.default_currency_code!}
- currencyCodes={currencyCodes}
- />
- )}
-
- )
-}
-
-export default Denominations
diff --git a/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/images.tsx b/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/images.tsx
deleted file mode 100644
index aaf39b99a6..0000000000
--- a/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/images.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import { Controller, useFieldArray } from "react-hook-form"
-import FileUploadField from "../../../../components/atoms/file-upload-field"
-import BodyCard from "../../../../components/organisms/body-card"
-import RadioGroup from "../../../../components/organisms/radio-group"
-import ImageTable, {
- ImageTableDataType,
-} from "../../../../components/templates/image-table"
-import { nestedForm } from "../../../../utils/nested-form"
-import { useGiftCardForm } from "../form/gift-card-form-context"
-
-const Images = () => {
- const { form, setImageDirtyState } = useGiftCardForm()
-
- const { fields, append, remove } = useFieldArray({
- control: form.control,
- name: "images",
- })
-
- const handleRemove = (index: number) => {
- setImageDirtyState(true)
- remove(index)
- }
-
- const handleFilesChosen = (files: File[]) => {
- if (files.length) {
- const toAppend = files.map((file) => ({
- url: URL.createObjectURL(file),
- name: file.name,
- size: file.size,
- nativeFile: file,
- }))
-
- append(toAppend)
- }
- }
-
- return (
-
-
-
-
-
-
- )
-}
-
-export default Images
diff --git a/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/information.tsx b/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/information.tsx
deleted file mode 100644
index 92b448001c..0000000000
--- a/packages/admin-ui/ui/src/domain/gift-cards/manage/sections/information.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import { Product } from "@medusajs/medusa"
-import {
- useAdminDeleteProduct,
- useAdminProductTypes,
- useAdminUpdateProduct,
-} from "medusa-react"
-import React from "react"
-import { Controller } from "react-hook-form"
-import { useNavigate } from "react-router-dom"
-import TrashIcon from "../../../../components/fundamentals/icons/trash-icon"
-import UnpublishIcon from "../../../../components/fundamentals/icons/unpublish-icon"
-import Input from "../../../../components/molecules/input"
-import Select from "../../../../components/molecules/select"
-import StatusSelector from "../../../../components/molecules/status-selector"
-import TagInput from "../../../../components/molecules/tag-input"
-import TextArea from "../../../../components/molecules/textarea"
-import BodyCard from "../../../../components/organisms/body-card"
-import DetailsCollapsible from "../../../../components/organisms/details-collapsible"
-import useNotification from "../../../../hooks/use-notification"
-import { getErrorMessage } from "../../../../utils/error-messages"
-import FormValidator from "../../../../utils/form-validator"
-import { useGiftCardForm } from "../form/gift-card-form-context"
-
-type InformationProps = {
- giftCard: Omit
-}
-
-const Information: React.FC = ({ giftCard }) => {
- const {
- form: {
- register,
- setValue,
- control,
- formState: { errors },
- },
- } = useGiftCardForm()
- const navigate = useNavigate()
- const notification = useNotification()
- const { product_types } = useAdminProductTypes(undefined, {
- cacheTime: 0,
- })
-
- const typeOptions =
- product_types?.map((tag) => ({ label: tag.value, value: tag.id })) || []
-
- const updateGiftCard = useAdminUpdateProduct(giftCard.id)
- const deleteGiftCard = useAdminDeleteProduct(giftCard.id)
-
- const setNewType = (value: string) => {
- const newType = {
- label: value,
- value,
- }
-
- typeOptions.push(newType)
- setValue("type", newType)
-
- return newType
- }
-
- const onUpdate = () => {
- updateGiftCard.mutate(
- {
- // @ts-ignore
- status: giftCard.status === "draft" ? "published" : "draft",
- },
- {
- onSuccess: () => {
- notification("Success", "Gift card updated successfully", "success")
- },
- onError: (error) => {
- notification("Error", getErrorMessage(error), "error")
- },
- }
- )
- }
-
- const onDelete = () => {
- deleteGiftCard.mutate(undefined, {
- onSuccess: () => {
- navigate("/a/gift-cards")
- notification("Success", "Gift card updated successfully", "success")
- },
- onError: (error) => {
- notification("Error", getErrorMessage(error), "error")
- },
- })
- }
-
- return (
-
- }
- actionables={[
- {
- label:
- giftCard?.status !== "published"
- ? "Publish Gift Card"
- : "Unpublish Gift Card",
- onClick: onUpdate,
- icon: ,
- },
- {
- label: "Delete Gift Card",
- onClick: onDelete,
- variant: "danger",
- icon: ,
- },
- ]}
- >
-
-
- )
-}
-
-const GiftCardStatusSelector = ({
- currentStatus,
- onUpdate,
-}: {
- currentStatus: "draft" | "proposed" | "published" | "rejected"
- onUpdate: () => void
-}) => {
- return (
-
- )
-}
-
-export default Information
diff --git a/packages/admin-ui/ui/src/domain/gift-cards/manage/utils/types.ts b/packages/admin-ui/ui/src/domain/gift-cards/manage/utils/types.ts
deleted file mode 100644
index 560dcd8cb5..0000000000
--- a/packages/admin-ui/ui/src/domain/gift-cards/manage/utils/types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { FormImage, Option } from "../../../../types/shared"
-
-export type ManageGiftCardFormData = {
- title: string
- handle?: string
- subtitle?: string | null
- description?: string | null
- type: Option | null
- tags?: string[]
- images: FormImage[]
- thumbnail: number
-}
diff --git a/packages/admin-ui/ui/src/domain/inventory/locations/components/edit-sales-channels/index.tsx b/packages/admin-ui/ui/src/domain/inventory/locations/components/edit-sales-channels/index.tsx
index 53ef0a98d0..cddd6f4a38 100644
--- a/packages/admin-ui/ui/src/domain/inventory/locations/components/edit-sales-channels/index.tsx
+++ b/packages/admin-ui/ui/src/domain/inventory/locations/components/edit-sales-channels/index.tsx
@@ -1,11 +1,11 @@
import { SalesChannel, StockLocationExpandedDTO } from "@medusajs/medusa"
import {
useAdminAddLocationToSalesChannel,
- useAdminRemoveLocationFromSalesChannel,
+ useAdminRemoveLocationFromSalesChannel
} from "medusa-react"
+import SalesChannelsModal from "../../../../../components/forms/product/sales-channels-modal"
import Button from "../../../../../components/fundamentals/button"
-import SalesChannelsModal from "../../../../products/components/sales-channels-modal"
import useToggleState from "../../../../../hooks/use-toggle-state"
const EditSalesChannels = ({
diff --git a/packages/admin-ui/ui/src/domain/inventory/locations/components/sales-channels-form/index.tsx b/packages/admin-ui/ui/src/domain/inventory/locations/components/sales-channels-form/index.tsx
index aa15a4779d..d066ec6196 100644
--- a/packages/admin-ui/ui/src/domain/inventory/locations/components/sales-channels-form/index.tsx
+++ b/packages/admin-ui/ui/src/domain/inventory/locations/components/sales-channels-form/index.tsx
@@ -1,10 +1,10 @@
import { SalesChannel, StockLocationExpandedDTO } from "@medusajs/medusa"
import { useFieldArray } from "react-hook-form"
+import SalesChannelsModal from "../../../../../components/forms/product/sales-channels-modal"
import Button from "../../../../../components/fundamentals/button"
import SalesChannelsList from "../../../../../components/molecules/sales-channels-list"
import useToggleState from "../../../../../hooks/use-toggle-state"
import { NestedForm } from "../../../../../utils/nested-form"
-import SalesChannelsModal from "../../../../products/components/sales-channels-modal"
import { AddSalesChannelsFormType } from "../../../../products/new/add-sales-channels"
const SalesChannelsForm = ({
diff --git a/packages/admin-ui/ui/src/domain/orders/components/shipping-form/index.tsx b/packages/admin-ui/ui/src/domain/orders/components/shipping-form/index.tsx
index 253c525e3a..87c9a5c06a 100644
--- a/packages/admin-ui/ui/src/domain/orders/components/shipping-form/index.tsx
+++ b/packages/admin-ui/ui/src/domain/orders/components/shipping-form/index.tsx
@@ -4,12 +4,12 @@ import clsx from "clsx"
import { useAdminShippingOptions } from "medusa-react"
import { useMemo } from "react"
import { Controller, useWatch } from "react-hook-form"
+import PriceFormInput from "../../../../components/forms/general/prices-form/price-form-input"
import Button from "../../../../components/fundamentals/button"
import TrashIcon from "../../../../components/fundamentals/icons/trash-icon"
import { NextSelect } from "../../../../components/molecules/select/next-select"
import { NestedForm } from "../../../../utils/nested-form"
import { formatAmountWithSymbol } from "../../../../utils/prices"
-import PriceFormInput from "../../../products/components/prices-form/price-form-input"
export type ShippingFormType = {
option: {
diff --git a/packages/admin-ui/ui/src/domain/products/edit/index.tsx b/packages/admin-ui/ui/src/domain/products/edit/index.tsx
index a7331fb87c..650956647b 100644
--- a/packages/admin-ui/ui/src/domain/products/edit/index.tsx
+++ b/packages/admin-ui/ui/src/domain/products/edit/index.tsx
@@ -2,13 +2,13 @@ import { useAdminProduct } from "medusa-react"
import { useNavigate, useParams } from "react-router-dom"
import BackButton from "../../../components/atoms/back-button"
import Spinner from "../../../components/atoms/spinner"
+import ProductAttributesSection from "../../../components/organisms/product-attributes-section"
+import ProductGeneralSection from "../../../components/organisms/product-general-section"
+import ProductMediaSection from "../../../components/organisms/product-media-section"
+import ProductRawSection from "../../../components/organisms/product-raw-section"
+import ProductThumbnailSection from "../../../components/organisms/product-thumbnail-section"
+import ProductVariantsSection from "../../../components/organisms/product-variants-section"
import { getErrorStatus } from "../../../utils/get-error-status"
-import AttributesSection from "./sections/attributes"
-import GeneralSection from "./sections/general"
-import MediaSection from "./sections/media"
-import RawSection from "./sections/raw"
-import ThumbnailSection from "./sections/thumbnail"
-import VariantsSection from "./sections/variants"
const Edit = () => {
const { id } = useParams()
@@ -17,13 +17,9 @@ const Edit = () => {
const { product, status, error } = useAdminProduct(id || "")
if (error) {
- let message = "An unknown error occurred"
-
const errorStatus = getErrorStatus(error)
if (errorStatus) {
- message = errorStatus.message
-
// If the product is not found, redirect to the 404 page
if (errorStatus.status === 404) {
navigate("/404")
@@ -53,14 +49,14 @@ const Edit = () => {
/>