fix(admin-ui): hide categories in products behind feature flag (#3467)

This commit is contained in:
Riqwan Thamir authored and GitHub committed 2023-03-14 11:20:39 +01:00
1 parent 478903b55a
commit d278ac25c8
4 files changed
+23 -8

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
---
"@medusajs/admin-ui": patch
---
fix(admin-ui): hide categories in products behind feature flag
@@ -27,8 +27,11 @@ type Props = {
const OrganizeForm = ({ form }: Props) => { const OrganizeForm = ({ form }: Props) => {
const { control, path, setValue } = form const { control, path, setValue } = form
const { productTypeOptions, collectionOptions, categoriesOptions } = const {
useOrganizeData() productTypeOptions,
collectionOptions,
categoriesOptions = [],
} = useOrganizeData()
const { isFeatureEnabled } = useFeatureFlag() const { isFeatureEnabled } = useFeatureFlag()
@@ -90,7 +93,7 @@ const OrganizeForm = ({ form }: Props) => {
name={path("categories")} name={path("categories")}
control={control} control={control}
render={({ field: { value, onChange } }) => { render={({ field: { value, onChange } }) => {
if (!categoriesOptions) { if (categoriesOptions.length === 0) {
return null return null
} }
@@ -8,17 +8,24 @@ import {
import { NestedMultiselectOption } from "../../../categories/components/multiselect" import { NestedMultiselectOption } from "../../../categories/components/multiselect"
import { transformCategoryToNestedFormOptions } from "../../../categories/utils/transform-response" import { transformCategoryToNestedFormOptions } from "../../../categories/utils/transform-response"
import {
useFeatureFlag,
FeatureFlag,
} from "../../../../providers/feature-flag-provider"
const useOrganizeData = () => { const useOrganizeData = () => {
const { isFeatureEnabled } = useFeatureFlag()
const { product_types } = useAdminProductTypes(undefined, { const { product_types } = useAdminProductTypes(undefined, {
staleTime: 0, staleTime: 0,
refetchOnWindowFocus: true, refetchOnWindowFocus: true,
}) })
const { collections } = useAdminCollections() const { collections } = useAdminCollections()
const { product_categories: categories } = useAdminProductCategories({ const { product_categories: categories = [] } =
parent_category_id: "null", isFeatureEnabled(FeatureFlag.PRODUCT_CATEGORIES) &&
include_descendants_tree: true, useAdminProductCategories({
}) parent_category_id: "null",
include_descendants_tree: true,
})
const productTypeOptions = useMemo(() => { const productTypeOptions = useMemo(() => {
return ( return (
@@ -141,7 +141,7 @@ const getDefaultValues = (product: Product): GeneralFormWrapper => {
? { label: product.type.value, value: product.type.id } ? { label: product.type.value, value: product.type.id }
: null, : null,
tags: product.tags ? product.tags.map((t) => t.value) : null, tags: product.tags ? product.tags.map((t) => t.value) : null,
categories: product.categories.map((c) => c.id), categories: product?.categories?.map((c) => c.id),
}, },
discountable: { discountable: {
value: product.discountable, value: product.discountable,