toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-15218 allow interactive dialogs to have no elements (#3090)

Browse source
This commit is contained in:
Mattermost Build 2019-08-09 14:31:13 +02:00 committed by Elias Nahum
parent 18b7a3c0a1
commit a5f8b9bdcc
2 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
app/screens/interactive_dialog/interactive_dialog.js
View file

@ -19,7 +19,7 @@ export default class InteractiveDialog extends PureComponent {
static propTypes = {
url: PropTypes.string.isRequired,
callbackId: PropTypes.string,
elements: PropTypes.arrayOf(PropTypes.object).isRequired,
elements: PropTypes.arrayOf(PropTypes.object),
notifyOnCancel: PropTypes.bool,
state: PropTypes.string,
theme: PropTypes.object,
@ -38,9 +38,11 @@ export default class InteractiveDialog extends PureComponent {
super(props);
const values = {};
props.elements.forEach((e) => {
values[e.name] = e.default || null;
});
if (props.elements != null) {
props.elements.forEach((e) => {
values[e.name] = e.default || null;
});
}
this.state = {
values,
@ -69,18 +71,21 @@ export default class InteractiveDialog extends PureComponent {
const {elements} = this.props;
const values = this.state.values;
const errors = {};
elements.forEach((elem) => {
const error = checkDialogElementForError(elem, values[elem.name]);
if (error) {
errors[elem.name] = (
<FormattedText
id={error.id}
defaultMessage={error.defaultMessage}
values={error.values}
/>
);
}
});
if (elements) {
elements.forEach((elem) => {
const error = checkDialogElementForError(elem, values[elem.name]);
if (error) {
errors[elem.name] = (
<FormattedText
id={error.id}
defaultMessage={error.defaultMessage}
values={error.values}
/>
);
}
});
}
this.setState({errors});
@ -152,7 +157,7 @@ export default class InteractiveDialog extends PureComponent {
<View style={style.container}>
<ScrollView style={style.scrollView}>
<StatusBar/>
{elements.map((e) => {
{elements && elements.map((e) => {
return (
<DialogElement
key={'dialogelement' + e.name}
@ -190,4 +195,4 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme) => {
marginTop: 10,
},
};
});
});

22
app/screens/interactive_dialog/interactive_dialog.test.js
View file

@ -84,4 +84,26 @@ describe('InteractiveDialog', () => {
wrapper.instance().navigationButtonPressed({buttonId: 'close-dialog'});
expect(baseProps.actions.submitInteractiveDialog).not.toHaveBeenCalled();
});
test('should handle display with no elements', async () => {
baseProps.elements = null;
const wrapper = shallow(
<InteractiveDialog
{...baseProps}
notifyOnCancel={false}
/>,
);
const dialog = {
url: baseProps.url,
callback_id: baseProps.callbackId,
state: baseProps.state,
submission: {},
};
wrapper.instance().handleSubmit();
expect(baseProps.actions.submitInteractiveDialog).toHaveBeenCalledTimes(1);
expect(baseProps.actions.submitInteractiveDialog).toHaveBeenCalledWith(dialog);
});
});