* VRFS-3381 - make sure a recorded jamtrack shows up correctly

web/app/assets/javascripts/react-components/PopupMediaControls.js.jsx.coffee

@@ -36,7 +36,12 @@ mixins.push(Reflux.listenTo(MediaPlaybackStore, 'onMediaStateChanged'))
     extraControls = null
 
     # give the users options to close it
-    if @props.mediaSummary.jamTrackOpen
+    if @props.mediaSummary.recordingOpen
+      mediaType = "Recording"
+      mediaName = @props.recordedTracks[0].recordingName
+      closeLinkText = 'close recording'
+      header = `<h3>{mediaType}: {mediaName} ({this.state.time})</h3>`
+    else if @props.mediaSummary.jamTrackOpen
       mediaType = "JamTrack"
       mediaName = @props.jamTracks[0].name
       closeLinkText = 'close JamTrack'
@@ -61,11 +66,6 @@ mixins.push(Reflux.listenTo(MediaPlaybackStore, 'onMediaStateChanged'))
       `<div>
         <a className="display-metronome" onClick={this.showMetronome}>Display visual metronome</a>
       </div>`
-    else if @props.mediaSummary.recordingOpen
-      mediaType = "Recording"
-      mediaName = @props.recordedTracks[0].recordingName
-      closeLinkText = 'close recording'
-      header = `<h3>{mediaType}: {mediaName} ({this.state.time})</h3>`
     else
       mediaType = ""
 

web/app/assets/javascripts/react-components/SessionMasterMediaTracks.js.jsx.coffee

@@ -17,20 +17,27 @@ ChannelGroupIds = context.JK.ChannelGroupIds
     if this.state.mediaSummary.mediaOpen
 
       if this.state.mediaSummary.backingTrackOpen
+
         for backingTrack in @state.backingTracks
           backingTrack.mode = MIX_MODES.MASTER
           mediaTracks.push(`<SessionBackingTrack key={backingTrack.track.id} {...backingTrack} />`)
+
       else if this.state.mediaSummary.jamTrackOpen
+
         mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.MASTER} />`)
         for jamTrack in @state.jamTracks
           jamTrack.mode = MIX_MODES.MASTER
           mediaTracks.push(`<SessionJamTrack key={jamTrack.id} {...jamTrack} />`)
+
       else if this.state.mediaSummary.recordingOpen
+
         mediaTracks.push(`<SessionRecordedCategory key="RecordedCategory" recordingName={this.state.recordingName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.MASTER} />`)
         for recordedTrack in @state.recordedTracks
           recordedTrack.mode = MIX_MODES.MASTER
           mediaTracks.push(`<SessionRecordedTrack key={recordedTrack.track.id} {...recordedTrack} />`)
+
       else if this.state.mediaSummary.metronomeOpen
+
         @state.metronome.mode = MIX_MODES.MASTER
         mediaTracks.push(`<SessionMetronome key={this.state.metronome.id} {...this.state.metronome} />`)
 

web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee

@@ -218,14 +218,15 @@ ChannelGroupIds = context.JK.ChannelGroupIds
     else if this.state.mediaSummary.mediaOpen
 
       # give the users options to close it
-      if this.state.mediaSummary.jamTrackOpen
+      if this.state.mediaSummary.recordingOpen
+        mediaType = "Recording"
+      else if this.state.mediaSummary.jamTrackOpen
         mediaType = "JamTrack"
       else if this.state.mediaSummary.backingTrackOpen
         mediaType = "Audio File"
       else if this.state.mediaSummary.metronomeOpen
         mediaType = "Metronome"
-      else if this.state.mediaSummary.recordingOpen
-        mediaType = "Recording"
+
       else
         mediaType = ""
 
@@ -236,20 +237,43 @@ ChannelGroupIds = context.JK.ChannelGroupIds
 
 
       if this.state.mediaSummary.backingTrackOpen
+
         for backingTrack in @state.backingTracks
           backingTrack.mode = MIX_MODES.PERSONAL
           mediaTracks.push(`<SessionBackingTrack key={backingTrack.track.id} {...backingTrack} />`)
-      else if this.state.mediaSummary.jamTrackOpen
-        mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
-        for jamTrack in @state.jamTracks
-          jamTrack.mode = MIX_MODES.PERSONAL
-          mediaTracks.push(`<SessionJamTrack key={jamTrack.id} {...jamTrack} />`)
+
       else if this.state.mediaSummary.recordingOpen
+
         mediaTracks.push(`<SessionRecordedCategory key="RecordedCategory" recordingName={this.state.recordingName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
         for recordedTrack in @state.recordedTracks
           recordedTrack.mode = MIX_MODES.PERSONAL
           mediaTracks.push(`<SessionRecordedTrack key={recordedTrack.track.id} {...recordedTrack} />`)
+
+        # if a JamTrack is also open (meaning the Recording was made with a Jamtrack), show it's mixers as well
+        if this.state.mediaSummary.jamTrackOpen
+          for jamTrack in @state.jamTracks
+            jamTrack.mode = MIX_MODES.PERSONAL
+            mediaTracks.push(`<SessionJamTrack key={jamTrack.id} {...jamTrack} />`)
+
+      else if this.state.mediaSummary.jamTrackOpen
+
+        # JamTrack shows in this order:
+        # The Category mixer
+        # The Metronome
+        # All the JamTracks
+        mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
+
+        # this is not ready yet until VRFS-3363 is done
+        #if @state.metronome?
+        #  @state.metronome.mode = MIX_MODES.PERSONAL
+        #  mediaTracks.push(`<SessionMetronome key="JamTrackMetronome"  {...this.state.metronome} />`)
+
+        for jamTrack in @state.jamTracks
+          jamTrack.mode = MIX_MODES.PERSONAL
+          mediaTracks.push(`<SessionJamTrack key={jamTrack.id} {...jamTrack} />`)
+
       else if this.state.mediaSummary.metronomeOpen
+
         @state.metronome.mode = MIX_MODES.PERSONAL
         mediaTracks.push(`<SessionMetronome key={this.state.metronome.id} {...this.state.metronome} />`)
 

web/app/assets/javascripts/react-components/helpers/MixerHelper.js.coffee

@@ -177,7 +177,6 @@ MIX_MODES = context.JK.MIX_MODES;
     @recordedTracks = @resolveRecordedTracks()
     @metronome = @resolveMetronome()
 
-
     if @adhocTrackMixers.length > 0
       logger.warn("some tracks are open that we don't know how to show")
 
@@ -185,7 +184,7 @@ MIX_MODES = context.JK.MIX_MODES;
       recordingOpen: @recordedTracks.length > 0
       jamTrackOpen: @jamTracks.length > 0
       backingTrackOpen: @backingTracks.length > 0
-      metronomeOpen: @metronome?
+      metronomeOpen: @session.isMetronomeOpen()
 
     # figure out if any media is open
     mediaOpenSummary = false
@@ -370,7 +369,6 @@ MIX_MODES = context.JK.MIX_MODES;
 
     serverRecordedTracks = @session.recordedTracks()
 
-    logger.debug("@recordingTrackMixers[0].group_id", @recordingTrackMixers[0].group_id)
     isOpener = @recordingTrackMixers[0].group_id == ChannelGroupIds.MediaTrackGroup
 
     # using the server's info in conjuction with the client's, draw the recording tracks
@@ -425,7 +423,7 @@ MIX_MODES = context.JK.MIX_MODES;
 
   resolveMetronome: () ->
 
-    return null if @metronomeTrackMixers.length == 0 || !@session.isMetronomeOpen()
+    return null if @metronomeTrackMixers.length == 0
 
     mixer = @metronomeTrackMixers[0]
 
@@ -864,7 +862,7 @@ MIX_MODES = context.JK.MIX_MODES;
     mixers = @mixersForGroupId(groupId, mode)
 
     if mixers.length == 0
-      logger.warn("could not find mixer with group ID: " + groupId + ', mode:' + mode)
+      #logger.warn("could not find mixer with group ID: " + groupId + ', mode:' + mode)
       return null
 
     found = null