Added ProUpgradeModal to group creation action buttons and page
• Added: - ProUpgradeModal to group creation action buttons and page if not pro or if not admin of edit group
This commit is contained in:
parent
bfa842f2d5
commit
8c047868e3
@ -18,9 +18,14 @@ import {
|
|||||||
setGroup,
|
setGroup,
|
||||||
resetEditor,
|
resetEditor,
|
||||||
} from '../actions/group_editor'
|
} from '../actions/group_editor'
|
||||||
import { closeModal } from '../actions/modal'
|
import {
|
||||||
|
openModal,
|
||||||
|
closeModal,
|
||||||
|
} from '../actions/modal'
|
||||||
import { fetchGroup } from '../actions/groups'
|
import { fetchGroup } from '../actions/groups'
|
||||||
import { fetchGroupCategories } from '../actions/group_categories'
|
import { fetchGroupCategories } from '../actions/group_categories'
|
||||||
|
import { me } from '../initial_state'
|
||||||
|
import { MODAL_PRO_UPGRADE } from '../constants'
|
||||||
import ColumnIndicator from '../components/column_indicator'
|
import ColumnIndicator from '../components/column_indicator'
|
||||||
import Button from '../components/button'
|
import Button from '../components/button'
|
||||||
import Divider from '../components/divider'
|
import Divider from '../components/divider'
|
||||||
@ -70,11 +75,17 @@ class GroupCreate extends ImmutablePureComponent {
|
|||||||
|
|
||||||
handleSubmit = (e) => {
|
handleSubmit = (e) => {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
|
|
||||||
|
// if not pro and not admin of group show pro upgrade modal
|
||||||
|
if (!this.props.isPro && !this.props.isAdmin) {
|
||||||
|
this.props.onOpenProUpgradeModal()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if (this.props.onClose) this.props.onClose()
|
if (this.props.onClose) this.props.onClose()
|
||||||
this.props.onSubmit(this.context.router.history)
|
this.props.onSubmit(this.context.router.history)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
group,
|
group,
|
||||||
@ -100,12 +111,25 @@ class GroupCreate extends ImmutablePureComponent {
|
|||||||
groupId,
|
groupId,
|
||||||
categories,
|
categories,
|
||||||
isAdmin,
|
isAdmin,
|
||||||
|
isPro,
|
||||||
} = this.props
|
} = this.props
|
||||||
|
|
||||||
if (!group && groupId) {
|
if (!group && groupId) {
|
||||||
return <ColumnIndicator type='loading' />
|
return <ColumnIndicator type='loading' />
|
||||||
} else if ((!group && error) || (groupId && !isAdmin)) {
|
} else if ((!group && error) || (groupId && !isAdmin)) {
|
||||||
return <ColumnIndicator type='missing' />
|
return <ColumnIndicator type='missing' />
|
||||||
|
} else if (!isPro && !groupId) {
|
||||||
|
return <ColumnIndicator type='error' message={(
|
||||||
|
<React.Fragment>
|
||||||
|
<Text>You must be a GabPRO member to create a group.</Text>
|
||||||
|
<Button
|
||||||
|
onClick={this.props.onOpenProUpgradeModal}
|
||||||
|
className={[_s.mt15, _s.mlAuto, _s.mrAuto].join(' ')}
|
||||||
|
>
|
||||||
|
Learn more
|
||||||
|
</Button>
|
||||||
|
</React.Fragment>
|
||||||
|
)} />
|
||||||
}
|
}
|
||||||
|
|
||||||
const memberCount = group ? group.get('member_count') : 0
|
const memberCount = group ? group.get('member_count') : 0
|
||||||
@ -298,6 +322,7 @@ const mapStateToProps = (state, { params }) => {
|
|||||||
isPrivate: state.getIn(['group_editor', 'isPrivate']),
|
isPrivate: state.getIn(['group_editor', 'isPrivate']),
|
||||||
isVisible: state.getIn(['group_editor', 'isVisible']),
|
isVisible: state.getIn(['group_editor', 'isVisible']),
|
||||||
categories: state.getIn(['group_categories', 'items']),
|
categories: state.getIn(['group_categories', 'items']),
|
||||||
|
isPro: state.getIn(['accounts', me, 'is_pro']),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -341,7 +366,10 @@ const mapDispatchToProps = (dispatch) => ({
|
|||||||
},
|
},
|
||||||
onFetchGroupCategories() {
|
onFetchGroupCategories() {
|
||||||
dispatch(fetchGroupCategories())
|
dispatch(fetchGroupCategories())
|
||||||
}
|
},
|
||||||
|
onOpenProUpgradeModal() {
|
||||||
|
dispatch(openModal(MODAL_PRO_UPGRADE))
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
GroupCreate.propTypes = {
|
GroupCreate.propTypes = {
|
||||||
@ -362,6 +390,7 @@ GroupCreate.propTypes = {
|
|||||||
onResetEditor: PropTypes.func.isRequired,
|
onResetEditor: PropTypes.func.isRequired,
|
||||||
onSetGroup: PropTypes.func.isRequired,
|
onSetGroup: PropTypes.func.isRequired,
|
||||||
onSubmit: PropTypes.func.isRequired,
|
onSubmit: PropTypes.func.isRequired,
|
||||||
|
onOpenProUpgradeModal: PropTypes.func.isRequired,
|
||||||
isSubmitting: PropTypes.bool,
|
isSubmitting: PropTypes.bool,
|
||||||
isAdmin: PropTypes.bool,
|
isAdmin: PropTypes.bool,
|
||||||
onClose: PropTypes.func,
|
onClose: PropTypes.func,
|
||||||
|
@ -8,6 +8,8 @@ import Text from '../components/text'
|
|||||||
import DefaultLayout from '../layouts/default_layout'
|
import DefaultLayout from '../layouts/default_layout'
|
||||||
import GroupsCollection from '../features/groups_collection'
|
import GroupsCollection from '../features/groups_collection'
|
||||||
import WrappedBundle from '../features/ui/util/wrapped_bundle'
|
import WrappedBundle from '../features/ui/util/wrapped_bundle'
|
||||||
|
import { openModal } from '../actions/modal'
|
||||||
|
import { MODAL_PRO_UPGRADE } from '../constants'
|
||||||
import {
|
import {
|
||||||
GroupsPanel,
|
GroupsPanel,
|
||||||
LinkFooter,
|
LinkFooter,
|
||||||
@ -15,6 +17,10 @@ import {
|
|||||||
|
|
||||||
class GroupsPage extends React.PureComponent {
|
class GroupsPage extends React.PureComponent {
|
||||||
|
|
||||||
|
handleOpenProUpgradeModal = () => {
|
||||||
|
this.props.dispatch(openModal(MODAL_PRO_UPGRADE))
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const {
|
const {
|
||||||
activeTab,
|
activeTab,
|
||||||
@ -66,7 +72,8 @@ class GroupsPage extends React.PureComponent {
|
|||||||
{
|
{
|
||||||
title: 'Create',
|
title: 'Create',
|
||||||
icon: 'add',
|
icon: 'add',
|
||||||
to: '/groups/create',
|
to: isPro ? '/groups/create' : undefined,
|
||||||
|
onClick: isPro ? undefined : this.handleOpenProUpgradeModal,
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
tabs={tabs}
|
tabs={tabs}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user