pass more state (but needs cleanup)

This commit is contained in:
Brandon Thomas committed 2022-01-05 22:18:57 -05:00
1 parent 5d8279cc0d
commit 17ee5ecfec
5 files changed
+148 -139

No files matched your search

+12 -8
View File
@@ -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<Props, State> {
// ttsModels: [],
// allTtsCategories: [],
currentTtsModelSelected: undefined,
// currentTtsModelSelected: undefined,
}
}
@@ -396,9 +397,9 @@ class App extends React.Component<Props, State> {
// 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<Props, State> {
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}
/>
</Route>
+8 -1
View File
@@ -39,8 +39,12 @@ export function AppWrapper(props: Props) {
// Structure: [firstSelected, secondSelected...]
const [selectedCategories, setSelectedCategories] = useState<TtsCategory[]>([]);
const [maybeSelectedTtsModel, setMaybeSelectedTtsModel] = useState<TtsModelListItem|undefined>(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}
/>
</>
)
+9 -4
View File
@@ -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<Props, State> {
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}
/>
</Route>
@@ -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((
<option key="waiting" value="" disabled={true}>Loading...</option>
))
}
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 <select>
// // Inner array contains the categories in each level.
// // Structure: [dropdownLevel][categories]
// const [dropdownCategories, setDropdownCategories] = useState<TtsCategory[][]>([]);
//
// // Every category in the heirarchy that has been selected by the user.
// // Empty list if none are selected.
// // Structure: [firstSelected, secondSelected...]
// const [selectedCategories, setSelectedCategories] = useState<TtsCategory[]>([]);
//
// // A TTS voice is attached to every category up the tree from the leaf.
// // We recursively build this, 1) to ensure we can access a voice at all levels
// // of specificity, and 2) to prune empty categories.
// const [ttsModelsByCategoryToken, setTtsModelsByCategoryToken] = useState<Map<string,Set<TtsModelListItem>>>(new Map());
// // TODO: Handle empty category list
// useEffect(() => {
// // Initial dropdown state
// const rootCategories = allTtsCategories.filter(category => {
// return !category.maybe_super_category_token;
// });
// const rootLevel = [rootCategories];
// setDropdownCategories(rootLevel);
//
// // Voice lookup table
// let categoriesToTtsModelTokens = new Map();
// // Category ancestry memoization
// let categoryTokenToAllAncestorTokens : Map<string, Set<string>> = new Map();
//
// // N * M with memoization should't be too bad here.
// // Also note that the models should be lexographically sorted by name.
// allTtsModels.forEach(ttsModel => {
// if (ttsModel.category_tokens.length === 0) {
// // TODO: Attach to "uncategorized" special category
// return;
// }
// ttsModel.category_tokens.forEach(categoryToken => {
// let ancestors = categoryTokenToAllAncestorTokens.get(categoryToken);
// if (ancestors === undefined) {
// ancestors = findAllAncestorTokens(categoryToken, allTtsCategoriesByTokenMap);
// categoryTokenToAllAncestorTokens.set(categoryToken, ancestors);
// }
// ancestors.forEach(categoryToken => {
// let models : Set<TtsModelListItem> = categoriesToTtsModelTokens.get(categoryToken);
// if (models === undefined) {
// models = new Set();
// categoriesToTtsModelTokens.set(categoryToken, models);
// }
// models.add(ttsModel);
// })
// });
// });
// setTtsModelsByCategoryToken(categoriesToTtsModelTokens);
//
// }, [allTtsCategories, allTtsModels, allTtsCategoriesByTokenMap]);
useEffect(() => {
console.log('========= MultiDropdownSearch.useEffect() ===========')
let maybeElement = document.getElementsByName('tts-model-select')[0];
if (maybeElement) {
(maybeElement as any).value = '*';
}
});
const doChangeCategory = (level: number, maybeToken: string) => {
// Slice off all the irrelevant child category choices, then append new choice.
@@ -140,7 +112,8 @@ export function MultiDropdownSearch(props: Props) {
const ttsModelToken = (ev.target as HTMLSelectElement).value;
const maybeTtsModel = allTtsModelsByTokenMap.get(ttsModelToken);
if (maybeTtsModel) {
props.setCurrentTtsModelSelected(maybeTtsModel);
// props.setCurrentTtsModelSelected(maybeTtsModel);
props.setMaybeSelectedTtsModel(maybeTtsModel);
}
};
@@ -203,16 +176,6 @@ export function MultiDropdownSearch(props: Props) {
);
}
/*
let selectClasses = 'select is-large';
if (listItems.length === 0) {
selectClasses = 'select is-large is-loading';
listItems.push((
<option key="waiting" value="" disabled={true}>Loading...</option>
))
}
*/
const leafiestCategory = selectedCategories[selectedCategories.length - 1];
let leafiestCategoryModels : Set<TtsModelListItem> = new Set();
@@ -224,54 +187,37 @@ export function MultiDropdownSearch(props: Props) {
const voiceCount = leafiestCategoryModels.size;
let modelDropdown = (
<div className="control has-icons-left">
<div className="select is-normal">
<select onChange={handleChangeVoice}>
{Array.from(leafiestCategoryModels).map(model => {
return (
<option
key={model.model_token}
value={model.model_token}
>{model.title} (by {model.creator_display_name})</option>
);
})}
</select>
</div>
<span className="icon is-small is-left">
<FontAwesomeIcon icon={faHeadphonesAlt} />
</span>
</div>
);
return (
<div>
{/* Category Dropdowns */}
<strong>Category Filters</strong>
<br />
{categoryDropdowns}
<br />
{/* Model Dropdown */}
<strong>Voice ({voiceCount} to choose from)</strong>
<br />
{modelDropdown}
<div className="control has-icons-left">
<div className="select is-normal">
<select
name="tts-model-select"
onChange={handleChangeVoice}
>
{Array.from(leafiestCategoryModels).map(model => {
return (
<option
key={model.model_token}
value={model.model_token}
>{model.title} (by {model.creator_display_name})</option>
);
})}
</select>
</div>
<span className="icon is-small is-left">
<FontAwesomeIcon icon={faHeadphonesAlt} />
</span>
</div>
</div>
)
}
function findAllAncestorTokens(categoryToken: string, allCategoriesByTokenMap: Map<string, TtsCategory>): Set<string> {
const ancestorTokens = recursiveFindAllAncestorTokens(categoryToken, allCategoriesByTokenMap);
return new Set(ancestorTokens);
}
function recursiveFindAllAncestorTokens(categoryToken: string, allCategoriesByTokenMap: Map<string, TtsCategory>): 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,
];
}
@@ -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<JSX.Element> = [];
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<HTMLFormElement>) => {
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 = <span />;
if (props.currentTtsModelSelected) {
let modelLink = `/tts/${props.currentTtsModelSelected.model_token}`;
// if (props.currentTtsModelSelected) {
// let modelLink = `/tts/${props.currentTtsModelSelected.model_token}`;
// directViewLink = (
// <Link to={modelLink}>
// See more details about the "<strong>{props.currentTtsModelSelected.title}</strong>" model
// by&nbsp;<strong>{props.currentTtsModelSelected.creator_display_name}</strong>&nbsp;
// <GravatarFc
// size={15}
// username={props.currentTtsModelSelected.creator_display_name}
// email_hash={props.currentTtsModelSelected.creator_gravatar_hash} />
// </Link>
// );
// }
if (props.maybeSelectedTtsModel) {
let modelLink = `/tts/${props.maybeSelectedTtsModel.model_token}`;
directViewLink = (
<Link to={modelLink}>
See more details about the "<strong>{props.currentTtsModelSelected.title}</strong>" model
by&nbsp;<strong>{props.currentTtsModelSelected.creator_display_name}</strong>&nbsp;
See more details about the "<strong>{props.maybeSelectedTtsModel.title}</strong>" model
by&nbsp;<strong>{props.maybeSelectedTtsModel.creator_display_name}</strong>&nbsp;
<GravatarFc
size={15}
username={props.currentTtsModelSelected.creator_display_name}
email_hash={props.currentTtsModelSelected.creator_gravatar_hash} />
username={props.maybeSelectedTtsModel.creator_display_name}
email_hash={props.maybeSelectedTtsModel.creator_gravatar_hash} />
</Link>
);
}
@@ -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}
/>
<hr />