From c9f0dead1299719276af04c96b36fe9bc70c6756 Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Tue, 15 Nov 2016 12:09:51 -0500
Subject: [PATCH] cleanup meetings

---
 app/assets/javascripts/landing.js        |  8 +++--
 app/assets/javascripts/meeting.coffee    | 17 +++++++---
 app/assets/javascripts/recordings.coffee |  2 +-
 app/views/bbb/recordings.jbuilder        | 41 ++++++++++++------------
 app/views/landing/meetings.html.erb      |  2 +-
 app/views/landing/rooms.html.erb         |  2 +-
 app/views/shared/_meeting_url.html.erb   |  2 +-
 7 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 1422119f..11dc7f6d 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -13,6 +13,7 @@
   };
 
   var init = function() {
+    Meeting.clear();
 
     $('.center-panel-wrapper').on ('click', '.meeting-join', function (event) {
       var name = $('.meeting-user-name').val();
@@ -69,16 +70,17 @@
 
     $('.generate-link').click (function (e) {
       e.preventDefault();
+      var newId = Math.trunc(Math.random() * 1000000000);
+      $(".page-wrapper.meetings").data('id', newId);
       var link = window.location.protocol +
         '//' +
         window.location.hostname +
         '/meetings/' +
-        Math.trunc(Math.random() * 1000000000);
-
+        newId;
       $('.meeting-url').val(link);
     });
 
-    if (meetingId = $('.meeting-url').data('meetingId')) {
+    if (meetingId = $(".page-wrapper.meetings").data('id')) {
       var link = window.location.protocol +
         '//' +
         window.location.hostname +
diff --git a/app/assets/javascripts/meeting.coffee b/app/assets/javascripts/meeting.coffee
index c99bd888..c40a4136 100644
--- a/app/assets/javascripts/meeting.coffee
+++ b/app/assets/javascripts/meeting.coffee
@@ -9,18 +9,25 @@ class @Meeting
   @getInstance: ->
     if _meetingInstance
       return _meetingInstance
-    id = $(".page-wrapper.rooms").data('room')
-    url = @buildURL()
+    id = $(".page-wrapper").data('id')
+    url = @buildURL(id)
     name = $('.meeting-user-name').val()
     _meetingInstance = new Meeting(id, url, name)
     return _meetingInstance
 
-  @buildURL: ->
+  @clear: ->
+    _meetingInstance = null
+
+  @buildURL: (id) ->
+    if (resource = location.pathname.split('/')[1]) != 'rooms'
+      resource = 'meetings'
     return location.protocol +
       '//' +
       location.hostname +
-      '/rooms/' +
-      $('.rooms').data('room')
+      '/' +
+      resource +
+      '/' +
+      id;
 
   # Sends the end meeting request
   # Returns a response object
diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index ce42e3c7..2dfc6e65 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -50,7 +50,7 @@ class @Recordings
               str = ''
               if row.published
                 for d in data
-                  str += '<a href="'+d.url+'">'+d.type+'</a> '
+                  str += '<a href="'+d.url+'">'+d.type_i18n+'</a> '
               return str
             return data
         },
diff --git a/app/views/bbb/recordings.jbuilder b/app/views/bbb/recordings.jbuilder
index 9ad2799a..12bea1de 100644
--- a/app/views/bbb/recordings.jbuilder
+++ b/app/views/bbb/recordings.jbuilder
@@ -1,26 +1,25 @@
 json.partial! 'bbb', messageKey: @messageKey, message: @message, status: @status
-unless @response.blank?
-  json.is_owner current_user == @user
-  json.recordings do
-    json.array!(@response) do |recording|
-      json.id recording[:recordID]
-      json.name recording[:name]
-      json.start_time recording[:startTime]
-      json.end_time recording[:endTime]
-      json.published recording[:published]
-      json.previews do
-        json.array!(recording[:previews]) do |preview|
-          json.partial! 'preview', preview: preview
-        end
+json.is_owner current_user == @user
+json.recordings do
+  json.array!(@response) do |recording|
+    json.id recording[:recordID]
+    json.name recording[:name]
+    json.start_time recording[:startTime]
+    json.end_time recording[:endTime]
+    json.published recording[:published]
+    json.previews do
+      json.array!(recording[:previews]) do |preview|
+        json.partial! 'preview', preview: preview
       end
-      json.playbacks do
-        json.array!(recording[:playbacks]) do |playback|
-          json.type t(playback[:type]) # translates the playback type
-          json.url playback[:url]
-          json.previews do
-            json.array!(playback[:previews]) do |preview|
-              json.partial! 'preview', preview: preview
-            end
+    end
+    json.playbacks do
+      json.array!(recording[:playbacks]) do |playback|
+        json.type playback[:type]
+        json.type_i18n t(playback[:type]) # translates the playback type
+        json.url playback[:url]
+        json.previews do
+          json.array!(playback[:previews]) do |preview|
+            json.partial! 'preview', preview: preview
           end
         end
       end
diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb
index 10c10c24..0eb74733 100644
--- a/app/views/landing/meetings.html.erb
+++ b/app/views/landing/meetings.html.erb
@@ -17,7 +17,7 @@
   <% end %>
 <% end %>
 
-<div class="page-wrapper meetings">
+<div class="page-wrapper meetings" data-id="<%= @meeting_id %>">
   <div class="container-fluid">
 
     <%= render 'shared/title', title: t('start_new_session') %>
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index 7bde85f1..52670083 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -4,7 +4,7 @@
   <% page_title= t('greet_guest', name: @user.username) %>
 <% end %>
 
-<div class="page-wrapper rooms" data-room="<%= @user.encrypted_id %>">
+<div class="page-wrapper rooms" data-id="<%= @user.encrypted_id %>">
   <div class="container-fluid">
 
     <%= render 'shared/title', title: page_title %>
diff --git a/app/views/shared/_meeting_url.html.erb b/app/views/shared/_meeting_url.html.erb
index 05c10713..2a2c44cf 100644
--- a/app/views/shared/_meeting_url.html.erb
+++ b/app/views/shared/_meeting_url.html.erb
@@ -1,6 +1,6 @@
 <div <%= "hidden" if hidden %> class="meeting-url-wrapper">
   <div class="input-group">
-    <input type="text" readonly="readonly" class="form-control meeting-url" data-meeting-id="<%= @meeting_id %>" data-path="<%= @user.room_url if @user %>"/>
+    <input type="text" readonly="readonly" class="form-control meeting-url"/>
     <span class="input-group-btn">
       <button type="button" class="btn btn-default meeting-url-copy">
         <i class="fa fa-paperclip" aria-hidden="true"></i>