github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3940 from overleaf/ae-share-modal-for-everyone

Browse source 
Enable React share modal for all users

GitOrigin-RevId: 2cb288e15770d3169034e4511df6537d010e924d
This commit is contained in:
Alf Eaton 2021-04-22 10:50:41 +01:00 committed by Copybot
parent b3b8502e5e
commit 5cec4420dc
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/src/Features/Project/ProjectController.js
View file

@ -863,7 +863,7 @@ const ProjectController = {
showNewNavigationUI: showNewNavigationUI:
req.query && req.query.new_navigation_ui === 'true', req.query && req.query.new_navigation_ui === 'true',
showReactFileTree: !wantsOldFileTreeUI, showReactFileTree: !wantsOldFileTreeUI,
showReactShareModal: user.betaProgram && !wantsOldShareModalUI, showReactShareModal: !wantsOldShareModalUI,
showReactAddFilesModal: showReactAddFilesModal:
user.betaProgram && !wantsOldAddFilesModalUI, user.betaProgram && !wantsOldAddFilesModalUI,
showReactGithubSync: !wantsOldGithubSyncUI && user.alphaProgram showReactGithubSync: !wantsOldGithubSyncUI && user.alphaProgram

12
services/web/frontend/js/features/share-project-modal/components/share-project-modal-content.js
View file

@ -1,12 +1,11 @@
import React from 'react' import React from 'react'
import { Button, Modal, Grid } from 'react-bootstrap' import { Button, Modal, Grid } from 'react-bootstrap'
import { Trans, useTranslation } from 'react-i18next' import { Trans } from 'react-i18next'
import ShareModalBody from './share-modal-body' import ShareModalBody from './share-modal-body'
import Icon from '../../../shared/components/icon' import Icon from '../../../shared/components/icon'
import AccessibleModal from '../../../shared/components/accessible-modal' import AccessibleModal from '../../../shared/components/accessible-modal'
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import { ReadOnlyTokenLink } from './link-sharing' import { ReadOnlyTokenLink } from './link-sharing'
import BetaBadge from '../../../shared/components/beta-badge'
export default function ShareProjectModalContent({ export default function ShareProjectModalContent({
show, show,
@ -15,20 +14,11 @@ export default function ShareProjectModalContent({
inFlight, inFlight,
error error
}) { }) {
const { t } = useTranslation()
const tooltip = {
id: 'create-file-beta-tooltip',
text: t('beta_badge_tooltip', { feature: 'project sharing' })
}
return ( return (
<AccessibleModal show={show} onHide={cancel} animation={animation}> <AccessibleModal show={show} onHide={cancel} animation={animation}>
<Modal.Header closeButton> <Modal.Header closeButton>
<Modal.Title> <Modal.Title>
<Trans i18nKey="share_project" /> <Trans i18nKey="share_project" />
&nbsp;&nbsp;
<BetaBadge tooltip={tooltip} />
</Modal.Title> </Modal.Title>
</Modal.Header> </Modal.Header>