From bdd44985fa95b761802429859e0ce7fa1d36cb49 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sat, 19 Sep 2020 10:57:18 -0500
Subject: [PATCH] wip

---
 .../SessionBackingTrack.js.jsx.coffee            |  3 ++-
 .../SessionJamTrack.js.jsx.coffee                |  3 ++-
 .../SessionMediaTracks.js.jsx.coffee             | 16 ++++++++--------
 .../SessionMyTracks.js.jsx.coffee                |  2 +-
 .../SessionRecordedTrack.js.jsx.coffee           |  3 ++-
 .../react-components/SessionScreen.js.jsx.coffee |  2 +-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee
index b6aad7916..6fb659414 100644
--- a/web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionBackingTrack.js.jsx.coffee
@@ -70,7 +70,8 @@ MixerActions = @MixerActions
     $mute = $root.find('.track-icon-mute')
     $pan  = $root.find('.track-icon-pan')
 
-    if @props.isOpener || @props.mode == MIX_MODES.MASTER
+    # get rid of idea that only open can modify
+    if true # @props.isOpener || @props.mode == MIX_MODES.MASTER
       context.JK.interactReactBubble(
         $mute,
         'SessionTrackVolumeHover',
diff --git a/web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee
index 69e968c57..e57edee87 100644
--- a/web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionJamTrack.js.jsx.coffee
@@ -70,7 +70,8 @@ MixerActions = @MixerActions
     $mute = $root.find('.track-icon-mute')
     $pan  = $root.find('.track-icon-pan')
 
-    if @props.isOpener || @props.mode == MIX_MODES.MASTER
+    # get rid of idea that only open can modify
+    if true # @props.isOpener || @props.mode == MIX_MODES.MASTER
       context.JK.interactReactBubble(
         $mute,
         'SessionTrackVolumeHover',
diff --git a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
index 0e84278e4..afebb8978 100644
--- a/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionMediaTracks.js.jsx.coffee
@@ -252,20 +252,20 @@ ChannelGroupIds = context.JK.ChannelGroupIds
       if this.state.mediaSummary.backingTrackOpen
 
         for backingTrack in @state.backingTracks
-          backingTrack.mode = MIX_MODES.PERSONAL
+          backingTrack.mode = @props.mode
           mediaTracks.push(`<SessionBackingTrack key={backingTrack.track.id} {...backingTrack} />`)
 
       else if this.state.mediaSummary.recordingOpen
 
-        mediaTracks.push(`<SessionRecordedCategory key="RecordedCategory" recordingName={this.state.recordingName} mixers={this.state.mediaCategoryMixer} mode={MIX_MODES.PERSONAL} />`)
+        mediaTracks.push(`<SessionRecordedCategory key="RecordedCategory" recordingName={this.state.recordingName} mixers={this.state.mediaCategoryMixer} mode={@props.mode} />`)
         for recordedTrack in @state.recordedTracks
-          recordedTrack.mode = MIX_MODES.PERSONAL
+          recordedTrack.mode = @props.mode
           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
+            jamTrack.mode = @props.mode
             mediaTracks.push(`<SessionJamTrack key={jamTrack.id} {...jamTrack} />`)
 
       else if this.state.mediaSummary.jamTrackOpen
@@ -274,20 +274,20 @@ ChannelGroupIds = context.JK.ChannelGroupIds
         # 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} />`)
+        mediaTracks.push(`<SessionJamTrackCategory key="JamTrackCategory" jamTrackName={this.state.jamTrackName} mixers={this.state.mediaCategoryMixer} mode={@props.mode} />`)
 
         if @state.metronome? # && @state.jamTrackMixdown.id == null
-          @state.metronome.mode = MIX_MODES.PERSONAL
+          @state.metronome.mode = @props.mode
           mediaTracks.push(`<SessionMetronome key="JamTrackMetronome"  {...this.state.metronome} location="jam-track" />`)
 
 
         for jamTrack in @state.jamTracks
-          jamTrack.mode = MIX_MODES.PERSONAL
+          jamTrack.mode = @props.mode
           mediaTracks.push(`<SessionJamTrack key={jamTrack.id} {...jamTrack} />`)
 
       else if this.state.mediaSummary.metronomeOpen
 
-        @state.metronome.mode = MIX_MODES.PERSONAL
+        @state.metronome.mode = @props.mode
         mediaTracks.push(`<SessionMetronome key={this.state.metronome.id} {...this.state.metronome} />`)
 
       contents = closeOptions
diff --git a/web/app/assets/javascripts/react-components/SessionMyTracks.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionMyTracks.js.jsx.coffee
index 1ecb4d5aa..4a3294724 100644
--- a/web/app/assets/javascripts/react-components/SessionMyTracks.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionMyTracks.js.jsx.coffee
@@ -24,7 +24,7 @@ SessionActions = context.SessionActions
 
     if @state.tracks.length > 0
       for track in @state.tracks
-        track.mode = MIX_MODES.PERSONAL
+        track.mode = @props.mode
         tracks.push(`<SessionMyTrack key={track.track.client_track_id} {...track} />`)
 
       if @state.chat
diff --git a/web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee
index d182b6450..f8db4915d 100644
--- a/web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionRecordedTrack.js.jsx.coffee
@@ -70,7 +70,8 @@ MixerActions = @MixerActions
     $mute = $root.find('.track-icon-mute')
     $pan  = $root.find('.track-icon-pan')
 
-    if @props.isOpener || @props.mode == MIX_MODES.MASTER
+    # get rid of idea that only open can modify
+    if true # @props.isOpener || @props.mode == MIX_MODES.MASTER
       context.JK.interactReactBubble(
         $mute,
         'SessionTrackVolumeHover',
diff --git a/web/app/assets/javascripts/react-components/SessionScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionScreen.js.jsx.coffee
index bf935b202..610fe05e4 100644
--- a/web/app/assets/javascripts/react-components/SessionScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/SessionScreen.js.jsx.coffee
@@ -35,7 +35,7 @@ SessionActions = @SessionActions
         <SessionLeaveBtn />
       </div>
       <div className="tracks" id="new-tracks">
-        <SessionMyTracks mode={MIX_MODES.PERSONAL} />
+        <SessionMyTracks mode={MIX_MODES.MASTER} />
         <SessionOtherTracks mode={MIX_MODES.PERSONAL} />
         <SessionMediaTracks mode={MIX_MODES.PERSONAL} />
         <SessionNotifications />