bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value

Browse source
This commit is contained in:
crockwave 2020-08-04 18:05:16 -05:00
parent eeaf9f0b8e
commit 3d24cfaf53
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/soapbox/features/edit_profile/index.js
View file

@ -20,8 +20,6 @@ import {
import { patchMe } from 'soapbox/actions/me'; import { patchMe } from 'soapbox/actions/me';
import { unescape } from 'lodash'; import { unescape } from 'lodash';
const MAX_FIELDS = 4; // TODO: Make this dynamic by the instance
const messages = defineMessages({ const messages = defineMessages({
heading: { id: 'column.edit_profile', defaultMessage: 'Edit profile' }, heading: { id: 'column.edit_profile', defaultMessage: 'Edit profile' },
metaFieldLabel: { id: 'edit_profile.fields.meta_fields.label_placeholder', defaultMessage: 'Label' }, metaFieldLabel: { id: 'edit_profile.fields.meta_fields.label_placeholder', defaultMessage: 'Label' },
@ -32,12 +30,13 @@ const mapStateToProps = state => {
const me = state.get('me'); const me = state.get('me');
return { return {
account: state.getIn(['accounts', me]), account: state.getIn(['accounts', me]),
maxFields: state.getIn(['instance', 'pleroma', 'metadata', 'fieldsLimits', 'maxFields']),
}; };
}; };
// Forces fields to be MAX_SIZE, filling empty values // Forces fields to be maxFields size, filling empty values
const normalizeFields = fields => ( const normalizeFields = (fields, maxFields) => (
ImmutableList(fields).setSize(MAX_FIELDS).map(field => ImmutableList(fields).setSize(maxFields).map(field =>
field ? field : ImmutableMap({ name: '', value: '' }) field ? field : ImmutableMap({ name: '', value: '' })
) )
); );
@ -57,11 +56,11 @@ class EditProfile extends ImmutablePureComponent {
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
account: ImmutablePropTypes.map, account: ImmutablePropTypes.map,
maxFields: PropTypes.number,
}; };
state = { state = {
isLoading: false, isLoading: false,
fields: normalizeFields(Array.from({ length: MAX_FIELDS })),
} }
constructor(props) { constructor(props) {
@ -69,7 +68,7 @@ class EditProfile extends ImmutablePureComponent {
const initialState = props.account.withMutations(map => { const initialState = props.account.withMutations(map => {
map.merge(map.get('source')); map.merge(map.get('source'));
map.delete('source'); map.delete('source');
map.set('fields', normalizeFields(map.get('fields'))); map.set('fields', normalizeFields(map.get('fields'), props.maxFields));
unescapeParams(map, ['display_name', 'note']); unescapeParams(map, ['display_name', 'note']);
}); });
this.state = initialState.toObject(); this.state = initialState.toObject();
@ -156,7 +155,7 @@ class EditProfile extends ImmutablePureComponent {
} }
render() { render() {
const { intl } = this.props; const { intl, maxFields } = this.props;
return ( return (
<Column icon='user' heading={intl.formatMessage(messages.heading)} backBtnSlim> <Column icon='user' heading={intl.formatMessage(messages.heading)} backBtnSlim>
@ -214,7 +213,7 @@ class EditProfile extends ImmutablePureComponent {
<div className='input with_block_label'> <div className='input with_block_label'>
<label><FormattedMessage id='edit_profile.fields.meta_fields_label' defaultMessage='Profile metadata' /></label> <label><FormattedMessage id='edit_profile.fields.meta_fields_label' defaultMessage='Profile metadata' /></label>
<span className='hint'> <span className='hint'>
<FormattedMessage id='edit_profile.hints.meta_fields' defaultMessage='You can have up to {count, plural, one {# item} other {# items}} displayed as a table on your profile' values={{ count: MAX_FIELDS }} /> <FormattedMessage id='edit_profile.hints.meta_fields' defaultMessage='You can have up to {count, plural, one {# item} other {# items}} displayed as a table on your profile' values={{ count: maxFields }} />
</span> </span>
{ {
this.state.fields.map((field, i) => ( this.state.fields.map((field, i) => (

1
app/soapbox/reducers/instance.js
View file

@ -12,6 +12,7 @@ const nodeinfoToInstance = nodeinfo => {
account_activation_required: nodeinfo.getIn(['metadata', 'accountActivationRequired']), account_activation_required: nodeinfo.getIn(['metadata', 'accountActivationRequired']),
features: nodeinfo.getIn(['metadata', 'features']), features: nodeinfo.getIn(['metadata', 'features']),
federation: nodeinfo.getIn(['metadata', 'federation']), federation: nodeinfo.getIn(['metadata', 'federation']),
fieldsLimits: nodeinfo.getIn(['metadata', 'fieldsLimits']),
}), }),
}), }),
}); });