fix: Check video stream relation before loading (#5767)

fossasia · Nov 25, 2020 · df1d513 · df1d513 · vercel · Nov 25, 2020
1 parent 5d6f968
commit df1d513
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs
@@ -5,7 +5,7 @@
       <h3 class="ui header" id="session-id-{{@session.id}}" style={{css color=(text-color @session.track.color)}}>
         {{@session.title}}
         <span style={{css float='right'}}>
-          {{#if @session.microlocation.videoStream}}
+          {{#if @session.microlocation.hasVideoStream}}
             <button class="ui basic {{text-color @session.track.color 'basic' 'inverted'}} button" style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}} {{action this.goToStream}}>
               <i class="icon video"></i>
               {{t 'Join Video'}}
@@ -90,7 +90,7 @@
       </div>
     {{/if}}
 
-    {{#if @session.microlocation.videoStream}}
+    {{#if @session.microlocation.hasVideoStream}}
       <p style="white-space: pre-line;">
         <a class="mt-2" href="{{href-to 'public.stream.view' (or @event.identifier @session.event.identifier) @session.microlocation.videoStream}}" target="_blank" rel="noopener">{{t 'Join Video Channel'}}</a>
         {{#if @session.microlocation.videoStream.password}}

diff --git a/app/models/microlocation.ts b/app/models/microlocation.ts
@@ -12,7 +12,13 @@ export default class Microlocation extends ModelBase.extend({
   sessions    : hasMany('session'),
   event       : belongsTo('event'),
   videoStream : belongsTo('video-stream')
-}) {}
+}) {
+
+  get hasVideoStream(): boolean {
+    return this.belongsTo('videoStream').value() != null;
+  }
+
+}
 
 // DO NOT DELETE: this is how TypeScript knows how to look up your models.
 declare module 'ember-data/types/registries/model' {