Merge pull request #5627 from seotts/fix-muted-proj-page

Fix preventing muted users from adding projects via project page

src/redux/session.js

@@ -147,6 +147,8 @@ module.exports.selectStudioCommentsGloballyEnabled = state =>
 module.exports.selectMuteStatus = state => get(state, ['session', 'session', 'permissions', 'mute_status'],
     {muteExpiresAt: 0, offenses: [], showWarning: false});
 module.exports.selectIsMuted = state => (module.exports.selectMuteStatus(state).muteExpiresAt || 0) * 1000 > Date.now();
+module.exports.selectNewStudiosLaunched = state => get(state, ['session', 'session', 'flags', 'new_studios_launched'],
+    false);
 
 module.exports.selectHasFetchedSession = state => state.session.status === module.exports.Status.FETCHED;
 

src/views/preview/l10n.json

@@ -46,5 +46,6 @@
     "project.cloudVariables": "Cloud Variables",
     "project.cloudDataLink": "See Data",
     "project.usernameBlockAlert": "This project can detect who is using it, through the \"username\" block. To hide your identity, sign out before using the project.",
-    "project.inappropriateUpdate": "Hmm...the bad word detector thinks there is a problem with your text. Please change it and remember to be respectful."
+    "project.inappropriateUpdate": "Hmm...the bad word detector thinks there is a problem with your text. Please change it and remember to be respectful.",
+    "project.mutedAddToStudio": "You will be able to add to studios again {inDuration}."
 }

src/views/preview/preview.scss

@@ -160,7 +160,6 @@ $stage-width: 480px;
         margin-top: $arrow-border-width;
         border: 1px solid $active-gray;
         border-radius: 5px;
-        background-color: $ui-orange;
         padding: 1rem;
         max-width: 18.75rem;
         min-height: 1rem;
@@ -185,7 +184,6 @@ $stage-width: 480px;
             border-left: 1px solid $active-gray;
             border-radius: 5px;
 
-            background-color: $ui-orange;
             width: $arrow-border-width;
             height: $arrow-border-width;
 

src/views/preview/subactions.jsx

@@ -8,90 +8,132 @@ const Button = require('../../components/forms/button.jsx');
 const AddToStudioModal = require('./add-to-studio.jsx');
 const SocialModal = require('../../components/modal/social/container.jsx');
 const ReportModal = require('../../components/modal/report/modal.jsx');
+const {connect} = require('react-redux');
+const {useState} = require('react');
 const projectShape = require('./projectshape.jsx').projectShape;
 
+import {selectIsMuted, selectNewStudiosLaunched} from '../../redux/session.js';
+import StudioMuteEditMessage from '../studio/studio-mute-edit-message.jsx';
+
 require('./subactions.scss');
 
-const Subactions = props => (
-    <FlexRow className="subactions">
-        <div className="share-date">
-            <div className="copyleft">&copy;</div>
-            {' '}
-            {/*  eslint-disable react/jsx-sort-props */}
-            {props.shareDate ? (
-                <FormattedDate
-                    value={Date.parse(props.shareDate)}
-                    day="2-digit"
-                    month="short"
-                    year="numeric"
-                />
-            ) : 'Unshared'}
-            {/*  eslint-enable react/jsx-sort-props */}
-        </div>
-        <FlexRow className="action-buttons">
-            {(props.canReport) &&
-                <React.Fragment>
-                    <Button
-                        className="action-button report-button"
-                        key="report-button"
-                        onClick={props.onReportClicked}
-                    >
-                        <FormattedMessage id="general.report" />
-                    </Button>
-                    {props.reportOpen && (
-                        <ReportModal
-                            isOpen
-                            key="report-modal"
-                            type="project"
-                            onReport={props.onReportSubmit}
-                            onRequestClose={props.onReportClose}
-                        />
-                    )}
-                </React.Fragment>
-            }
-            {props.canAddToStudio &&
-                <React.Fragment>
-                    <Button
-                        className="action-button studio-button"
-                        key="add-to-studio-button"
-                        onClick={props.onAddToStudioClicked}
-                    >
-                        <FormattedMessage id="addToStudio.title" />
-                    </Button>
-                    {props.addToStudioOpen && (
-                        <AddToStudioModal
-                            isOpen
-                            isAdmin={props.isAdmin}
-                            key="add-to-studio-modal"
-                            userOwnsProject={props.userOwnsProject}
-                            onRequestClose={props.onAddToStudioClosed}
-                            onToggleStudio={props.onToggleStudio}
-                        />
-                    )}
-                </React.Fragment>
-            }
-            {/* only show copy link button, modal if project is shared */}
-            {props.isShared && props.projectInfo && props.projectInfo.id && (
-                <React.Fragment>
-                    <Button
-                        className="action-button copy-link-button"
-                        onClick={props.onSocialClicked}
-                    >
-                        <FormattedMessage id="general.copyLink" />
-                    </Button>
-                    {props.socialOpen && (
-                        <SocialModal
-                            isOpen
-                            key="social-modal"
-                            projectId={props.projectInfo && props.projectInfo.id}
-                            onRequestClose={props.onSocialClosed}
-                        />
-                    )}
-                </React.Fragment>
-            )}
+const Subactions = ({
+    addToStudioOpen,
+    canAddToStudio,
+    canReport,
+    isAdmin,
+    isShared,
+    onAddToStudioClicked,
+    onAddToStudioClosed,
+    onReportClicked,
+    onReportClose,
+    onReportSubmit,
+    onSocialClicked,
+    onSocialClosed,
+    onToggleStudio,
+    projectInfo,
+    reportOpen,
+    shareDate,
+    showAddToStudioMuteError,
+    socialOpen,
+    userOwnsProject
+}) => {
+    const [showMuteMessage, setShowMuteMessage] = useState(false);
+    
+    return (
+        <FlexRow className="subactions">
+            <div className="share-date">
+                <div className="copyleft">&copy;</div>
+                {' '}
+                {/*  eslint-disable react/jsx-sort-props */}
+                {shareDate ? (
+                    <FormattedDate
+                        value={Date.parse(shareDate)}
+                        day="2-digit"
+                        month="short"
+                        year="numeric"
+                    />
+                ) : 'Unshared'}
+                {/*  eslint-enable react/jsx-sort-props */}
+            </div>
+            <FlexRow className="action-buttons">
+                {(canReport) &&
+                    <React.Fragment>
+                        <Button
+                            className="action-button report-button"
+                            key="report-button"
+                            onClick={onReportClicked}
+                        >
+                            <FormattedMessage id="general.report" />
+                        </Button>
+                        {reportOpen && (
+                            <ReportModal
+                                isOpen
+                                key="report-modal"
+                                type="project"
+                                onReport={onReportSubmit}
+                                onRequestClose={onReportClose}
+                            />
+                        )}
+                    </React.Fragment>
+                }
+                {canAddToStudio &&
+                    <React.Fragment>
+                        <div
+                            style={{position: 'relative'}}
+                            /* eslint-disable react/jsx-no-bind */
+                            onMouseEnter={() => showAddToStudioMuteError && setShowMuteMessage(true)}
+                            onMouseLeave={() => showAddToStudioMuteError && setShowMuteMessage(false)}
+                            /* eslint-enable react/jsx-no-bind */
+                        >
+                            <Button
+                                className="action-button studio-button"
+                                disabled={showAddToStudioMuteError}
+                                key="add-to-studio-button"
+                                onClick={showMuteMessage ? null : onAddToStudioClicked}
+                            >
+                                <FormattedMessage id="addToStudio.title" />
+                            </Button>
+                            {showMuteMessage && <StudioMuteEditMessage
+                                className="studio-button-error"
+                                messageId="project.mutedAddToStudio"
+                            />}
+                        </div>
+                        {addToStudioOpen && (
+                            <AddToStudioModal
+                                isOpen
+                                isAdmin={isAdmin}
+                                key="add-to-studio-modal"
+                                userOwnsProject={userOwnsProject}
+                                onRequestClose={onAddToStudioClosed}
+                                onToggleStudio={onToggleStudio}
+                            />
+                        )}
+                    </React.Fragment>
+                }
+                {/* only show copy link button, modal if project is shared */}
+                {isShared && projectInfo && projectInfo.id && (
+                    <React.Fragment>
+                        <Button
+                            className="action-button copy-link-button"
+                            onClick={onSocialClicked}
+                        >
+                            <FormattedMessage id="general.copyLink" />
+                        </Button>
+                        {socialOpen && (
+                            <SocialModal
+                                isOpen
+                                key="social-modal"
+                                projectId={projectInfo && projectInfo.id}
+                                onRequestClose={onSocialClosed}
+                            />
+                        )}
+                    </React.Fragment>
+                )}
+            </FlexRow>
         </FlexRow>
-    </FlexRow>
-);
+    );
+};
 
 Subactions.propTypes = {
     addToStudioOpen: PropTypes.bool,
@@ -110,8 +152,13 @@ Subactions.propTypes = {
     projectInfo: projectShape,
     reportOpen: PropTypes.bool,
     shareDate: PropTypes.string,
+    showAddToStudioMuteError: PropTypes.bool,
     socialOpen: PropTypes.bool,
     userOwnsProject: PropTypes.bool
 };
 
-module.exports = Subactions;
+module.exports = connect(
+    state => ({
+        showAddToStudioMuteError: selectNewStudiosLaunched(state) && selectIsMuted(state)
+    })
+)(Subactions);

src/views/preview/subactions.scss

@@ -109,3 +109,10 @@
         }
     }
 }
+
+.studio-button-error {
+    top: auto;
+    transform: none;
+    width: 100%;
+    margin-left: 0;
+}

src/views/studio/studio-mute-edit-message.jsx

@@ -9,12 +9,15 @@ import {selectMuteStatus} from '../../redux/session';
 import {formatRelativeTime} from '../../lib/format-time.js';
 
 const StudioMuteEditMessage = ({
+    className,
+    messageId,
     muteExpiresAtMs
 }) => (
     <ValidationMessage
+        className={className}
         mode="info"
         message={<FormattedMessage
-            id="studio.mutedEdit"
+            id={messageId}
             values={{
                 inDuration: formatRelativeTime(muteExpiresAtMs, window._locale)
             }}
@@ -24,9 +27,15 @@ const StudioMuteEditMessage = ({
 
 
 StudioMuteEditMessage.propTypes = {
+    className: PropTypes.string,
+    messageId: PropTypes.string,
     muteExpiresAtMs: PropTypes.number
 };
 
+StudioMuteEditMessage.defaultProps = {
+    messageId: 'studio.mutedEdit'
+};
+
 export default connect(
     state => ({
         muteExpiresAtMs: (selectMuteStatus(state).muteExpiresAt * 1000 || 0)