From 2b17b5d76f564c1e48110f0835f77292efc60605 Mon Sep 17 00:00:00 2001 From: BFlat Date: Sun, 31 Dec 2023 12:55:45 +0700 Subject: [PATCH] removed voice designer unnecessary field divs --- .../VoiceDesignerVoiceEditPage.tsx | 64 ++++--- .../components/steps/UploadSamples.tsx | 156 +++++++++++------- .../components/steps/VoiceDetails.tsx | 12 +- 3 files changed, 130 insertions(+), 102 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerVoiceEditPage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerVoiceEditPage.tsx index dc78d59210..cf54a043be 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerVoiceEditPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerVoiceEditPage.tsx @@ -67,43 +67,37 @@ function VoiceDesignerVoiceEditPage() { /> -
-
- -
+
+ -
- -
+ -
- -
+

diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx index e3a345bd24..789e6040fc 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import { AudioInput } from "components/common"; -import moment from 'moment'; +import moment from "moment"; import ListItems from "../NewList"; import { v4 as uuidv4 } from "uuid"; import { ListSamplesForDataset } from "@storyteller/components/src/api/voice_designer/voice_dataset_samples/ListSamplesForDataset"; @@ -10,72 +10,94 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faWaveform } from "@fortawesome/pro-solid-svg-icons"; interface Props { - audioProps: any, - datasetToken?: string, - deleting: any, - deletingSet: any, - inProgress: any, - inProgressSet: any - samples: any, - samplesSet: any + audioProps: any; + datasetToken?: string; + deleting: any; + deletingSet: any; + inProgress: any; + inProgressSet: any; + samples: any; + samplesSet: any; } -function UploadSamples({ audioProps, datasetToken, deleting, deletingSet, inProgress, inProgressSet, samples, samplesSet }: Props) { - const [listFetched,listFetchedSet] = useState(false); +function UploadSamples({ + audioProps, + datasetToken, + deleting, + deletingSet, + inProgress, + inProgressSet, + samples, + samplesSet, +}: Props) { + const [listFetched, listFetchedSet] = useState(false); - const SampleBadge = () => ; + const SampleBadge = () => ( + + ); - const sampleClick = () => ({ target }: { target: any }) => { - let sampleToken = samples[target.name.split(",")[0].split(":")[1]].sample_token; - deletingSet([ ...deleting, sampleToken ]); // add to deleting list - DeleteSample(sampleToken,{ as_mod: false, set_delete: true }) - .then((res) => { - listFetchedSet(false); - deletingSet(deleting.filter((item: any) => item === sampleToken)); // remove from deleting list - }); - }; + const sampleClick = + () => + ({ target }: { target: any }) => { + let sampleToken = + samples[target.name.split(",")[0].split(":")[1]].sample_token; + deletingSet([...deleting, sampleToken]); // add to deleting list + DeleteSample(sampleToken, { as_mod: false, set_delete: true }).then( + res => { + listFetchedSet(false); + deletingSet(deleting.filter((item: any) => item === sampleToken)); // remove from deleting list + } + ); + }; - const actionSamples = [ // these spread operators combine the inProgress and sample arrays + const actionSamples = [ + // these spread operators combine the inProgress and sample arrays ...inProgress, ...samples.map((sample: any, i: number) => { - let date = new Date(sample.created_at); - return { - ...sample, - badge: SampleBadge, - buttons: [ - { - label: "Delete", - small: true, - variant: "secondary", - onClick: sampleClick() - }, - ], - name: `Sample from ${ date ? moment(date).format("MMMM Do YYYY, h:mm a") : "" }`, - }; - }) + let date = new Date(sample.created_at); + return { + ...sample, + badge: SampleBadge, + buttons: [ + { + label: "Delete", + small: true, + variant: "secondary", + onClick: sampleClick(), + }, + ], + name: `Sample from ${ + date ? moment(date).format("MMMM Do YYYY, h:mm a") : "" + }`, + }; + }), ]; useEffect(() => { if (audioProps.file && datasetToken) { let uuid_idempotency_token = uuidv4(); audioProps.clear(); - inProgressSet([ // add sample to in progress list + inProgressSet([ + // add sample to in progress list { - // badge: Component // this can be a loading indicator + // badge: Component // this can be a loading indicator name: "Uploading", - uuid_idempotency_token + uuid_idempotency_token, }, - ...inProgress + ...inProgress, ]); - UploadSample("",{ + UploadSample("", { dataset_token: datasetToken || "", file: audioProps.file, uuid_idempotency_token, - }) - .then((res) => { + }).then(res => { if (res.success) { - inProgressSet(inProgress.filter((item: any) => // removes sample from in progress list - item.uuid_idempotency_token === uuid_idempotency_token) + inProgressSet( + inProgress.filter( + ( + item: any // removes sample from in progress list + ) => item.uuid_idempotency_token === uuid_idempotency_token + ) ); listFetchedSet(false); // refetches sample list } @@ -84,30 +106,40 @@ function UploadSamples({ audioProps, datasetToken, deleting, deletingSet, inProg if (datasetToken && !listFetched) { listFetchedSet(true); - ListSamplesForDataset(datasetToken,{}) - .then((res) => { + ListSamplesForDataset(datasetToken, {}).then(res => { if (res.success && res.samples) { samplesSet(res.samples); } }); } + }, [ + audioProps, + datasetToken, + listFetched, + inProgress, + inProgressSet, + samplesSet, + ]); - },[audioProps, datasetToken, listFetched, inProgress, inProgressSet, samplesSet]); - - return
- -
- - { actionSamples.length ? : -
-
- -
No voice samples yet
-

Uploaded samples will appear here.

+ return ( +
+ +
+ + {actionSamples.length ? ( + + ) : ( +
+
+ +
No voice samples yet
+

Uploaded samples will appear here.

+
-
} + )} +
-
; + ); } export { UploadSamples }; diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/VoiceDetails.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/VoiceDetails.tsx index 17a10faf3a..1848d35445 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/VoiceDetails.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/VoiceDetails.tsx @@ -24,11 +24,13 @@ function VoiceDetails({ datasetInputs }: { datasetInputs: any }) { const classNames = SearchFieldClass; return ( -
- { datasetInputs.map(({ type = "", options = [], ...props }, key: number) => { - if (type === "text") return ; - else return ; + else return