kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
Use correct 'Import data' link for Mastodon
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>merge-requests/834/head
rodzic
916bf7a634
commit
d4f32e1219
|
@ -284,10 +284,17 @@ class SidebarMenu extends ImmutablePureComponent {
|
||||||
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.preferences)}</span>
|
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.preferences)}</span>
|
||||||
</a>
|
</a>
|
||||||
)}
|
)}
|
||||||
<NavLink className='sidebar-menu-item' to='/settings/import' onClick={this.handleClose}>
|
{features.importAPI ? (
|
||||||
<Icon src={require('@tabler/icons/icons/cloud-upload.svg')} />
|
<NavLink className='sidebar-menu-item' to='/settings/import' onClick={this.handleClose}>
|
||||||
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.import_data)}</span>
|
<Icon src={require('@tabler/icons/icons/cloud-upload.svg')} />
|
||||||
</NavLink>
|
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.import_data)}</span>
|
||||||
|
</NavLink>
|
||||||
|
) : (
|
||||||
|
<a className='sidebar-menu-item' href={`${baseURL}/settings/import`} onClick={this.handleClose}>
|
||||||
|
<Icon src={require('@tabler/icons/icons/cloud-upload.svg')} />
|
||||||
|
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.import_data)}</span>
|
||||||
|
</a>
|
||||||
|
)}
|
||||||
{(features.federating && features.accountAliasesAPI) && <NavLink className='sidebar-menu-item' to='/settings/aliases' onClick={this.handleClose}>
|
{(features.federating && features.accountAliasesAPI) && <NavLink className='sidebar-menu-item' to='/settings/aliases' onClick={this.handleClose}>
|
||||||
<Icon src={require('@tabler/icons/icons/briefcase.svg')} />
|
<Icon src={require('@tabler/icons/icons/briefcase.svg')} />
|
||||||
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.account_aliases)}</span>
|
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.account_aliases)}</span>
|
||||||
|
|
|
@ -6,19 +6,22 @@ import { Link } from 'react-router-dom';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { openModal } from '../../../actions/modal';
|
import { openModal } from '../../../actions/modal';
|
||||||
import { logOut } from 'soapbox/actions/auth';
|
import { logOut } from 'soapbox/actions/auth';
|
||||||
import { isAdmin } from 'soapbox/utils/accounts';
|
import { getBaseURL, isAdmin } from 'soapbox/utils/accounts';
|
||||||
import sourceCode from 'soapbox/utils/code';
|
import sourceCode from 'soapbox/utils/code';
|
||||||
import { getFeatures } from 'soapbox/utils/features';
|
import { getFeatures } from 'soapbox/utils/features';
|
||||||
|
|
||||||
const mapStateToProps = state => {
|
const mapStateToProps = state => {
|
||||||
const me = state.get('me');
|
const me = state.get('me');
|
||||||
|
const account = state.getIn(['accounts', me]);
|
||||||
const instance = state.get('instance');
|
const instance = state.get('instance');
|
||||||
const features = getFeatures(instance);
|
const features = getFeatures(instance);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
account: state.getIn(['accounts', me]),
|
account,
|
||||||
federating: features.federating,
|
federating: features.federating,
|
||||||
showAliases: features.accountAliasesAPI,
|
showAliases: features.accountAliasesAPI,
|
||||||
|
importAPI: features.importAPI,
|
||||||
|
baseURL: getBaseURL(account),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -32,7 +35,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const LinkFooter = ({ onOpenHotkeys, account, federating, showAliases, onClickLogOut }) => (
|
const LinkFooter = ({ onOpenHotkeys, account, federating, showAliases, importAPI, onClickLogOut, baseURL }) => (
|
||||||
<div className='getting-started__footer'>
|
<div className='getting-started__footer'>
|
||||||
<ul>
|
<ul>
|
||||||
{account && <>
|
{account && <>
|
||||||
|
@ -44,7 +47,11 @@ const LinkFooter = ({ onOpenHotkeys, account, federating, showAliases, onClickLo
|
||||||
{isAdmin(account) && <li><a href='/pleroma/admin'><FormattedMessage id='navigation_bar.admin_settings' defaultMessage='AdminFE' /></a></li>}
|
{isAdmin(account) && <li><a href='/pleroma/admin'><FormattedMessage id='navigation_bar.admin_settings' defaultMessage='AdminFE' /></a></li>}
|
||||||
{isAdmin(account) && <li><Link to='/soapbox/config'><FormattedMessage id='navigation_bar.soapbox_config' defaultMessage='Soapbox config' /></Link></li>}
|
{isAdmin(account) && <li><Link to='/soapbox/config'><FormattedMessage id='navigation_bar.soapbox_config' defaultMessage='Soapbox config' /></Link></li>}
|
||||||
<li><Link to='/settings/export'><FormattedMessage id='navigation_bar.export_data' defaultMessage='Export data' /></Link></li>
|
<li><Link to='/settings/export'><FormattedMessage id='navigation_bar.export_data' defaultMessage='Export data' /></Link></li>
|
||||||
<li><Link to='/settings/import'><FormattedMessage id='navigation_bar.import_data' defaultMessage='Import data' /></Link></li>
|
<li>{importAPI ? (
|
||||||
|
<Link to='/settings/import'><FormattedMessage id='navigation_bar.import_data' defaultMessage='Import data' /></Link>
|
||||||
|
) : (
|
||||||
|
<a href={`${baseURL}/settings/import`}><FormattedMessage id='navigation_bar.import_data' defaultMessage='Import data' /></a>
|
||||||
|
)}</li>
|
||||||
{(federating && showAliases) && <li><Link to='/settings/aliases'><FormattedMessage id='navigation_bar.account_aliases' defaultMessage='Account aliases' /></Link></li>}
|
{(federating && showAliases) && <li><Link to='/settings/aliases'><FormattedMessage id='navigation_bar.account_aliases' defaultMessage='Account aliases' /></Link></li>}
|
||||||
<li><a href='#' onClick={onOpenHotkeys}><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></a></li>
|
<li><a href='#' onClick={onOpenHotkeys}><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></a></li>
|
||||||
</>}
|
</>}
|
||||||
|
@ -70,8 +77,10 @@ LinkFooter.propTypes = {
|
||||||
account: ImmutablePropTypes.map,
|
account: ImmutablePropTypes.map,
|
||||||
federating: PropTypes.bool,
|
federating: PropTypes.bool,
|
||||||
showAliases: PropTypes.bool,
|
showAliases: PropTypes.bool,
|
||||||
|
importAPI: PropTypes.bool,
|
||||||
onOpenHotkeys: PropTypes.func.isRequired,
|
onOpenHotkeys: PropTypes.func.isRequired,
|
||||||
onClickLogOut: PropTypes.func.isRequired,
|
onClickLogOut: PropTypes.func.isRequired,
|
||||||
|
baseURL: PropTypes.string,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(LinkFooter));
|
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(LinkFooter));
|
||||||
|
|
|
@ -44,6 +44,7 @@ export const getFeatures = createSelector([
|
||||||
emojiReactsRGI: v.software === PLEROMA && gte(v.version, '2.2.49'),
|
emojiReactsRGI: v.software === PLEROMA && gte(v.version, '2.2.49'),
|
||||||
attachmentLimit: v.software === PLEROMA ? Infinity : 4,
|
attachmentLimit: v.software === PLEROMA ? Infinity : 4,
|
||||||
focalPoint: v.software === MASTODON && gte(v.compatVersion, '2.3.0'),
|
focalPoint: v.software === MASTODON && gte(v.compatVersion, '2.3.0'),
|
||||||
|
importAPI: v.software === PLEROMA,
|
||||||
importMutes: v.software === PLEROMA && gte(v.version, '2.2.0'),
|
importMutes: v.software === PLEROMA && gte(v.version, '2.2.0'),
|
||||||
emailList: features.includes('email_list'),
|
emailList: features.includes('email_list'),
|
||||||
chats: v.software === PLEROMA && gte(v.version, '2.1.0'),
|
chats: v.software === PLEROMA && gte(v.version, '2.1.0'),
|
||||||
|
|
Ładowanie…
Reference in New Issue