feat(recording): Disable buttons on active session

lang/main.json

@@ -216,6 +216,7 @@
         "kickParticipantTitle": "Kick this participant?",
         "kickTitle": "Ouch! {{participantDisplayName}} kicked you out of the meeting",
         "liveStreaming": "Live Streaming",
+        "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Not possible while recording is active",
         "liveStreamingDisabledForGuestTooltip": "Guests can't start live streaming.",
         "liveStreamingDisabledTooltip": "Start live stream disabled.",
         "lockMessage": "Failed to lock the conference.",
@@ -249,6 +250,7 @@
         "popupError": "Your browser is blocking pop-up windows from this site. Please enable pop-ups in your browser's security settings and try again.",
         "popupErrorTitle": "Pop-up blocked",
         "recording": "Recording",
+        "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Not possible while a live stream is active",
         "recordingDisabledForGuestTooltip": "Guests can't start recordings.",
         "recordingDisabledTooltip": "Start recording disabled.",
         "rejoinNow": "Rejoin now",

react/features/recording/components/LiveStream/AbstractLiveStreamButton.js

@@ -25,6 +25,11 @@ export type Props = AbstractButtonProps & {
      */
     _isLiveStreamRunning: boolean,
 
+    /**
+     * True if the button needs to be disabled.
+     */
+    _disabled: Boolean,
+
     /**
      * The redux {@code dispatch} function.
      */
@@ -80,6 +85,7 @@ export default class AbstractLiveStreamButton<P: Props>
  * @param {Props} ownProps - The own props of the Component.
  * @private
  * @returns {{
+ *     _disabled: boolean,
  *     _isLiveStreamRunning: boolean,
  *     visible: boolean
  * }}
@@ -87,9 +93,9 @@ export default class AbstractLiveStreamButton<P: Props>
 export function _mapStateToProps(state: Object, ownProps: Props) {
     let { visible } = ownProps;
 
-    // a button can be disabled/enabled only if enableFeaturesBasedOnToken
+    // A button can be disabled/enabled only if enableFeaturesBasedOnToken
-    // is on
+    // is on or if the recording is running.
-    let disabledByFeatures;
+    let _disabled;
 
     if (typeof visible === 'undefined') {
         // If the containing component provides the visible prop, that is one
@@ -105,14 +111,19 @@ export function _mapStateToProps(state: Object, ownProps: Props) {
 
         if (enableFeaturesBasedOnToken) {
             visible = visible && String(features.livestreaming) === 'true';
-            disabledByFeatures = String(features.livestreaming) === 'disabled';
+            _disabled = String(features.livestreaming) === 'disabled';
         }
     }
 
+    // disable the button if the recording is running.
+    if (getActiveSession(state, JitsiRecordingConstants.mode.FILE)) {
+        _disabled = true;
+    }
+
     return {
+        _disabled,
         _isLiveStreamRunning: Boolean(
             getActiveSession(state, JitsiRecordingConstants.mode.STREAM)),
-        disabledByFeatures,
         visible
     };
 }

react/features/recording/components/LiveStream/web/LiveStreamButton.js

@@ -74,12 +74,10 @@ function _mapStateToProps(state: Object, ownProps: Props) {
     const abstractProps = _abstractMapStateToProps(state, ownProps);
     let { visible } = ownProps;
 
-    const _disabledByFeatures = abstractProps.disabledByFeatures;
+    let { _disabled } = abstractProps;
-    let _disabled = false;
     let _liveStreamDisabledTooltipKey;
 
-    if (!abstractProps.visible
+    if (!abstractProps.visible && _disabled !== undefined && !_disabled) {
-            && _disabledByFeatures !== undefined && !_disabledByFeatures) {
         _disabled = true;
 
         // button and tooltip
@@ -90,12 +88,15 @@ function _mapStateToProps(state: Object, ownProps: Props) {
             _liveStreamDisabledTooltipKey
                 = 'dialog.liveStreamingDisabledTooltip';
         }
+    } else if (_disabled) {
+        _liveStreamDisabledTooltipKey = 'dialog.liveStreamingDisabledBecauseOfActiveRecordingTooltip';
+    } else {
+        _disabled = false;
     }
 
     if (typeof visible === 'undefined') {
         visible = interfaceConfig.TOOLBAR_BUTTONS.includes('livestreaming')
-            && (abstractProps.visible
+            && (abstractProps.visible || Boolean(_liveStreamDisabledTooltipKey));
-                    || Boolean(_liveStreamDisabledTooltipKey));
     }
 
     return {

react/features/recording/components/Recording/AbstractRecordButton.js

@@ -24,6 +24,11 @@ import { StartRecordingDialog, StopRecordingDialog } from './_';
  */
 export type Props = AbstractButtonProps & {
 
+    /**
+     * True if the button needs to be disabled.
+     */
+    _disabled: Boolean,
+
     /**
      * True if there is a running active recording, false otherwise.
      */
@@ -103,17 +108,17 @@ export default class AbstractRecordButton<P: Props>
  * @param {Props} ownProps - The own props of the Component.
  * @private
  * @returns {{
+ *     _disabled: boolean,
  *     _isRecordingRunning: boolean,
- *     disabledByFeatures: boolean,
  *     visible: boolean
  * }}
  */
 export function _mapStateToProps(state: Object, ownProps: Props): Object {
     let { visible } = ownProps;
 
-    // a button can be disabled/enabled only if enableFeaturesBasedOnToken
+    // a button can be disabled/enabled if enableFeaturesBasedOnToken
-    // is on
+    // is on or if the livestreaming is running.
-    let disabledByFeatures;
+    let _disabled;
 
     if (typeof visible === 'undefined') {
         // If the containing component provides the visible prop, that is one
@@ -126,19 +131,22 @@ export function _mapStateToProps(state: Object, ownProps: Props): Object {
         } = state['features/base/config'];
         const { features = {} } = getLocalParticipant(state);
 
-        visible = isModerator
+        visible = isModerator && fileRecordingsEnabled;
-            && fileRecordingsEnabled;
 
         if (enableFeaturesBasedOnToken) {
             visible = visible && String(features.recording) === 'true';
-            disabledByFeatures = String(features.recording) === 'disabled';
+            _disabled = String(features.recording) === 'disabled';
         }
     }
 
+    // disable the button if the livestreaming is running.
+    if (getActiveSession(state, JitsiRecordingConstants.mode.STREAM)) {
+        _disabled = true;
+    }
+
     return {
-        _isRecordingRunning:
+        _disabled,
-            Boolean(getActiveSession(state, JitsiRecordingConstants.mode.FILE)),
+        _isRecordingRunning: Boolean(getActiveSession(state, JitsiRecordingConstants.mode.FILE)),
-        disabledByFeatures,
         visible
     };
 }

react/features/recording/components/Recording/web/RecordButton.js

@@ -40,7 +40,7 @@ class RecordButton extends AbstractRecordButton<Props> {
      * @returns {string}
      */
     _getTooltip() {
-        return this.tooltip || '';
+        return this.props._fileRecordingsDisabledTooltipKey || '';
     }
 
     /**
@@ -74,28 +74,27 @@ export function _mapStateToProps(state: Object, ownProps: Props): Object {
     const abstractProps = _abstractMapStateToProps(state, ownProps);
     let { visible } = ownProps;
 
-    const _disabledByFeatures = abstractProps.disabledByFeatures;
+    let { _disabled } = abstractProps;
-    let _disabled = false;
     let _fileRecordingsDisabledTooltipKey;
 
-    if (!abstractProps.visible
+    if (!abstractProps.visible && _disabled !== undefined && !_disabled) {
-            && _disabledByFeatures !== undefined && !_disabledByFeatures) {
         _disabled = true;
 
         // button and tooltip
         if (state['features/base/jwt'].isGuest) {
-            _fileRecordingsDisabledTooltipKey
+            _fileRecordingsDisabledTooltipKey = 'dialog.recordingDisabledForGuestTooltip';
-                = 'dialog.recordingDisabledForGuestTooltip';
         } else {
-            _fileRecordingsDisabledTooltipKey
+            _fileRecordingsDisabledTooltipKey = 'dialog.recordingDisabledTooltip';
-                = 'dialog.recordingDisabledTooltip';
         }
+    } else if (_disabled) {
+        _fileRecordingsDisabledTooltipKey = 'dialog.recordingDisabledBecauseOfActiveLiveStreamingTooltip';
+    } else {
+        _disabled = false;
     }
 
     if (typeof visible === 'undefined') {
         visible = interfaceConfig.TOOLBAR_BUTTONS.includes('recording')
-            && (abstractProps.visible
+            && (abstractProps.visible || Boolean(_fileRecordingsDisabledTooltipKey));
-                    || Boolean(_fileRecordingsDisabledTooltipKey));
     }
 
     return {