From 17ee5ecfecf704a3a1f5b4f3fd5fb0f6f6ca21b9 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 5 Jan 2022 22:18:57 -0500 Subject: [PATCH] pass more state (but needs cleanup) --- fakeyou/src/App.tsx | 20 ++- fakeyou/src/AppWrapper.tsx | 9 +- fakeyou/src/v2/view/NewVocodesContainer.tsx | 13 +- .../tts_model_list/MultiDropdownSearch.tsx | 160 ++++++------------ .../tts/tts_model_list/TtsModelListFc.tsx | 85 +++++++--- 5 files changed, 148 insertions(+), 139 deletions(-) diff --git a/fakeyou/src/App.tsx b/fakeyou/src/App.tsx index b094648b22..6f96e354e6 100644 --- a/fakeyou/src/App.tsx +++ b/fakeyou/src/App.tsx @@ -22,7 +22,6 @@ enum MigrationMode { OLD_VOCODES, } - interface Props { // Certan browsers (iPhone) have pitiful support for drawing APIs. Worse yet, // they seem to lose the "touch event sandboxing" that allows for audio to be @@ -44,6 +43,9 @@ interface Props { setDropdownCategories: (dropdownCategories: TtsCategory[][]) => void, selectedCategories: TtsCategory[], setSelectedCategories: (selectedCategories: TtsCategory[]) => void, + + maybeSelectedTtsModel?: TtsModelListItem, + setMaybeSelectedTtsModel: (maybeSelectedTtsModel: TtsModelListItem) => void, } interface State { @@ -70,7 +72,6 @@ interface State { // allTtsCategories: TtsCategory[], // Selection state - currentTtsModelSelected?: TtsModelListItem, } function newVocodes() { @@ -105,7 +106,7 @@ class App extends React.Component { // ttsModels: [], // allTtsCategories: [], - currentTtsModelSelected: undefined, +// currentTtsModelSelected: undefined, } } @@ -396,9 +397,9 @@ class App extends React.Component { // this.props.setAllTtsModels(ttsModels); // } - setCurrentTtsModelSelected = (ttsModel: TtsModelListItem) => { - this.setState({ currentTtsModelSelected: ttsModel }); - } +// setCurrentTtsModelSelected = (ttsModel: TtsModelListItem) => { +// this.setState({ currentTtsModelSelected: ttsModel }); +// } // setAllTtsCategories = (allTtsCategories: TtsCategory[]) => { // this.setState({ allTtsCategories: allTtsCategories }) @@ -469,8 +470,11 @@ class App extends React.Component { selectedCategories={this.props.selectedCategories} setSelectedCategories={this.props.setSelectedCategories} - currentTtsModelSelected={this.state.currentTtsModelSelected} - setCurrentTtsModelSelected={this.setCurrentTtsModelSelected} + //currentTtsModelSelected={this.state.currentTtsModelSelected} + //setCurrentTtsModelSelected={this.setCurrentTtsModelSelected} + + maybeSelectedTtsModel={this.props.maybeSelectedTtsModel} + setMaybeSelectedTtsModel={this.props.setMaybeSelectedTtsModel} /> diff --git a/fakeyou/src/AppWrapper.tsx b/fakeyou/src/AppWrapper.tsx index 11ae196a7e..28b097f5f9 100644 --- a/fakeyou/src/AppWrapper.tsx +++ b/fakeyou/src/AppWrapper.tsx @@ -39,8 +39,12 @@ export function AppWrapper(props: Props) { // Structure: [firstSelected, secondSelected...] const [selectedCategories, setSelectedCategories] = useState([]); + const [maybeSelectedTtsModel, setMaybeSelectedTtsModel] = useState(undefined); + // TODO: Handle empty category list useEffect(() => { + console.log("========== AppWrapper.useEffect() ==========") + // Category lookup by token let categoriesByTokenMap = new Map(); allTtsCategories.forEach(category => { @@ -271,11 +275,14 @@ export function AppWrapper(props: Props) { allTtsCategoriesByTokenMap={allCategoriesByTokenMap} allTtsModelsByTokenMap={allTtsModelsByTokenMap} ttsModelsByCategoryToken={ttsModelsByCategoryToken} - + dropdownCategories={dropdownCategories} setDropdownCategories={setDropdownCategories} selectedCategories={selectedCategories} setSelectedCategories={setSelectedCategories} + + maybeSelectedTtsModel={maybeSelectedTtsModel} + setMaybeSelectedTtsModel={setMaybeSelectedTtsModel} /> ) diff --git a/fakeyou/src/v2/view/NewVocodesContainer.tsx b/fakeyou/src/v2/view/NewVocodesContainer.tsx index ba4d1cbc2e..dae0437a71 100644 --- a/fakeyou/src/v2/view/NewVocodesContainer.tsx +++ b/fakeyou/src/v2/view/NewVocodesContainer.tsx @@ -84,8 +84,11 @@ interface Props { selectedCategories: TtsCategory[], setSelectedCategories: (selectedCategories: TtsCategory[]) => void, - currentTtsModelSelected?: TtsModelListItem, - setCurrentTtsModelSelected: (ttsModel: TtsModelListItem) => void, + //currentTtsModelSelected?: TtsModelListItem, + //setCurrentTtsModelSelected: (ttsModel: TtsModelListItem) => void, + + maybeSelectedTtsModel?: TtsModelListItem, + setMaybeSelectedTtsModel: (maybeSelectedTtsModel: TtsModelListItem) => void, } interface State { @@ -384,8 +387,10 @@ class NewVocodesContainer extends React.Component { setDropdownCategories={this.props.setDropdownCategories} selectedCategories={this.props.selectedCategories} setSelectedCategories={this.props.setSelectedCategories} - currentTtsModelSelected={this.props.currentTtsModelSelected} - setCurrentTtsModelSelected={this.props.setCurrentTtsModelSelected} + //currentTtsModelSelected={this.props.currentTtsModelSelected} + //setCurrentTtsModelSelected={this.props.setCurrentTtsModelSelected} + maybeSelectedTtsModel={this.props.maybeSelectedTtsModel} + setMaybeSelectedTtsModel={this.props.setMaybeSelectedTtsModel} /> diff --git a/fakeyou/src/v2/view/tts/tts_model_list/MultiDropdownSearch.tsx b/fakeyou/src/v2/view/tts/tts_model_list/MultiDropdownSearch.tsx index 80904b9377..c5ee5d396b 100644 --- a/fakeyou/src/v2/view/tts/tts_model_list/MultiDropdownSearch.tsx +++ b/fakeyou/src/v2/view/tts/tts_model_list/MultiDropdownSearch.tsx @@ -4,6 +4,23 @@ import { faHeadphonesAlt, faTags, faTimes } from '@fortawesome/free-solid-svg-ic import { TtsCategory } from '../../../api/category/ListTtsCategories'; import { TtsModelListItem } from '../../../api/tts/ListTtsModels'; +/* +TODO: Spinner. + +let selectClasses = 'select is-large'; +if (listItems.length === 0) { + selectClasses = 'select is-large is-loading'; + listItems.push(( + + )) +} + + +TODO: Persist default voice. + + +*/ + interface Props { allTtsCategories: TtsCategory[], allTtsModels: TtsModelListItem[], @@ -18,7 +35,10 @@ interface Props { setSelectedCategories: (selectedCategories: TtsCategory[]) => void, // Pass state up the chain - setCurrentTtsModelSelected: (ttsModel: TtsModelListItem) => void, + //setCurrentTtsModelSelected: (ttsModel: TtsModelListItem) => void, + + maybeSelectedTtsModel?: TtsModelListItem, + setMaybeSelectedTtsModel: (maybeSelectedTtsModel: TtsModelListItem) => void, } export function MultiDropdownSearch(props: Props) { @@ -34,62 +54,14 @@ export function MultiDropdownSearch(props: Props) { setSelectedCategories, } = props; -// // Outer array has length of at least one, one element per - {Array.from(leafiestCategoryModels).map(model => { - return ( - - ); - })} - - - - - - - ); - return (
+ {/* Category Dropdowns */} Category Filters
{categoryDropdowns}
+ + {/* Model Dropdown */} Voice ({voiceCount} to choose from)
- {modelDropdown} +
+
+ +
+ + + +
) } - -function findAllAncestorTokens(categoryToken: string, allCategoriesByTokenMap: Map): Set { - const ancestorTokens = recursiveFindAllAncestorTokens(categoryToken, allCategoriesByTokenMap); - return new Set(ancestorTokens); -} - -function recursiveFindAllAncestorTokens(categoryToken: string, allCategoriesByTokenMap: Map): string[] { - let category = allCategoriesByTokenMap.get(categoryToken) - if (category === undefined) { - return []; - } - if (!category.maybe_super_category_token) { - return [categoryToken]; - } - return [ - ...recursiveFindAllAncestorTokens(category.maybe_super_category_token, allCategoriesByTokenMap), - categoryToken, - ]; -} diff --git a/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx b/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx index 0cbca19140..cf7c4d9302 100644 --- a/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx +++ b/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx @@ -17,7 +17,6 @@ import { TtsModelListNotice } from './TtsModelListNotice'; import { ListTtsCategories, ListTtsCategoriesIsError, ListTtsCategoriesIsOk, TtsCategory } from '../../../api/category/ListTtsCategories'; import { MultiDropdownSearch } from './MultiDropdownSearch'; - export interface EnqueueJobResponsePayload { success: boolean, inference_job_token?: string, @@ -50,26 +49,50 @@ interface Props { setSelectedCategories: (selectedCategories: TtsCategory[]) => void, // TODO: rename 'active' - currentTtsModelSelected?: TtsModelListItem, - setCurrentTtsModelSelected: (ttsModel: TtsModelListItem) => void, + //currentTtsModelSelected?: TtsModelListItem, + //setCurrentTtsModelSelected: (ttsModel: TtsModelListItem) => void, + + maybeSelectedTtsModel?: TtsModelListItem, + setMaybeSelectedTtsModel: (maybeSelectedTtsModel: TtsModelListItem) => void, } function TtsModelListFc(props: Props) { - let { setTtsModels, setAllTtsCategories, setCurrentTtsModelSelected, currentTtsModelSelected } = props; + let { + setTtsModels, + setAllTtsCategories, + //setCurrentTtsModelSelected, + //currentTtsModelSelected, + ttsModels, + allTtsCategories, + maybeSelectedTtsModel, + setMaybeSelectedTtsModel, + } = props; const listModels = useCallback(async () => { + if (ttsModels.length > 0) { + console.log('models already queried'); + return; // Already queried. + } const models = await ListTtsModels(); if (models) { setTtsModels(models); - if (!currentTtsModelSelected && models.length > 0) { +// if (!currentTtsModelSelected && models.length > 0) { +// const model = models[0]; +// setCurrentTtsModelSelected(model); +// } + if (!maybeSelectedTtsModel && models.length > 0) { const model = models[0]; - setCurrentTtsModelSelected(model); + setMaybeSelectedTtsModel(model); } } - }, [setTtsModels, setCurrentTtsModelSelected, currentTtsModelSelected]); + }, [setTtsModels, /*setCurrentTtsModelSelected, currentTtsModelSelected*/ maybeSelectedTtsModel, setMaybeSelectedTtsModel]); const listTtsCategories = useCallback(async () => { + if (allTtsCategories.length > 0) { + console.log('categories already queried'); + return; // Already queried. + } const categoryList = await ListTtsCategories(); if (ListTtsCategoriesIsOk(categoryList)) { setAllTtsCategories(categoryList.categories); @@ -86,8 +109,11 @@ function TtsModelListFc(props: Props) { let listItems: Array = []; let defaultSelectValue = ''; - if (props.currentTtsModelSelected) { - defaultSelectValue = props.currentTtsModelSelected.model_token; +// if (props.currentTtsModelSelected) { +// defaultSelectValue = props.currentTtsModelSelected.model_token; +// } + if (props.maybeSelectedTtsModel) { + defaultSelectValue = props.maybeSelectedTtsModel.model_token; } props.ttsModels.forEach(m => { @@ -123,7 +149,8 @@ function TtsModelListFc(props: Props) { // TODO: Inefficient. props.ttsModels.forEach(model => { if (model.model_token === selectVoiceValue) { - props.setCurrentTtsModelSelected(model); +// props.setCurrentTtsModelSelected(model); + props.setMaybeSelectedTtsModel(model); } }); @@ -139,7 +166,10 @@ function TtsModelListFc(props: Props) { const handleFormSubmit = (ev: React.FormEvent) => { ev.preventDefault(); - if (!props.currentTtsModelSelected) { +// if (!props.currentTtsModelSelected) { +// return false; +// } + if (!props.maybeSelectedTtsModel) { return false; } @@ -147,7 +177,8 @@ function TtsModelListFc(props: Props) { return false; } - const modelToken = props.currentTtsModelSelected!.model_token; +// const modelToken = props.currentTtsModelSelected!.model_token; + const modelToken = props.maybeSelectedTtsModel!.model_token; const api = new ApiConfig(); const endpointUrl = api.inferTts(); @@ -190,16 +221,30 @@ function TtsModelListFc(props: Props) { let directViewLink = ; - if (props.currentTtsModelSelected) { - let modelLink = `/tts/${props.currentTtsModelSelected.model_token}`; +// if (props.currentTtsModelSelected) { +// let modelLink = `/tts/${props.currentTtsModelSelected.model_token}`; +// directViewLink = ( +// +// See more details about the "{props.currentTtsModelSelected.title}" model +// by {props.currentTtsModelSelected.creator_display_name}  +// +// +// ); +// } + + if (props.maybeSelectedTtsModel) { + let modelLink = `/tts/${props.maybeSelectedTtsModel.model_token}`; directViewLink = ( - See more details about the "{props.currentTtsModelSelected.title}" model - by {props.currentTtsModelSelected.creator_display_name}  + See more details about the "{props.maybeSelectedTtsModel.title}" model + by {props.maybeSelectedTtsModel.creator_display_name}  + username={props.maybeSelectedTtsModel.creator_display_name} + email_hash={props.maybeSelectedTtsModel.creator_gravatar_hash} /> ); } @@ -225,7 +270,9 @@ function TtsModelListFc(props: Props) { setDropdownCategories={props.setDropdownCategories} selectedCategories={props.selectedCategories} setSelectedCategories={props.setSelectedCategories} - setCurrentTtsModelSelected={props.setCurrentTtsModelSelected} + //setCurrentTtsModelSelected={props.setCurrentTtsModelSelected} + maybeSelectedTtsModel={props.maybeSelectedTtsModel} + setMaybeSelectedTtsModel={props.setMaybeSelectedTtsModel} />