Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 3960 Template editor of feature info settings has slow response on typing #3965

Merged
merged 2 commits into from
Jul 16, 2019
Merged

Fix 3960 Template editor of feature info settings has slow response on typing #3965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7dc154b
add internal state to feature info editor to reduce on change calls
allyoucanmap Jul 15, 2019
478bbe3
add default state in feature info editor component
allyoucanmap Jul 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 74 additions & 35 deletions web/client/components/TOC/fragments/settings/FeatureInfoEditor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

const React = require('react');
const PropTypes = require('prop-types');
const ReactQuill = require('react-quill');
const ResizableModal = require('../../../misc/ResizableModal');
const Portal = require('../../../misc/Portal');
Expand All @@ -31,38 +32,76 @@ Quill.register({
* @prop {bool} enableIFrameModule enable iframe in editor, default true
*/

module.exports = ({onShowEditor = () => {}, showEditor, element = {}, onChange = () => {}, enableIFrameModule = true}) =>(
<Portal>
<ResizableModal
fade
show={showEditor}
title={<Message msgId="layerProperties.editCustomFormat"/>}
size="lg"
showFullscreen
clickOutEnabled={false}
onClose={() => onShowEditor(!showEditor)}
buttons={[
{
bsStyle: 'primary',
text: <Message msgId="close"/>,
onClick: () => onShowEditor(!showEditor)
}
]}>
<div id="ms-template-editor" className="ms-editor">
<ReactQuill
bounds="#ms-template-editor"
modules={enableIFrameModule ? {
resizeModule: {},
toolbar: toolbarConfig
} : {}}
defaultValue={element.featureInfo && element.featureInfo.template || ' '}
onChange={template => {
onChange('featureInfo', {
...(element && element.featureInfo || {}),
template
});
}}/>
</div>
</ResizableModal>
</Portal>
);
class FeatureInfoEditor extends React.Component {

static propTypes = {
showEditor: PropTypes.bool,
element: PropTypes.object,
onChange: PropTypes.func,
onShowEditor: PropTypes.func,
enableIFrameModule: PropTypes.bool
};

static defaultProps = {
showEditor: false,
element: {},
enableIFrameModule: false,
onChange: () => {},
onShowEditor: () => {}
};

state = {
template: ' '
};

componentWillMount() {
this.setState({
template: this.props.element && this.props.element.featureInfo && this.props.element.featureInfo.template || ' '
});
}

render() {
const { showEditor, enableIFrameModule = true } = this.props;
return (
<Portal>
<ResizableModal
fade
show={showEditor}
title={<Message msgId="layerProperties.editCustomFormat"/>}
size="lg"
showFullscreen
clickOutEnabled={false}
onClose={() => this.close()}
buttons={[
{
bsStyle: 'primary',
text: <Message msgId="close"/>,
onClick: () => this.close()
}
]}>
<div id="ms-template-editor" className="ms-editor">
<ReactQuill
bounds="#ms-template-editor"
ref={(quill) => { if (quill) { this.quill = quill; } } }
modules={enableIFrameModule ? {
resizeModule: {},
toolbar: toolbarConfig
} : {}}
defaultValue={this.state.template}
onChange={template => this.setState({ template })}/>
</div>
</ResizableModal>
</Portal>
);
}

close = () => {
this.props.onShowEditor(!this.props.showEditor);
this.props.onChange('featureInfo', {
...(this.props.element && this.props.element.featureInfo || {}),
template: this.state.template
});
};
}

module.exports = FeatureInfoEditor;
40 changes: 36 additions & 4 deletions web/client/components/TOC/fragments/settings/__tests__/FeatureInfoEditor-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,67 @@ describe("test FeatureInfoEditor", () => {
});

it('test rendering close x', () => {
const template = '<p>html</p>';

const testHandlers = {
onShowEditor: () => {}
onShowEditor: () => {},
onChange: () => {}
};
const spyOnShowEditor = expect.spyOn(testHandlers, 'onShowEditor');
const spyOnChange = expect.spyOn(testHandlers, 'onChange');

ReactDOM.render(<FeatureInfoEditor onShowEditor={testHandlers.onShowEditor} showEditor/>, document.getElementById("container"));
const cmp = ReactDOM.render(<FeatureInfoEditor
onChange={testHandlers.onChange}
onShowEditor={testHandlers.onShowEditor}
showEditor/>, document.getElementById("container"));
const modalEditor = document.getElementsByClassName('ms-resizable-modal');
expect(modalEditor.length).toBe(1);

// edit template
const editor = cmp.quill.getEditor();
editor.clipboard.dangerouslyPasteHTML(template);
expect(spyOnChange).toNotHaveBeenCalled();
spyOnChange.reset();

const btns = document.getElementsByClassName('ms-header-btn');
expect(btns.length).toBe(2);
TestUtils.Simulate.click(btns[1]);
expect(spyOnShowEditor).toHaveBeenCalled();

expect(spyOnShowEditor).toHaveBeenCalled();
expect(spyOnChange.calls[0].arguments).toEqual([ 'featureInfo', { template } ]);
});

it('test rendering close button', () => {

const template = '<p>html</p>';

const testHandlers = {
onShowEditor: () => {}
onShowEditor: () => {},
onChange: () => {}
};

const spyOnShowEditor = expect.spyOn(testHandlers, 'onShowEditor');
const spyOnChange = expect.spyOn(testHandlers, 'onChange');

ReactDOM.render(<FeatureInfoEditor onShowEditor={testHandlers.onShowEditor} showEditor/>, document.getElementById("container"));
const cmp = ReactDOM.render(<FeatureInfoEditor
onChange={testHandlers.onChange}
onShowEditor={testHandlers.onShowEditor}
showEditor/>, document.getElementById("container"));
const modalEditor = document.getElementsByClassName('ms-resizable-modal');
expect(modalEditor.length).toBe(1);

// edit template
const editor = cmp.quill.getEditor();
editor.clipboard.dangerouslyPasteHTML(template);
expect(spyOnChange).toNotHaveBeenCalled();
spyOnChange.reset();

const btns = document.getElementsByClassName('btn');
expect(btns.length).toBe(1);
TestUtils.Simulate.click(btns[0]);
expect(spyOnShowEditor).toHaveBeenCalled();
expect(spyOnChange.calls[0].arguments).toEqual([ 'featureInfo', { template } ]);
});

});