Skip to content

fix: Check session and speaker available for side-menu #4848

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

Merged
merged 1 commit into from
Aug 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions app/components/public/side-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,47 @@ import classic from 'ember-classic-decorator';
import { action, computed } from '@ember/object';
import Component from '@ember/component';
import moment from 'moment';
import { SPEAKERS_FILTER } from 'open-event-frontend/routes/public/speakers';
import { tracked } from '@glimmer/tracking';

@classic
export default class SideMenu extends Component {
@tracked
showSpeakers = false;

@tracked
showSessions = false;

async didInsertElement() {
super.didInsertElement(...arguments);
const speakersCall = await this.event.speakersCall;
this.set('shouldShowCallforSpeakers',
speakersCall && speakersCall.announcement && (speakersCall.privacy === 'public'));

this.checkSpeakers();
this.checkSessions();
}

async checkSpeakers() {
this.showSpeakers = this.showSpeakers || (await this.loader.load(`/events/${this.event.id}/speakers?fields[speaker]=id&page[size]=1&filters=${JSON.stringify(SPEAKERS_FILTER)}`)).data.length;
}

async checkSessions() {
const filters = [{
or: [
{
name : 'state',
op : 'eq',
val : 'confirmed'
},
{
name : 'state',
op : 'eq',
val : 'accepted'
}
]
}];
this.showSessions = this.showSessions || (await this.loader.load(`/events/${this.event.id}/sessions?fields[session]=id&page[size]=1&filters=${JSON.stringify(filters)}`)).data.length;
}

@action
Expand Down
61 changes: 31 additions & 30 deletions app/routes/public/speakers.js
Original file line number Diff line number Diff line change
@@ -1,51 +1,52 @@
import classic from 'ember-classic-decorator';
import Route from '@ember/routing/route';

@classic
export default class SpeakersRoute extends Route {
async model() {
const eventDetails = this.modelFor('public');
const filterOptions = [
export const SPEAKERS_FILTER = [
{
and: [
{
and: [
name : 'sessions',
op : 'any',
val : {
name : 'deleted-at',
op : 'eq',
val : null
}
},
{
or: [
{
name : 'sessions',
op : 'any',
val : {
name : 'deleted-at',
name : 'state',
op : 'eq',
val : null
val : 'accepted'
}
},
{
or: [
{
name : 'sessions',
op : 'any',
val : {
name : 'state',
op : 'eq',
val : 'accepted'
}
},
{
name : 'sessions',
op : 'any',
val : {
name : 'state',
op : 'eq',
val : 'confirmed'
}
}
]
name : 'sessions',
op : 'any',
val : {
name : 'state',
op : 'eq',
val : 'confirmed'
}
}
]
}
];
]
}
];

@classic
export default class SpeakersRoute extends Route {
async model() {
const eventDetails = this.modelFor('public');
return {
event : eventDetails,
speakers : await this.infinity.model('speakers', {
filter : filterOptions,
filter : SPEAKERS_FILTER,
perPage : 12,
startingPage : 1,
perPageParam : 'page[size]',
Expand Down
6 changes: 3 additions & 3 deletions app/templates/components/public/side-menu.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{{t 'Tickets'}}
</a>
{{/if}}
{{#if this.event.speakers.length}}
{{#if this.showSpeakers}}
<LinkTo @route="public.speakers" class="item">
{{t 'Speakers'}}
</LinkTo>
Expand All @@ -23,13 +23,13 @@
{{t 'Tickets'}}
</a>
{{/if}}
{{#if this.event.speakers.length}}
{{#if this.showSpeakers}}
<LinkTo @route="public.speakers" class="item">
{{t 'Speakers'}}
</LinkTo>
{{/if}}
{{/if}}
{{#if this.event.sessions.length}}
{{#if this.showSessions}}
<LinkTo @route="public.sessions" class="item">
{{t 'Sessions'}}
</LinkTo>
Expand Down