scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-28 05:41:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Remove use of studio transfer feature flag

Browse source 
Remove another use
This commit is contained in:
seotts 2021-09-21 09:48:57 -04:00
parent 3ef41d2790
commit 80a99bc0b6
2 changed files with 7 additions and 14 deletions

2
src/redux/session.js
View file

@ -147,8 +147,6 @@ 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.selectStudioTransferLaunched = state => get(state, ['session', 'session', 'flags',
'studio_transfer_launched'], false);
module.exports.selectHasFetchedSession = state => state.session.status === module.exports.Status.FETCHED;

19
src/views/studio/studio-member-tile.jsx
View file

@ -13,7 +13,6 @@ import {
selectCanRemoveCurator, selectCanRemoveManager, selectCanPromoteCurators,
selectCanTransfer
} from '../../redux/studio-permissions';
import {selectStudioTransferLaunched} from '../../redux/session.js';
import {
Errors,
promoteCurator,
@ -29,7 +28,7 @@ import removeIcon from './icons/remove-icon.svg';
import promoteIcon from './icons/curator-icon.svg';
const StudioMemberTile = ({
canRemove, canPromote, onRemove, canTransferHost, onPromote, studioTransferLaunched,
canRemove, canPromote, onRemove, canTransferHost, onPromote,
isCreator, hasReachedManagerLimit, // mapState props
username, image // own props
}) => {
@ -54,10 +53,9 @@ const StudioMemberTile = ({
>{username}</a>
{isCreator &&
<div className="studio-member-role">
{studioTransferLaunched ?
<FormattedMessage id="studio.hostRole" /> :
<FormattedMessage id="studio.creatorRole" />}
</div>}
<FormattedMessage id="studio.hostRole" />
</div>
}
</div>
{(canRemove || canPromote || canTransferHost) &&
<OverflowMenu>
@ -154,18 +152,15 @@ StudioMemberTile.propTypes = {
username: PropTypes.string,
image: PropTypes.string,
isCreator: PropTypes.bool,
hasReachedManagerLimit: PropTypes.bool,
studioTransferLaunched: PropTypes.bool
hasReachedManagerLimit: PropTypes.bool
};
const ManagerTile = connect(
(state, ownProps) => ({
canRemove: selectCanRemoveManager(state, ownProps.id),
canPromote: false,
canTransferHost: selectCanTransfer(state, ownProps.id) &&
selectStudioTransferLaunched(state),
isCreator: state.studio.owner === ownProps.id,
studioTransferLaunched: selectStudioTransferLaunched(state)
canTransferHost: selectCanTransfer(state, ownProps.id),
isCreator: state.studio.owner === ownProps.id
}),
{
onRemove: removeManager