Skip to content

Commit 0d76e7a

Browse files
committed
Revert "Feature-9082: Enhance language dropdown button (#9131)"
This reverts commit a341a19.
1 parent 940cb42 commit 0d76e7a

File tree

3 files changed

+7
-22
lines changed

3 files changed

+7
-22
lines changed

app/components/public/stream/side-panel.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<div class="chat-video-room">
6060
<div>
6161
<div class="ui inverted vertical fluid menu borderless stream-side-menu">
62-
{{#each this.streamList as |stream|}}
62+
{{#each this.streams as |stream|}}
6363
<a href={{href-to 'public.stream.view' @event stream.slugName stream.id }} class="{{if (eq @currentRoom.microlocationId stream.microlocationId) 'video-active'}} item stream-item d-flex items-center" {{on "click" (fn @setupRoomChat stream) }} >
6464
<span class="stream-preview-letter" style={{css background-color=(object-at (abs (mod stream.hash this.colors.length)) this.colors)}}>{{truncate (uppercase stream.name) 1 false}}</span>
6565
<span class="ml-2">{{stream.name}}</span>

app/components/public/stream/side-panel.ts

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ export default class PublicStreamSidePanel extends Component<Args> {
4646
@tracked showChat = false;
4747
@tracked showRoomChat = false;
4848
@tracked showVideoRoom = false;
49-
@tracked languageList: any = [];
5049

5150
@tracked translationChannels = [{
5251
id : '0',
@@ -148,22 +147,14 @@ export default class PublicStreamSidePanel extends Component<Args> {
148147
isGlobalEventRoom : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.attributes['is-global-event-room'])[0],
149148
chatRoomName : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.attributes['chat-room-name'])[0],
150149
microlocationId : rooms.data.filter((room: any) => room.relationships['video-stream'].data ? room.relationships['video-stream'].data.id === stream.id : null).map((room: any) => room.id)[0],
151-
hash : stringHashCode(stream.attributes.name + stream.id),
152-
translations : []
153-
})).forEach((stream: any) => {
150+
hash : stringHashCode(stream.attributes.name + stream.id)
151+
})).forEach(async(stream: any) => {
154152
this.addStream(stream)
155153
});
156-
const languageLists: any = [];
157-
Promise.all(this.streams.map(async(stream: any) => {
158-
const res = await this.fetchTranslationChannels(stream.id);
159-
const item = {
160-
streamId: stream.id
161-
}
162-
languageLists.push(item);
163-
stream.translations = res;
164-
})).then(() => {
165-
this.languageList = languageLists;
166-
})
154+
this.streams.forEach(async(stream: any) => {
155+
const res = await this.fetchTranslationChannels(stream.id)
156+
stream.translations = res
157+
});
167158
} catch (e) {
168159
console.error('Error while loading rooms in video stream', e);
169160
}
@@ -183,9 +174,4 @@ export default class PublicStreamSidePanel extends Component<Args> {
183174
this.loading = false;
184175
this.streams = [...this.streams];
185176
}
186-
187-
@computed('[email protected]')
188-
get streamList() {
189-
return this.streams;
190-
}
191177
}

app/models/video-stream.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ export default class VideoStream extends ModelBase.extend() {
3535
@attr() additionalInformation!: string;
3636
@attr() extra!: Extra;
3737
@attr() chatRoomName?: string;
38-
@attr() translations?: any[];
3938

4039
@hasMany('microlocation') rooms!: Microlocation[];
4140
@hasMany('video-recording') videoRecordings!: VideoRecording[];

0 commit comments

Comments
 (0)