diff --git a/vocodes/src/App.tsx b/vocodes/src/App.tsx index 88bc52d81a..5709137f23 100644 --- a/vocodes/src/App.tsx +++ b/vocodes/src/App.tsx @@ -104,10 +104,6 @@ class App extends React.Component { } logoutSession = () => { - if (!this.state.enableAlpha) { - return; - } - const api = new ApiConfig(); const endpointUrl = api.logout(); @@ -125,9 +121,6 @@ class App extends React.Component { } enqueueTtsJob = (jobToken: string) => { - if (!this.state.enableAlpha) { - return; - } const newJob = new TtsInferenceJob(jobToken); let inferenceJobs = this.state.ttsInferenceJobs.concat([newJob]); @@ -137,10 +130,6 @@ class App extends React.Component { } checkTtsJob = (jobToken: string) => { - if (!this.state.enableAlpha) { - return; - } - const api = new ApiConfig(); const endpointUrl = api.getTtsInferenceJobState(jobToken); @@ -160,10 +149,11 @@ class App extends React.Component { } let updatedJobs : Array = []; - this.state.ttsInferenceJobs.forEach(job => { - if (job.jobToken !== jobResponse.state!.job_token || - jobResponse.state!.maybe_result_token === undefined) { // NB: Already done querying, no need to update again. - updatedJobs.push(job); + + this.state.ttsInferenceJobs.forEach(existingJob => { + if (existingJob.jobToken !== jobResponse.state!.job_token || + !jobResponse.state!.maybe_result_token) { // NB: Don't replace until we're done. + updatedJobs.push(existingJob); return; } @@ -179,9 +169,6 @@ class App extends React.Component { } enqueueTtsModelUploadJob = (jobToken: string) => { - if (!this.state.enableAlpha) { - return; - } const newJob = new TtsModelUploadJob(jobToken); let modelUploadJobs = this.state.ttsModelUploadJobs.concat([newJob]); @@ -191,10 +178,6 @@ class App extends React.Component { } checkTtsModelUploadJob = (jobToken: string) => { - if (!this.state.enableAlpha) { - return; - } - const api = new ApiConfig(); const endpointUrl = api.getTtsModelUploadJobState(jobToken); @@ -234,9 +217,6 @@ class App extends React.Component { enqueueW2lJob = (jobToken: string) => { - if (!this.state.enableAlpha) { - return; - } const newJob = new W2lInferenceJob(jobToken); let inferenceJobs = this.state.w2lInferenceJobs.concat([newJob]); @@ -246,10 +226,6 @@ class App extends React.Component { } checkW2lJob = (jobToken: string) => { - if (!this.state.enableAlpha) { - return; - } - const api = new ApiConfig(); const endpointUrl = api.getW2lInferenceJobState(jobToken); @@ -288,9 +264,6 @@ class App extends React.Component { } enqueueW2lTemplateUploadJob = (jobToken: string) => { - if (!this.state.enableAlpha) { - return; - } const newJob = new W2lTemplateUploadJob(jobToken); let inferenceJobs = this.state.w2lTemplateUploadJobs.concat([newJob]); @@ -300,10 +273,6 @@ class App extends React.Component { } checkW2lTemplateUploadJob = (jobToken: string) => { - if (!this.state.enableAlpha) { - return; - } - const api = new ApiConfig(); const endpointUrl = api.getW2lTemplateUploadJobState(jobToken); diff --git a/vocodes/src/jobs/TtsInferenceJobs.ts b/vocodes/src/jobs/TtsInferenceJobs.ts index 6ef8a72b43..386c81de3d 100644 --- a/vocodes/src/jobs/TtsInferenceJobs.ts +++ b/vocodes/src/jobs/TtsInferenceJobs.ts @@ -5,16 +5,16 @@ export class TtsInferenceJob { modelToken?: string; status: string; title?: string; - maybeResultToken?: string; - maybePublicBucketWavAudioPath?: string; + maybeResultToken: string | undefined | null; + maybePublicBucketWavAudioPath: string | undefined | null; constructor( jobToken: string, status: string = 'unknown', modelToken: string | undefined = undefined, title: string | undefined = undefined, - maybeResulToken: string | undefined = undefined, - maybePublicBucketWavAudioPath: string | undefined = undefined, + maybeResulToken: string | undefined | null = null, + maybePublicBucketWavAudioPath: string | undefined | null = null, ) { this.status = status; this.jobToken = jobToken; @@ -44,8 +44,8 @@ export interface TtsInferenceJobStateResponsePayload { export interface TtsInferenceJobState { job_token: string, status: string, - maybe_result_token?: string, - maybe_public_bucket_wav_audio_path?: string, + maybe_result_token: string | null, + maybe_public_bucket_wav_audio_path: string | null, model_token: string, tts_model_type: string, title: string, diff --git a/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx b/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx index c9c68bb193..85945fce5e 100644 --- a/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx +++ b/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx @@ -12,7 +12,7 @@ function SessionTtsInferenceResultListFc(props: Props) { props.ttsInferenceJobs.forEach(job => { - if (job.maybeResultToken === undefined || job.maybeResultToken === null) { + if (!job.maybeResultToken) { results.push(
Pending…
);