diff --git a/fakeyou/src/v2/view/moderation/moderation_tts_category_edit/ModerationTtsCategoryEditPage.tsx b/fakeyou/src/v2/view/moderation/moderation_tts_category_edit/ModerationTtsCategoryEditPage.tsx index dbc26bf27a..3d633a4815 100644 --- a/fakeyou/src/v2/view/moderation/moderation_tts_category_edit/ModerationTtsCategoryEditPage.tsx +++ b/fakeyou/src/v2/view/moderation/moderation_tts_category_edit/ModerationTtsCategoryEditPage.tsx @@ -7,6 +7,7 @@ import { Link, useHistory } from 'react-router-dom'; import { SessionWrapper } from '../../../../session/SessionWrapper'; import { useParams } from 'react-router-dom'; import { EditCategory, EditCategoryIsError, EditCategoryIsSuccess, EditCategoryRequest } from '../../../api/category/EditCategory'; +import { ListTtsCategories, ListTtsCategoriesIsError, ListTtsCategoriesIsOk, TtsCategory } from '../../../api/category/ListTtsCategories'; interface Props { sessionWrapper: SessionWrapper, @@ -19,7 +20,9 @@ function ModerationTtsCategoryEditPage(props: Props) { const [category, setCategory] = useState(undefined); + // Fields const [name, setName] = useState(''); + const [maybeSuperCategoryToken, setMaybeSuperCategoryToken] = useState(undefined); // Optional const [maybeDropdownName, setMaybeDropdownName] = useState(undefined); // Optional const [canDirectlyHaveModels, setCanDirectlyHaveModels] = useState(false); const [canHaveSubcategories, setCanHaveSubcategories] = useState(false); @@ -27,6 +30,10 @@ function ModerationTtsCategoryEditPage(props: Props) { const [isModApproved, setIsModApproved] = useState(false); const [maybeModComments, setMaybeModComments] = useState(undefined); // Optional + // Additional object lookups to support parent categories + const [allTtsCategories, setAllTtsCategories] = useState([]); + //const [maybeSuperCategory, setMaybeSuperCategory] = useState(undefined); + const [errorMessage, setErrorMessage] = useState(undefined); const getCategory = useCallback(async (categoryToken: string) => { @@ -36,6 +43,7 @@ function ModerationTtsCategoryEditPage(props: Props) { const category = categoryList.category; setCategory(category); setName(category.name); + setMaybeSuperCategoryToken(category.maybe_super_category_token); setMaybeDropdownName(category.maybe_dropdown_name); setCanDirectlyHaveModels(category.can_directly_have_models); setCanHaveSubcategories(category.can_have_subcategories); @@ -46,9 +54,31 @@ function ModerationTtsCategoryEditPage(props: Props) { setErrorMessage("error fetching category"); } }, []); + + //const getSuperCategory = useCallback(async (parentCategoryToken: string) => { + // const categoryList = await GetCategory(parentCategoryToken); + + // if (GetCategoryIsOk(categoryList)) { + // const category = categoryList.category; + // setMaybeSuperCategory(category); + // } else if (GetCategoryIsError(categoryList)) { + // setErrorMessage("error fetching parent category"); + // } + //}, []); + + const listTtsCategories = useCallback(async () => { + const categoryList = await ListTtsCategories(); + + if (ListTtsCategoriesIsOk(categoryList)) { + setAllTtsCategories(categoryList.categories); + } else if (ListTtsCategoriesIsError(categoryList)) { + setErrorMessage("error listing all categories"); + } + }, []); useEffect(() => { getCategory(token); + listTtsCategories(); }, [token, getCategory]); if (!props.sessionWrapper.canBanUsers()) { @@ -90,6 +120,12 @@ function ModerationTtsCategoryEditPage(props: Props) { setIsModApproved(updatedValue) }; + const handleSetSuperCategory = async (ev: React.FormEvent) => { + const superCategoryToken = (ev.target as HTMLSelectElement).value; + let fixedSuperCategoryToken = !!superCategoryToken ? superCategoryToken : undefined; + setMaybeSuperCategoryToken(fixedSuperCategoryToken); + } + const handleFormSubmit = async (ev: React.FormEvent) : Promise => { ev.preventDefault(); @@ -99,6 +135,7 @@ function ModerationTtsCategoryEditPage(props: Props) { name: name, maybe_dropdown_name: maybeDropdownName, maybe_mod_comments: maybeModComments, + maybe_super_category_token: maybeSuperCategoryToken, can_directly_have_models: canDirectlyHaveModels, can_have_subcategories: canHaveSubcategories, can_only_mods_apply: canOnlyModsApply, @@ -131,6 +168,19 @@ function ModerationTtsCategoryEditPage(props: Props) { } const isModApprovedHtmlFormState = isModApproved ? "true" : "false"; + const maybeSuperCategoryTokenFormHtmlState = maybeSuperCategoryToken ? maybeSuperCategoryToken : ""; + + const superCategoryOptions = allTtsCategories.filter(category => { + const isSelf = token === category.category_token; + const cannotAdd = !category.can_directly_have_models; + return !isSelf && !cannotAdd; + }).map(category => { + return ( + <> + + + ) + }); return (
@@ -146,6 +196,18 @@ function ModerationTtsCategoryEditPage(props: Props) {
+ + +
+ +
+ +
+
+
@@ -165,26 +227,27 @@ function ModerationTtsCategoryEditPage(props: Props) {
- + -
- -
+

- +
@@ -197,17 +260,21 @@ function ModerationTtsCategoryEditPage(props: Props) {  Can this category have subcategories? +

- -
-
+ + +
+
+
+ +
+
+