chore: LSDV-4727: Remove any AudioPlus mentions (#1296)

bmartel · web-flow · commit 4100d96da1c3 · 2023-04-18T15:29:48.000-05:00
* chore: LSDV-4727: Remove any AudioPlus mentions

* last remnants of AudioPlus
diff --git a/e2e/examples/audio-paragraphs.js b/e2e/examples/audio-paragraphs.js
@@ -1,6 +1,6 @@
 const config = `
 <View>
-  <AudioPlus name="audio" value="$url" hotkey="space" sync="text" />
+  <Audio name="audio" value="$url" hotkey="space" sync="text" />
   <Header value="Sentiment"/>
   <ParagraphLabels name="label" toName="text">
     <Label value="General: Positive" background="#00ff00"/>
diff --git a/e2e/examples/audio-regions.js b/e2e/examples/audio-regions.js
@@ -14,7 +14,7 @@ const config = `
     <Choice value="Pop" />
   </Choices>
   <Header value="Listen the audio:"></Header>
-  <AudioPlus name="audio" value="$url"></AudioPlus>
+  <Audio name="audio" value="$url"></Audio>
 </View>
 `;
 
diff --git a/e2e/tests/audio/audio-controls.test.js b/e2e/tests/audio/audio-controls.test.js
@@ -16,7 +16,7 @@ const config = `
     <Choice value="Pop" />
   </Choices>
   <Header value="Listen the audio:"></Header>
-  <AudioPlus name="audio" value="$url"></AudioPlus>
+  <Audio name="audio" value="$url"></Audio>
 </View>
 `;
 
diff --git a/e2e/tests/audio/audio-errors.test.js b/e2e/tests/audio/audio-errors.test.js
@@ -8,7 +8,7 @@ const config = `
     <Label value="Other"></Label>
   </Labels>
   <Header value="Listen the audio:"></Header>
-  <AudioPlus name="audio" value="$url"></AudioPlus>
+  <Audio name="audio" value="$url"></Audio>
 </View>
 `;
 
diff --git a/e2e/tests/audio/audio-regions.test.js b/e2e/tests/audio/audio-regions.test.js
@@ -16,13 +16,13 @@ const config = `
     <Choice value="Pop" />
   </Choices>
   <Header value="Listen the audio:"></Header>
-  <AudioPlus name="audio" value="$url"></AudioPlus>
+  <Audio name="audio" value="$url"></Audio>
 </View>
 `;
 
 const configSpeech = `
 <View>
-    <AudioPlus name="audio" value="$url"></AudioPlus>
+    <Audio name="audio" value="$url"></Audio>
     <Labels name="label" toName="audio">
       <Label value="Speech"/>
       <Label value="Noise" background="grey"/>
diff --git a/e2e/tests/audio/audio-webaudio-decoder.test.js b/e2e/tests/audio/audio-webaudio-decoder.test.js
@@ -16,13 +16,13 @@ const config = `
     <Choice value="Pop" />
   </Choices>
   <Header value="Listen the audio:"></Header>
-  <AudioPlus name="audio" value="$url"></AudioPlus>
+  <Audio name="audio" value="$url"></Audio>
 </View>
 `;
 
 const configSpeech = `
 <View>
-    <AudioPlus name="audio" value="$url" decoder="webaudio"></AudioPlus>
+    <Audio name="audio" value="$url" decoder="webaudio"></Audio>
     <Labels name="label" toName="audio">
       <Label value="Speech"/>
       <Label value="Noise" background="grey"/>
diff --git a/e2e/tests/empty-labels.test.js b/e2e/tests/empty-labels.test.js
@@ -40,7 +40,7 @@ examples.forEach(example => {
     if (Utils.xmlTreeHasTag(configTree, 'Image')) {
       AtImageView.waitForImage();
     }
-    if (Utils.xmlFindBy(configTree, node => node['#name'] === 'AudioPlus' || node['#name'] === 'Audio')) {
+    if (Utils.xmlFindBy(configTree, node => node['#name'] === 'Audio')) {
       await AtAudioView.waitForAudio();
     }
 
@@ -80,7 +80,7 @@ examples.forEach(example => {
     if (Utils.xmlTreeHasTag(configTree, 'Image')) {
       AtImageView.waitForImage();
     }
-    if (Utils.xmlFindBy(configTree, node => node['#name'] === 'AudioPlus' || node['#name'] === 'Audio')) {
+    if (Utils.xmlFindBy(configTree, node => node['#name'] === 'Audio')) {
       await AtAudioView.waitForAudio();
     }
 
diff --git a/e2e/tests/maxUsage.test.js b/e2e/tests/maxUsage.test.js
@@ -211,7 +211,7 @@ Data(maxUsageDataTable).Scenario('Max usages of labels in Audio on region creati
     <Label value="Label_0" />
     <Label value="Label_1" hotkey="1"/>
   </Labels>
-  <AudioPlus name="audio" value="$audio" />
+  <Audio name="audio" value="$audio" />
 </View>`,
     data: {
       audio: 'https://htx-misc.s3.amazonaws.com/opensource/label-studio/examples/audio/barradeen-emotional.mp3',
diff --git a/e2e/tests/shortcuts.test.js b/e2e/tests/shortcuts.test.js
@@ -8,7 +8,7 @@ const createConfig = ({ rows = '1' }) => {
     <Shortcut alias="[!]" value="!" hotkey="3" />
     <Shortcut alias="[make a ninja]" value="‍👤" hotkey="4" />
   </TextArea>
-  <AudioPlus name="audio" value="$audio"/>
+  <Audio name="audio" value="$audio"/>
   <Labels name="labels" toName="audio" allowempty="true">
     <Label value="Label1"/>
     <Label value="Label2"/>
diff --git a/e2e/tests/smoke.test.js b/e2e/tests/smoke.test.js
@@ -63,7 +63,7 @@ examples.slice(1).forEach(example =>
       AtImageView.waitForImage();
     }
 
-    if (Utils.xmlFindBy(configTree, node => node['#name'] === 'AudioPlus' || node['#name'] === 'Audio')) {
+    if (Utils.xmlFindBy(configTree, node => node['#name'] === 'Audio')) {
       await AtAudioView.waitForAudio();
     }
 
diff --git a/e2e/tests/sync/audio-paragraphs.test.js b/e2e/tests/sync/audio-paragraphs.test.js
@@ -4,7 +4,7 @@ Feature('Sync: Audio Paragraphs');
 
 const config = `
 <View>
-  <AudioPlus name="audio" value="$url" hotkey="space" sync="text" />
+  <Audio name="audio" value="$url" hotkey="space" sync="text" />
   <Header value="Sentiment"/>
   <ParagraphLabels name="label" toName="text">
     <Label value="General: Positive" background="#00ff00"/>
@@ -107,9 +107,9 @@ Scenario('Check audio clip is played when using the new sync option', async func
 
   AtSidebar.seeRegions(2);
 
-  const [{ currentTime: startingAudioPlusTime }, { currentTime: startingParagraphAudioTime }] = await AtAudioView.getCurrentAudio();
+  const [{ currentTime: startingAudioTime }, { currentTime: startingParagraphAudioTime }] = await AtAudioView.getCurrentAudio();
 
-  assert.equal(startingAudioPlusTime, startingParagraphAudioTime);
+  assert.equal(startingAudioTime, startingParagraphAudioTime);
   assert.equal(startingParagraphAudioTime, 0);
 
   I.click('[aria-label="play-circle"]');
@@ -118,9 +118,9 @@ Scenario('Check audio clip is played when using the new sync option', async func
   I.click('[aria-label="pause-circle"]');
   I.wait(1);
 
-  const [{ currentTime: seekAudioPlusTime }, { currentTime: seekParagraphAudioTime }] = await AtAudioView.getCurrentAudio();
+  const [{ currentTime: seekAudioTime }, { currentTime: seekParagraphAudioTime }] = await AtAudioView.getCurrentAudio();
 
-  assert.notEqual(seekAudioPlusTime, 0);
-  I.assertTimesInSync(seekAudioPlusTime, seekParagraphAudioTime, `Expected seek time to be ${seekAudioPlusTime} but was ${seekParagraphAudioTime}`);
+  assert.notEqual(seekAudioTime, 0);
+  I.assertTimesInSync(seekAudioTime, seekParagraphAudioTime, `Expected seek time to be ${seekAudioTime} but was ${seekParagraphAudioTime}`);
 });
 
diff --git a/e2e/tests/sync/multiple-audio.test.js b/e2e/tests/sync/multiple-audio.test.js
@@ -6,8 +6,8 @@ Feature('Sync: Multiple Audio');
 
 const config = `
 <View>
-  <AudioPlus name="audio" value="$url" hotkey="space" sync="v1" />
-  <AudioPlus name="audio2" value="$url" hotkey="space" sync="v1" />
+  <Audio name="audio" value="$url" hotkey="space" sync="v1" />
+  <Audio name="audio2" value="$url" hotkey="space" sync="v1" />
 </View>
 `;
 
diff --git a/examples/audio_regions/config.xml b/examples/audio_regions/config.xml
@@ -13,7 +13,7 @@
     <Choice value="Pop" />
   </Choices>
   <Header value="Listen the audio:"></Header>
-  <AudioPlus name="audio" value="$url" cursorcolor="#FF0000" cursorwidth="4"/>
+  <Audio name="audio" value="$url" cursorcolor="#FF0000" cursorwidth="4"/>
   <Header>How many instruments in this audio?</Header>
   <Number name="overall" toName="audio" defaultValue="2" />
   <View visibleWhen="region-selected">
diff --git a/examples/video_audio/config.xml b/examples/video_audio/config.xml
@@ -7,5 +7,5 @@
     <Label value="Trick" background="#358EF3"/>
   </Labels>
 
-  <AudioPlus name="audio" value="$video" sync="video" zoom="true" speed="true" volume="true"/>
+  <Audio name="audio" value="$video" sync="video" zoom="true" speed="true" volume="true"/>
 </View>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ examples.forEach(example => {`
`40`	`40`	`if (Utils.xmlTreeHasTag(configTree, 'Image')) {`
`41`	`41`	`AtImageView.waitForImage();`
`42`	`42`	`}`
`43`		`- if (Utils.xmlFindBy(configTree, node => node['#name'] === 'AudioPlus' \|\| node['#name'] === 'Audio')) {`
	`43`	`+ if (Utils.xmlFindBy(configTree, node => node['#name'] === 'Audio')) {`
`44`	`44`	`await AtAudioView.waitForAudio();`
`45`	`45`	`}`
`46`	`46`
`@@ -80,7 +80,7 @@ examples.forEach(example => {`
`80`	`80`	`if (Utils.xmlTreeHasTag(configTree, 'Image')) {`
`81`	`81`	`AtImageView.waitForImage();`
`82`	`82`	`}`
`83`		`- if (Utils.xmlFindBy(configTree, node => node['#name'] === 'AudioPlus' \|\| node['#name'] === 'Audio')) {`
	`83`	`+ if (Utils.xmlFindBy(configTree, node => node['#name'] === 'Audio')) {`
`84`	`84`	`await AtAudioView.waitForAudio();`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ examples.slice(1).forEach(example =>`
`63`	`63`	`AtImageView.waitForImage();`
`64`	`64`	`}`
`65`	`65`
`66`		`- if (Utils.xmlFindBy(configTree, node => node['#name'] === 'AudioPlus' \|\| node['#name'] === 'Audio')) {`
	`66`	`+ if (Utils.xmlFindBy(configTree, node => node['#name'] === 'Audio')) {`
`67`	`67`	`await AtAudioView.waitForAudio();`
`68`	`68`	`}`
`69`	`69`