Removed recorded voiceover from exploration

oppia · Nik-09 · Apr 19, 2024 · Apr 22, 2024 · Jun 8, 2024 · Jun 9, 2024
commit 17f95f4a3110e374df2bf1bd4f04df2c364637cb
@@ -200,17 +200,9 @@ export class Exploration extends BaseTranslatableObject {
     return this.getState(stateName).content.html;
   }
 
-  getAllVoiceovers(languageCode: string): VoiceoverObjectsDict {
-    return this.states.getAllVoiceovers(languageCode);
-  }
-
   getLanguageCode(): string {
     return this.languageCode;
   }
-
-  getAllVoiceoverLanguageCodes(): string[] {
-    return this.states.getAllVoiceoverLanguageCodes();
-  }
 }
 
 @Injectable({

@@ -155,35 +155,6 @@ export class States {
     }
     return finalStateNames;
   }
-
-  getAllVoiceoverLanguageCodes(): string[] {
-    const allLanguageCodes = new Set<string>();
-    Object.values(this._states).forEach(state => {
-      state.recordedVoiceovers.getAllContentIds().forEach(contentId => {
-        const contentLanguageCodes =
-          state.recordedVoiceovers.getLanguageCodes(contentId);
-        contentLanguageCodes.forEach(allLanguageCodes.add, allLanguageCodes);
-      });
-    });
-    return [...allLanguageCodes];
-  }
-
-  getAllVoiceovers(languageCode: string): VoiceoverObjectsDict {
-    let allAudioTranslations: VoiceoverObjectsDict = {};
-    for (let stateName in this._states) {
-      let state = this._states[stateName];
-      allAudioTranslations[stateName] = [];
-      let contentIdsList = state.recordedVoiceovers.getAllContentIds();
-      contentIdsList.forEach(contentId => {
-        let audioTranslations =
-          state.recordedVoiceovers.getBindableVoiceovers(contentId);
-        if (audioTranslations.hasOwnProperty(languageCode)) {
-          allAudioTranslations[stateName].push(audioTranslations[languageCode]);
-        }
-      });
-    }
-    return allAudioTranslations;
-  }
 }
 
 @Injectable({

@@ -121,12 +121,6 @@ export class QuestionUpdateService {
       newContentIds,
       oldContentIds
     );
-    contentIdsToDelete.forEach(contentId => {
-      newState.recordedVoiceovers.deleteContentId(contentId);
-    });
-    contentIdsToAdd.forEach(contentId => {
-      newState.recordedVoiceovers.addContentId(contentId);
-    });
   }
 
   setQuestionLanguageCode(question: Question, newLanguageCode: string): void {

@@ -48,7 +48,6 @@ export interface StateBackendDict {
   content: SubtitledHtmlBackendDict;
   interaction: InteractionBackendDict;
   param_changes: readonly ParamChangeBackendDict[];
-  recorded_voiceovers: RecordedVoiceOverBackendDict;
   solicit_answer_details: boolean;
   card_is_checkpoint: boolean;
   // This property is null if no skill is linked to the State.
@@ -63,7 +62,6 @@ export class State extends BaseTranslatableObject {
   content: SubtitledHtml;
   interaction: Interaction;
   paramChanges: ParamChange[];
-  recordedVoiceovers: RecordedVoiceovers;
   solicitAnswerDetails: boolean;
   cardIsCheckpoint: boolean;
 
@@ -74,7 +72,6 @@ export class State extends BaseTranslatableObject {
     content: SubtitledHtml,
     interaction: Interaction,
     paramChanges: ParamChange[],
-    recordedVoiceovers: RecordedVoiceovers,
     solicitAnswerDetails: boolean,
     cardIsCheckpoint: boolean
   ) {
@@ -85,7 +82,6 @@ export class State extends BaseTranslatableObject {
     this.content = content;
     this.interaction = interaction;
     this.paramChanges = paramChanges;
-    this.recordedVoiceovers = recordedVoiceovers;
     this.solicitAnswerDetails = solicitAnswerDetails;
     this.cardIsCheckpoint = cardIsCheckpoint;
   }
@@ -111,7 +107,6 @@ export class State extends BaseTranslatableObject {
       param_changes: this.paramChanges.map(paramChange => {
         return paramChange.toBackendDict();
       }),
-      recorded_voiceovers: this.recordedVoiceovers.toBackendDict(),
       solicit_answer_details: this.solicitAnswerDetails,
       card_is_checkpoint: this.cardIsCheckpoint,
     };
@@ -123,7 +118,6 @@ export class State extends BaseTranslatableObject {
     this.content = otherState.content;
     this.interaction.copy(otherState.interaction);
     this.paramChanges = otherState.paramChanges;
-    this.recordedVoiceovers = otherState.recordedVoiceovers;
     this.solicitAnswerDetails = otherState.solicitAnswerDetails;
     this.cardIsCheckpoint = otherState.cardIsCheckpoint;
   }
@@ -158,7 +152,6 @@ export class StateObjectFactory {
       content: newStateTemplate.content,
       interaction: newStateTemplate.interaction,
       param_changes: newStateTemplate.param_changes,
-      recorded_voiceovers: newStateTemplate.recorded_voiceovers,
       solicit_answer_details: newStateTemplate.solicit_answer_details,
       card_is_checkpoint: newStateTemplate.card_is_checkpoint,
     });
@@ -171,8 +164,6 @@ export class StateObjectFactory {
     if (defaultOutcome !== null && newStateName !== null) {
       defaultOutcome.dest = newStateName as string;
     }
-    newState.recordedVoiceovers.addContentId(contentIdForContent);
-    newState.recordedVoiceovers.addContentId(contentIdForDefaultOutcome);
 
     return newState;
   }
@@ -189,7 +180,6 @@ export class StateObjectFactory {
       SubtitledHtml.createFromBackendDict(stateDict.content),
       this.interactionObject.createFromBackendDict(stateDict.interaction),
       this.paramchangesObject.createFromBackendList(stateDict.param_changes),
-      RecordedVoiceovers.createFromBackendDict(stateDict.recorded_voiceovers),
       stateDict.solicit_answer_details,
       stateDict.card_is_checkpoint
     );

@@ -52,7 +52,6 @@ export class StateCard {
   _interactionHtml: string;
   _interaction: Interaction;
   _inputResponsePairs: InputResponsePair[];
-  _recordedVoiceovers: RecordedVoiceovers;
   _contentId: string;
   _completed: boolean;
   audioTranslationLanguageService: AudioTranslationLanguageService;
@@ -62,7 +61,6 @@ export class StateCard {
     interactionHtml: string,
     interaction: Interaction,
     inputResponsePairs: InputResponsePair[],
-    recordedVoiceovers: RecordedVoiceovers,
     contentId: string,
     audioTranslationLanguageService: AudioTranslationLanguageService
   ) {
@@ -71,7 +69,6 @@ export class StateCard {
     this._interactionHtml = interactionHtml;
     this._inputResponsePairs = inputResponsePairs;
     this._interaction = interaction;
-    this._recordedVoiceovers = recordedVoiceovers;
     this._contentId = contentId;
     this._completed = false;
     this.audioTranslationLanguageService = audioTranslationLanguageService;
@@ -111,26 +108,6 @@ export class StateCard {
     return this._interaction;
   }
 
-  getVoiceovers(): BindableVoiceovers {
-    let recordedVoiceovers = this._recordedVoiceovers;
-    let contentId = this._contentId;
-    if (recordedVoiceovers) {
-      return recordedVoiceovers.getBindableVoiceovers(contentId);
-    }
-    return {};
-  }
-
-  getRecordedVoiceovers(): RecordedVoiceovers {
-    return this._recordedVoiceovers;
-  }
-
-  isContentAudioTranslationAvailable(): boolean {
-    return (
-      Object.keys(this.getVoiceovers()).length > 0 ||
-      this.audioTranslationLanguageService.isAutogeneratedAudioAllowed()
-    );
-  }
-
   getInteractionId(): string | null {
     if (this.getInteraction()) {
       return this.getInteraction().id;
@@ -342,7 +319,6 @@ export class StateCard {
     contentHtml: string,
     interactionHtml: string,
     interaction: Interaction,
-    recordedVoiceovers: RecordedVoiceovers,
     contentId: string,
     audioTranslationLanguageService: AudioTranslationLanguageService
   ): StateCard {
@@ -352,7 +328,6 @@ export class StateCard {
       interactionHtml,
       cloneDeep(interaction),
       [],
-      recordedVoiceovers,
       contentId,
       audioTranslationLanguageService
     );

@@ -294,22 +294,22 @@ export class ExplorationStatesService {
     this.changeListService.markTranslationsAsNeedingUpdate(contentId);
     let stateName = this.stateEditorService.getActiveStateName();
     let state = this.getState(stateName);
-    let recordedVoiceovers = state.recordedVoiceovers;
-    if (recordedVoiceovers.hasUnflaggedVoiceovers(contentId)) {
-      recordedVoiceovers.markAllVoiceoversAsNeedingUpdate(contentId);
-      this.saveRecordedVoiceovers(stateName, recordedVoiceovers);
-    }
+    // let recordedVoiceovers = state.recordedVoiceovers;
+    // if (recordedVoiceovers.hasUnflaggedVoiceovers(contentId)) {
+    //   recordedVoiceovers.markAllVoiceoversAsNeedingUpdate(contentId);
+    //   this.saveRecordedVoiceovers(stateName, recordedVoiceovers);
+    // }
   }
 
   removeTranslationAndVoiceover(contentId: string): void {
     this.changeListService.removeTranslations(contentId);
     let stateName = this.stateEditorService.getActiveStateName();
     let state = this.getState(stateName);
-    let recordedVoiceovers = state.recordedVoiceovers;
-    if (recordedVoiceovers.hasVoiceovers(contentId)) {
-      recordedVoiceovers.voiceoversMapping[contentId] = {};
-      this.saveRecordedVoiceovers(stateName, recordedVoiceovers);
-    }
+    // let recordedVoiceovers = state.recordedVoiceovers;
+    // if (recordedVoiceovers.hasVoiceovers(contentId)) {
+    //   recordedVoiceovers.voiceoversMapping[contentId] = {};
+    //   this.saveRecordedVoiceovers(stateName, recordedVoiceovers);
+    // }
     this.entityTranslationsService.removeAllTranslationsForContent(contentId);
   }
 
@@ -517,12 +517,6 @@ export class ExplorationStatesService {
           newContentIds,
           oldContentIds
         );
-        contentIdsToDelete.forEach(contentId => {
-          newStateData.recordedVoiceovers.deleteContentId(contentId);
-        });
-        contentIdsToAdd.forEach(contentId => {
-          newStateData.recordedVoiceovers.addContentId(contentId);
-        });
       }
       let propertyRef = newStateData;
       for (let i = 0; i < accessorList.length - 1; i++) {
@@ -589,6 +583,10 @@ export class ExplorationStatesService {
     return cloneDeep(this._states);
   }
 
+  getAllContentIdsByStateName(stateName: string) {
+    return this._states.getState(stateName).getAllContentIds();
+  }
+
   getStateNames(): string[] {
     return this._states.getStateNames();
   }

@@ -188,10 +188,13 @@ export class TranslationStatusService implements OnInit {
         let stateNeedsUpdate = false;
         let noTranslationCount = 0;
         let noVoiceoverCount = 0;
-        let recordedVoiceovers =
-          this.explorationStatesService.getRecordedVoiceoversMemento(stateName);
+        // let recordedVoiceovers =
+        //   this.explorationStatesService.getRecordedVoiceoversMemento(stateName);
+        // let allContentIds = recordedVoiceovers.getAllContentIds();
+
+        let allContentIds =
+          this.explorationStatesService.getAllContentIdsByStateName(stateName);
 
-        let allContentIds = recordedVoiceovers.getAllContentIds();
         let interactionId =
           this.explorationStatesService.getInteractionIdMemento(stateName);
         // This is used to prevent users from adding unwanted hints audio, as
@@ -366,8 +369,11 @@ export class TranslationStatusService implements OnInit {
   }
 
   _getAvailableContentIds(): string[] {
-    let recordedVoiceovers = this.stateRecordedVoiceoversService.displayed;
-    return recordedVoiceovers.getAllContentIds();
+    let stateName = this.stateEditorService.getActiveStateName();
+
+    return this.explorationStatesService.getAllContentIdsByStateName(stateName);
+    // let recordedVoiceovers = this.stateRecordedVoiceoversService.displayed;
+    // return recordedVoiceovers.getAllContentIds();
   }
 
   _getActiveStateComponentNeedsUpdateStatus(componentName: string): boolean {

@@ -21,13 +21,17 @@ import {EventEmitter} from '@angular/core';
 import {Injectable} from '@angular/core';
 
 import {StateRecordedVoiceoversService} from 'components/state-editor/state-editor-properties-services/state-recorded-voiceovers.service';
+import {ExplorationStatesService} from 'pages/exploration-editor-page/services/exploration-states.service';
+import {StateEditorService} from 'components/state-editor/state-editor-properties-services/state-editor.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class TranslationTabActiveContentIdService {
   constructor(
-    private _stateRecordedVoiceoversService: StateRecordedVoiceoversService
+    private _stateRecordedVoiceoversService: StateRecordedVoiceoversService,
+    private _explorationStatesService: ExplorationStatesService,
+    private _stateEditorService: StateEditorService
   ) {}
 
   // 'activeContentId' and 'activeDataFormat' will be 'null' if active content
@@ -45,15 +49,17 @@ export class TranslationTabActiveContentIdService {
   }
 
   setActiveContent(contentId: string, dataFormat: string): void {
-    const displayStateRecordedVoiceovers =
-      this._stateRecordedVoiceoversService.displayed;
-    let allContentIds = displayStateRecordedVoiceovers.getAllContentIds();
+    let stateName = this._stateEditorService.getActiveStateName();
+    let allContentIds =
+      this._explorationStatesService.getAllContentIdsByStateName(stateName);
+
     if (allContentIds.indexOf(contentId) === -1) {
       throw new Error('Invalid active content id: ' + contentId);
     }
     this.activeContentId = contentId;
     this.activeDataFormat = dataFormat;
     this._activeContentIdChangedEventEmitter.emit(dataFormat);
+    console.log('Done');
   }
 
   get onActiveContentIdChanged(): EventEmitter<string> {