Skip to content

Commit

Permalink
add list title editing
Browse files Browse the repository at this point in the history
  • Loading branch information
ashkitten authored and ClearlyClaire committed Jan 6, 2019
1 parent 7baf156 commit dc501c4
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { changeListEditorTitle, submitListEditor } from 'flavours/glitch/actions/lists';
import IconButton from 'flavours/glitch/components/icon_button';
import { defineMessages, injectIntl } from 'react-intl';

const messages = defineMessages({
title: { id: 'lists.edit.submit', defaultMessage: 'Change title' },
});

const mapStateToProps = state => ({
value: state.getIn(['listEditor', 'title']),
disabled: !state.getIn(['listEditor', 'isChanged']),
});

const mapDispatchToProps = dispatch => ({
onChange: value => dispatch(changeListEditorTitle(value)),
onSubmit: () => dispatch(submitListEditor(false)),
});

@connect(mapStateToProps, mapDispatchToProps)
@injectIntl
export default class ListForm extends React.PureComponent {

static propTypes = {
value: PropTypes.string.isRequired,
disabled: PropTypes.bool,
intl: PropTypes.object.isRequired,
onChange: PropTypes.func.isRequired,
onSubmit: PropTypes.func.isRequired,
};

handleChange = e => {
this.props.onChange(e.target.value);
}

handleSubmit = e => {
e.preventDefault();
this.props.onSubmit();
}

handleClick = () => {
this.props.onSubmit();
}

render () {
const { value, disabled, intl } = this.props;

const title = intl.formatMessage(messages.title);

return (
<form className='column-inline-form' onSubmit={this.handleSubmit}>
<input
className='setting-text'
value={value}
onChange={this.handleChange}
/>

<IconButton
disabled={disabled}
icon='check'
title={title}
onClick={this.handleClick}
/>
</form>
);
}

}
7 changes: 3 additions & 4 deletions app/javascript/flavours/glitch/features/list_editor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import { injectIntl } from 'react-intl';
import { setupListEditor, clearListSuggestions, resetListEditor } from 'flavours/glitch/actions/lists';
import AccountContainer from './containers/account_container';
import SearchContainer from './containers/search_container';
import EditListForm from './components/edit_list_form';
import Motion from 'flavours/glitch/util/optional_motion';
import spring from 'react-motion/lib/spring';

const mapStateToProps = state => ({
title: state.getIn(['listEditor', 'title']),
accountIds: state.getIn(['listEditor', 'accounts', 'items']),
searchAccountIds: state.getIn(['listEditor', 'suggestions', 'items']),
});
Expand All @@ -33,7 +33,6 @@ export default class ListEditor extends ImmutablePureComponent {
onInitialize: PropTypes.func.isRequired,
onClear: PropTypes.func.isRequired,
onReset: PropTypes.func.isRequired,
title: PropTypes.string.isRequired,
accountIds: ImmutablePropTypes.list.isRequired,
searchAccountIds: ImmutablePropTypes.list.isRequired,
};
Expand All @@ -49,12 +48,12 @@ export default class ListEditor extends ImmutablePureComponent {
}

render () {
const { title, accountIds, searchAccountIds, onClear } = this.props;
const { accountIds, searchAccountIds, onClear } = this.props;
const showSearch = searchAccountIds.size > 0;

return (
<div className='modal-root__modal list-editor'>
<h4>{title}</h4>
<EditListForm />

<SearchContainer />

Expand Down
11 changes: 9 additions & 2 deletions app/javascript/flavours/glitch/reducers/list_editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
const initialState = ImmutableMap({
listId: null,
isSubmitting: false,
isChanged: false,
title: '',

accounts: ImmutableMap({
Expand All @@ -47,10 +48,16 @@ export default function listEditorReducer(state = initialState, action) {
map.set('isSubmitting', false);
});
case LIST_EDITOR_TITLE_CHANGE:
return state.set('title', action.value);
return state.withMutations(map => {
map.set('title', action.value);
map.set('isChanged', true);
});
case LIST_CREATE_REQUEST:
case LIST_UPDATE_REQUEST:
return state.set('isSubmitting', true);
return state.withMutations(map => {
map.set('isSubmitting', true);
map.set('isChanged', false);
});
case LIST_CREATE_FAIL:
case LIST_UPDATE_FAIL:
return state.set('isSubmitting', false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@

.icon-button {
flex: 0 0 auto;
margin-left: 5px;
margin: 0 5px;
}
}

Expand Down

0 comments on commit dc501c4

Please sign in to comment.