Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps-dev): bump ember-cli-clipboard from 0.16.0 to 1.1.0 #9156

Open
wants to merge 8 commits into
base: development
Choose a base branch
from
2 changes: 1 addition & 1 deletion app/components/public/stream/side-panel.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<div class="chat-video-room">
<div>
<div class="ui inverted vertical fluid menu borderless stream-side-menu">
{{#each this.streams as |stream|}}
{{#each this.streamList as |stream|}}
<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) }} >
<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>
<span class="ml-2">{{stream.name}}</span>
Expand Down
26 changes: 20 additions & 6 deletions app/components/public/stream/side-panel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ export default class PublicStreamSidePanel extends Component<Args> {
@tracked showChat = false;
@tracked showRoomChat = false;
@tracked showVideoRoom = false;
@tracked languageList: any = [];

@tracked translationChannels = [{
id : '0',
Expand Down Expand Up @@ -147,14 +148,22 @@ export default class PublicStreamSidePanel extends Component<Args> {
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],
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],
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],
hash : stringHashCode(stream.attributes.name + stream.id)
})).forEach(async(stream: any) => {
hash : stringHashCode(stream.attributes.name + stream.id),
translations : []
})).forEach((stream: any) => {
this.addStream(stream)
});
this.streams.forEach(async(stream: any) => {
const res = await this.fetchTranslationChannels(stream.id)
stream.translations = res
});
const languageLists: any = [];
Promise.all(this.streams.map(async(stream: any) => {
const res = await this.fetchTranslationChannels(stream.id);
const item = {
streamId: stream.id
}
languageLists.push(item);
stream.translations = res;
})).then(() => {
this.languageList = languageLists;
})
} catch (e) {
console.error('Error while loading rooms in video stream', e);
}
Expand All @@ -174,4 +183,9 @@ export default class PublicStreamSidePanel extends Component<Args> {
this.loading = false;
this.streams = [...this.streams];
}

@computed('[email protected]')
get streamList() {
return this.streams;
}
}
15 changes: 6 additions & 9 deletions app/components/public/stream/video-stream.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,16 @@
<iframe style="position: absolute;width: 100%; height: 100%; border: 0px;" src="{{this.iframeUrl}}" title="{{this.iframeTitle}}" allow="camera; microphone; display-capture" allowfullscreen="true"/>
{{/if}}

{{#if this.selectingLanguage.selectingLanguage}}

<iframe style="position: absolute;width: 50%; height: 100%; z-index: -1" id="video-player-translation" width="50%" height="50%" frameborder="0" title="YouTube Live Stream Translation"
src="https://www.youtube.com/embed/{{this.selectingLanguage.translationYoutubeId}}?enablejsapi=1&autoplay=1&modestbranding=1&loop=1&controls=0&disablekb=1"
gesture="media" allow="autoplay; encrypted-media" allowfullscreen="true"></iframe>
{{/if}}

{{#if (eq @videoStream.videoChannel.provider 'jitsi')}}
<Public::Stream::JitsiStream @videoStream={{@videoStream}} />
{{/if}}
{{#if (eq this.provider 'youtube')}}
<iframe style="position: absolute;width: 100%; height: 100%;" id="video-player" width="50%" height="50%" frameborder="0" title="YouTube Live Stream"
src="https://www.youtube.com/embed/{{this.youtubeId}}?enablejsapi=1&playlist={{this.youtubeId}}&autoplay=1&modestbranding=1&loop={{if @videoStream.extra.loop 1 0}}&mute={{if (eq this.selectingLanguage.selectingLanguage null) 0 1}}&controls=0&disablekb=1"
<iframe
style="position: absolute; width: 100%; height: 100%;"
id="video-player"
frameborder="0"
title="YouTube Live Stream"
src="https://www.youtube.com/embed/{{this.youtubeId}}?enablejsapi=1&playlist={{this.youtubeId}}&autoplay=1&modestbranding=1&loop={{if @videoStream.extra.loop 1 0}}&controls=0&disablekb=1"
gesture="media" allow="autoplay; encrypted-media" allowfullscreen="true"></iframe>
{{/if}}
{{#if (and (eq @videoStream.videoChannel.provider 'vimeo') this.vimeoId)}}
Expand Down
5 changes: 3 additions & 2 deletions app/mixins/ember-table-route.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default Mixin.create({
refreshModel: true
}
},
per_page: 10,

applySearchFilters(options, params, searchFields) {
if (!Array.isArray(searchFields)) {
Expand Down Expand Up @@ -109,8 +110,8 @@ export default Mixin.create({
if (isNaN(params.search)) {
continue;
}
condition = 'eq';
value = params.search;
condition = params.search && Number(params.search) !== 0 ? 'eq' : 'is_';
value = params.search && Number(params.search) !== 0 ? params.search : null;
}
const filter = {
name : splitField[0],
Expand Down
1 change: 1 addition & 0 deletions app/models/video-stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export default class VideoStream extends ModelBase.extend() {
@attr() additionalInformation!: string;
@attr() extra!: Extra;
@attr() chatRoomName?: string;
@attr() translations?: any[];

@hasMany('microlocation') rooms!: Microlocation[];
@hasMany('video-recording') videoRecordings!: VideoRecording[];
Expand Down
2 changes: 1 addition & 1 deletion app/routes/events/view/tickets/attendees/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default class extends Route.extend(EmberTableRouteMixin) {
let queryString = {
include : 'user,order',
filter : filterOptions,
'page[size]' : params.per_page || 10,
'page[size]' : params.per_page,
'page[number]' : params.page || 1
};

Expand Down
4 changes: 2 additions & 2 deletions app/routes/public/cfs/edit-speaker.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default class EditSpeakerRoute extends Route {

async model(params) {
const eventDetails = this.modelFor('public');
const speaker = await this.store.findRecord('speaker', params.speaker_id, { include: 'sessions' })
const speaker = await this.store.findRecord('speaker', params.speaker_id, { include: 'sessions' });
return {
event : eventDetails,
forms : await eventDetails.query('customForms', {
Expand All @@ -24,4 +24,4 @@ export default class EditSpeakerRoute extends Route {
speaker
};
}
}
}
9 changes: 4 additions & 5 deletions app/routes/public/sessions.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import classic from 'ember-classic-decorator';
import Route from '@ember/routing/route';
import moment from 'moment-timezone';

let isDateFilterActive = Boolean(new URLSearchParams(location.search).get('date'));

@classic
export default class SessionsRoute extends Route {
queryParams = {
Expand Down Expand Up @@ -46,9 +44,10 @@ export default class SessionsRoute extends Route {
async beforeModel() {
const event = this.modelFor('public');
const dates = await this.loader.load('/events/' + event.id + '/sessions/dates');
if (moment().isSameOrAfter(event.startsAt) && moment().isSameOrBefore(event.endsAt) && dates.includes(moment().format('YYYY-MM-DD')) && !isDateFilterActive) {
isDateFilterActive = true;
this.transitionTo('public.sessions', event.get('identifier'), { queryParams: { date: moment().format('YYYY-MM-DD') } });
if (new URLSearchParams(location.search).size === 0) {
if (moment().isSameOrAfter(event.startsAt) && moment().isSameOrBefore(event.endsAt) && dates.includes(moment().format('YYYY-MM-DD'))) {
this.transitionTo('public.sessions', event.get('identifier'), { queryParams: { date: moment().format('YYYY-MM-DD') } });
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions app/styles/partials/utils.scss
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,10 @@
padding: 1rem !important;
}

.z-index-0 {
z-index: 0 !important;
}

.mt-0 {
margin-top: 0 !important;
}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/components/tables/default.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>
{{/unless}}
</div>
<div class="ui no bottom padding row">
<div class="ui no bottom padding row z-index-0">
<EmberTable @tableColor={{@color}} as |t|>
<t.head
@sortFunction={{null}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<span>
{{t 'Show'}}
<UiDropdown @class="inline" @onChange={{action (mut this.pageSize)}} @forceSelection={{true}}>
<div class="default text">{{this.pageSize}}</div>
<div class="default text">{{if (eq this.pageSize 0) 'All' this.pageSize}}</div>
<i class="dropdown icon"></i>
<div class="menu">
{{#each this.sizes as |size|}}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/events/view/tickets/access-codes.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<LinkTo @route="events.view.tickets.access-codes.list" @model="inactive" class="item">
{{t 'Inactive'}}
</LinkTo>
<LinkTo @route="events.view.tickets.discount-codes.list" @model="expired" class="item">
<LinkTo @route="events.view.tickets.access-codes.list" @model="expired" class="item">
{{t 'Expired'}}
</LinkTo>
</TabbedNavigation>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"ember-cli-autoprefixer": "2.0.0",
"ember-cli-babel": "^7.26.11",
"ember-cli-cjs-transform": "^2.0.0",
"ember-cli-clipboard": "^0.16.0",
"ember-cli-clipboard": "^1.1.0",
"ember-cli-code-coverage": "^2.0.0",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-deploy": "^1.0.0",
Expand Down
10 changes: 6 additions & 4 deletions translations/sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
# Kristoffer Grundström <[email protected]>, 2021, 2023.
# tygyh <[email protected]>, 2022, 2023.
# Hong Phuc Dang <[email protected]>, 2023.
# Mario Behling <[email protected]>, 2023.
msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2019-01-31 16:31+0800\n"
"PO-Revision-Date: 2023-07-04 04:51+0000\n"
"Last-Translator: Anonymous <[email protected]>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/open-event/frontend/sv/>\n"
"PO-Revision-Date: 2023-08-17 17:53+0000\n"
"Last-Translator: Mario Behling <[email protected]>\n"
"Language-Team: Swedish <https://hosted.weblate.org/projects/open-event/"
"frontend/sv/>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -8508,7 +8510,7 @@ msgstr "Utställningsglas"

#: app/templates/components/public/featured-speaker-list.hbs:1:18
msgid "Featured Speakers"
msgstr "Utvalda högtalare"
msgstr "Utvalda talare"

#: app/templates/components/public/featured-speaker-list.hbs:10:66
msgid "More Speakers"
Expand Down
Loading