diff --git a/fakeyou/src/common/ApiConfig.ts b/fakeyou/src/common/ApiConfig.ts index 37368cf561..06748db480 100644 --- a/fakeyou/src/common/ApiConfig.ts +++ b/fakeyou/src/common/ApiConfig.ts @@ -250,7 +250,15 @@ class ApiConfig { return `${this.getScheme()}://${this.getNewApiHost()}/category/create`; } - listCategoriesForTtsModel(ttsModelToken: string) : string { + assignTtsCategory() : string { + return `${this.getScheme()}://${this.getNewApiHost()}/category/assign/tts`; + } + + listTtsCategories() : string { + return `${this.getScheme()}://${this.getNewApiHost()}/category/list/tts`; + } + + listTtsCategoriesForModel(ttsModelToken: string) : string { return `${this.getScheme()}://${this.getNewApiHost()}/category/assignments/tts/${ttsModelToken}`; } diff --git a/fakeyou/src/v2/api/category/AssignTtsCategory.ts b/fakeyou/src/v2/api/category/AssignTtsCategory.ts new file mode 100644 index 0000000000..f6829774a6 --- /dev/null +++ b/fakeyou/src/v2/api/category/AssignTtsCategory.ts @@ -0,0 +1,56 @@ +import { ApiConfig } from "../../../common/ApiConfig"; + +export interface AssignTtsCategoryRequest { + category_token: string, + tts_model_token: string, + // Whether to add or delete the assignment + assign: boolean, +} + +export interface AssignTtsCategorySuccessResponse { + success: boolean, +} + +export interface AssignTtsCategoryErrorResponse { + success: boolean, +} + +type AssignTtsCategoryResponse = AssignTtsCategorySuccessResponse | AssignTtsCategoryErrorResponse; + +export function AssignTtsCategoryIsOk(response: AssignTtsCategoryResponse): response is AssignTtsCategorySuccessResponse { + return response?.success === true; +} + +export function AssignTtsCategoryIsError(response: AssignTtsCategoryResponse): response is AssignTtsCategoryErrorResponse { + return response?.success === false; +} + +export async function AssignTtsCategory(request: AssignTtsCategoryRequest) : Promise +{ + const endpoint = new ApiConfig().assignTtsCategory(); + + return await fetch(endpoint, { + method: 'POST', + headers: { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + }, + credentials: 'include', + body: JSON.stringify(request), + }) + .then(res => res.json()) + .then(res => { + if (!res) { + return { success : false }; // TODO: This loses error semantics and is deprecated + } + + if (res && 'success' in res) { + return res; + } else { + return { success : false }; + } + }) + .catch(e => { + return { success : false }; + }); +} diff --git a/fakeyou/src/v2/api/category/ListTtsCategories.ts b/fakeyou/src/v2/api/category/ListTtsCategories.ts new file mode 100644 index 0000000000..0130ffca24 --- /dev/null +++ b/fakeyou/src/v2/api/category/ListTtsCategories.ts @@ -0,0 +1,61 @@ +import { ApiConfig } from "../../../common/ApiConfig"; + +export interface ListTtsCategoriesSuccessResponse { + success: boolean, + categories: Array +} + +export interface TtsCategory { + category_token: string, + model_type: string, + maybe_super_category_token?: string, + + can_directly_have_models: boolean, + can_have_subcategories: boolean, + can_only_mods_apply: boolean, + + name: string, + maybe_dropdown_name?: string, +} + +export interface ListTtsCategoriesErrorResponse { + success: boolean, +} + +type ListTtsCategoriesResponse = ListTtsCategoriesSuccessResponse | ListTtsCategoriesErrorResponse; + +export function ListTtsCategoriesIsOk(response: ListTtsCategoriesResponse): response is ListTtsCategoriesSuccessResponse { + return response?.success === true; +} + +export function ListTtsCategoriesIsError(response: ListTtsCategoriesResponse): response is ListTtsCategoriesErrorResponse { + return response?.success === false; +} + +export async function ListTtsCategories() : Promise +{ + const endpoint = new ApiConfig().listTtsCategories(); + + return await fetch(endpoint, { + method: 'GET', + headers: { + 'Accept': 'application/json', + }, + credentials: 'include', + }) + .then(res => res.json()) + .then(res => { + if (!res) { + return { success : false }; // TODO: This loses error semantics and is deprecated + } + + if (res && 'success' in res) { + return res; + } else { + return { success : false }; + } + }) + .catch(e => { + return { success : false }; + }); +} diff --git a/fakeyou/src/v2/api/category/ListCategoriesForTtsModel.ts b/fakeyou/src/v2/api/category/ListTtsCategoriesForModel.ts similarity index 62% rename from fakeyou/src/v2/api/category/ListCategoriesForTtsModel.ts rename to fakeyou/src/v2/api/category/ListTtsCategoriesForModel.ts index e6e86e1ca5..b244c6912c 100644 --- a/fakeyou/src/v2/api/category/ListCategoriesForTtsModel.ts +++ b/fakeyou/src/v2/api/category/ListTtsCategoriesForModel.ts @@ -1,6 +1,6 @@ import { ApiConfig } from "../../../common/ApiConfig"; -export interface ListCategoriesForTtsModelSuccessResponse { +export interface ListTtsCategoriesForModelSuccessResponse { success: boolean, categories: Array } @@ -24,23 +24,23 @@ export interface TtsModelCategory { category_deleted_at?: Date, } -export interface ListCategoriesForTtsModelErrorResponse { +export interface ListTtsCategoriesForModelErrorResponse { success: boolean, } -type ListCategoriesForTtsModelResponse = ListCategoriesForTtsModelSuccessResponse | ListCategoriesForTtsModelErrorResponse; +type ListTtsCategoriesForModelResponse = ListTtsCategoriesForModelSuccessResponse | ListTtsCategoriesForModelErrorResponse; -export function ListCategoriesForTtsModelIsOk(response: ListCategoriesForTtsModelResponse): response is ListCategoriesForTtsModelSuccessResponse { +export function ListTtsCategoriesForModelIsOk(response: ListTtsCategoriesForModelResponse): response is ListTtsCategoriesForModelSuccessResponse { return response?.success === true; } -export function ListCategoriesForTtsModelIsError(response: ListCategoriesForTtsModelResponse): response is ListCategoriesForTtsModelErrorResponse { +export function ListTtsCategoriesForModelIsError(response: ListTtsCategoriesForModelResponse): response is ListTtsCategoriesForModelErrorResponse { return response?.success === false; } -export async function ListCategoriesForTtsModel(ttsModelToken: string) : Promise +export async function ListTtsCategoriesForModel(ttsModelToken: string) : Promise { - const endpoint = new ApiConfig().listCategoriesForTtsModel(ttsModelToken); + const endpoint = new ApiConfig().listTtsCategoriesForModel(ttsModelToken); return await fetch(endpoint, { method: 'GET', diff --git a/fakeyou/src/v2/view/tts/tts_edit_categories/TtsEditCategoriesPage.tsx b/fakeyou/src/v2/view/tts/tts_edit_categories/TtsEditCategoriesPage.tsx index 138365aa64..185653063d 100644 --- a/fakeyou/src/v2/view/tts/tts_edit_categories/TtsEditCategoriesPage.tsx +++ b/fakeyou/src/v2/view/tts/tts_edit_categories/TtsEditCategoriesPage.tsx @@ -4,7 +4,9 @@ import { useParams, useHistory } from 'react-router-dom'; import { FrontendUrlConfig } from '../../../../common/FrontendUrlConfig'; import { BackLink } from '../../_common/BackLink'; import { GetTtsModel, GetTtsModelIsErr, GetTtsModelIsOk, TtsModel, TtsModelLookupError } from '../../../api/tts/GetTtsModel'; -import { ListCategoriesForTtsModel, ListCategoriesForTtsModelIsError, ListCategoriesForTtsModelIsOk, TtsModelCategory } from '../../../api/category/ListCategoriesForTtsModel'; +import { ListTtsCategoriesForModel, ListTtsCategoriesForModelIsError, ListTtsCategoriesForModelIsOk, TtsModelCategory } from '../../../api/category/ListTtsCategoriesForModel'; +import { ListTtsCategories, ListTtsCategoriesIsError, ListTtsCategoriesIsOk, TtsCategory } from '../../../api/category/ListTtsCategories'; +import { AssignTtsCategory, AssignTtsCategoryIsError, AssignTtsCategoryIsOk } from '../../../api/category/AssignTtsCategory'; interface Props { sessionWrapper: SessionWrapper, @@ -18,6 +20,7 @@ function TtsEditCategoriesPage(props: Props) { const [ttsModel, setTtsModel] = useState(undefined); const [notFoundState, setNotFoundState] = useState(false); + const [allTtsCategories, setAllTtsCategories] = useState([]); const [assignedCategories, setAssignedCategories] = useState([]); const getModel = useCallback(async (token) => { @@ -34,20 +37,31 @@ function TtsEditCategoriesPage(props: Props) { } }, []); - const listCategoriesForModel = useCallback(async (token) => { - const categoryList = await ListCategoriesForTtsModel(token); + const listTtsCategories = useCallback(async () => { + const categoryList = await ListTtsCategories(); - if (ListCategoriesForTtsModelIsOk(categoryList)) { + if (ListTtsCategoriesIsOk(categoryList)) { + setAllTtsCategories(categoryList.categories); + } else if (ListTtsCategoriesIsError(categoryList)) { + // TODO: Improve + } + }, []); + + const listTtsCategoriesForModel = useCallback(async (token) => { + const categoryList = await ListTtsCategoriesForModel(token); + + if (ListTtsCategoriesForModelIsOk(categoryList)) { setAssignedCategories(categoryList.categories); - } else if (ListCategoriesForTtsModelIsError(categoryList)) { + } else if (ListTtsCategoriesForModelIsError(categoryList)) { // TODO: Improve } }, []); useEffect(() => { getModel(token); - listCategoriesForModel(token); - }, [token, getModel]); + listTtsCategories(); + listTtsCategoriesForModel(token); + }, [token, getModel, listTtsCategories, listTtsCategoriesForModel]); if (notFoundState) { @@ -60,6 +74,28 @@ function TtsEditCategoriesPage(props: Props) { return
} + const handleAddCategory = async (ev: React.FormEvent) => { + const categoryToken = (ev.target as HTMLSelectElement).value; + + if (categoryToken === '') { + return; // Default dropdown option is a no-op + } + + const assignRequest = { + category_token: categoryToken, + tts_model_token: token, + assign: true, + }; + + const result = await AssignTtsCategory(assignRequest); + + if (AssignTtsCategoryIsOk(result)) { + listTtsCategoriesForModel(token); // Reload + } else if (AssignTtsCategoryIsError(result)) { + // TODO: Improve + } + } + const modelLink = FrontendUrlConfig.ttsModelPage(token); let currentCategoriesList = ( @@ -82,6 +118,17 @@ function TtsEditCategoriesPage(props: Props) { ); } + const addCategoryOptions = allTtsCategories.filter(category => { + //if (category.category_token) + return true; + }).map(category => { + return ( + <> + + + ) + }); + return (

Edit TTS Categories

@@ -95,6 +142,17 @@ function TtsEditCategoriesPage(props: Props) {
    {currentCategoriesList}

Add new category

+ +
+
+
+ +
+
+