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

Update react-pdf to 1.6.1 Closes #1533 #1555

Merged
merged 1 commit into from
Mar 14, 2017
Merged

Update react-pdf to 1.6.1 Closes #1533 #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@
"leaflet.locatecontrol": "0.45.1",
"lodash": "4.16.6",
"moment": "2.13.0",
"node-uuid": "1.4.3",
"object-assign": "4.1.1",
"ogc-schemas": "2.6.1",
"openlayers": "4.0.1",
Expand All @@ -117,13 +116,13 @@
"react-dnd-html5-backend": "2.2.3",
"react-dock": "0.2.3",
"react-dom": "15.4.2",
"react-draggable": "1.3.4",
"react-draggable": "2.2.3",
"react-dropzone": "3.4.0",
"react-intl": "2.2.3",
"react-joyride": "1.10.1",
"react-nouislider": "1.11.0",
"react-overlays": "0.6.3",
"react-pdf": "0.0.10",
"react-pdf": "1.6.1",
"react-redux": "4.4.1",
"react-router": "2.5.2",
"react-router-redux": "3.0.0",
Expand Down Expand Up @@ -151,6 +150,7 @@
"turf-point-on-surface": "3.0.10",
"turf-union": "3.0.10",
"url": "0.10.3",
"uuid": "3.0.1",
"w3c-schemas": "1.3.1",
"xml2js": "0.4.17"
},
Expand Down
2 changes: 1 addition & 1 deletion web/client/actions/mapInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

const assign = require('object-assign');
const axios = require('axios');
const uuid = require('node-uuid');
const uuid = require('uuid');
const GeoCodingApi = require('../api/Nominatim');

const LOAD_FEATURE_INFO = 'LOAD_FEATURE_INFO';
Expand Down
2 changes: 1 addition & 1 deletion web/client/actions/vectorstyler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/
const uuid = require('node-uuid');
const uuid = require('uuid');

const SET_VECTOR_RULE_PARAMETER = 'SET_VECTOR_RULE_PARAMETER';
const NEW_VECTOR_RULE = 'NEW_VECTOR_RULE';
Expand Down
2 changes: 1 addition & 1 deletion web/client/components/TOC/background/BackgroundSwitcher.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ let BackgroundSwitcher = React.createClass({
},
render() {
return (
<Grid id={this.props.id} className="BackgroundSwitcherComponent" header={this.props.name} fluid={this.props.fluid}>{this.renderBackgrounds()}</Grid>
<Grid id={this.props.id} className="BackgroundSwitcherComponent" fluid={this.props.fluid}>{this.renderBackgrounds()}</Grid>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is header not needed anymore?

Copy link
Contributor Author

@Gnafu Gnafu Mar 14, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it ever was, header is not a property of Grid

);
},
changeLayerVisibility(eventObj) {
Expand Down
2 changes: 1 addition & 1 deletion web/client/components/print/PrintOption.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const PrintOption = React.createClass({
};
},
onChange() {
this.props.onChange(this.refs.input.getInputDOMNode().checked);
this.props.onChange(!this.refs.input.props.checked);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you inverting the value?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the old one.
getInputDOMNode() just returns null

},
render() {
return (
Expand Down
30 changes: 15 additions & 15 deletions web/client/components/print/PrintPreview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
const React = require('react');

const {Button, Glyphicon} = require('react-bootstrap');
const PDF = require('react-pdf');
const ReactPDF = require('react-pdf').default;

const PrintPreview = React.createClass({
propTypes: {
Expand All @@ -32,7 +32,7 @@ const PrintPreview = React.createClass({
scale: 1.0,
minScale: 0.25,
maxScale: 8.0,
currentPage: 1,
currentPage: 0,
pages: 1,
zoomFactor: 2.0,
back: () => {},
Expand All @@ -44,49 +44,49 @@ const PrintPreview = React.createClass({
};
},
onDocumentComplete(pages) {
this.props.setPages(pages);
this.props.setPages(pages && pages.total || 0);
},
render() {
if (window.PDFJS) {
return (
<div>
<div style={this.props.style}>
<PDF file={this.props.url} scale={this.props.scale} page={this.props.currentPage} onDocumentComplete={this.onDocumentComplete}/>
<ReactPDF file={this.props.url} scale={this.props.scale} pageIndex={this.props.currentPage} onDocumentLoad={this.onDocumentComplete}/>
</div>
<div style={{marginTop: "10px"}}>
<Button bsStyle={this.props.buttonStyle} style={{marginRight: "10px"}} onClick={this.props.back}><Glyphicon glyph="arrow-left"/></Button>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.scale >= this.props.maxScale} onClick={this.zoomIn}><Glyphicon glyph="zoom-in"/></Button>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.scale <= this.props.minScale} onClick={this.zoomOut}><Glyphicon glyph="zoom-out"/></Button>
<label style={{marginLeft: "10px", marginRight: "10px"}}>{this.props.scale}x</label>
<div className={"print-download btn btn-" + this.props.buttonStyle}><a href={this.props.url} target="_blank"><Glyphicon glyph="save"/></a></div>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.currentPage === 1} onClick={this.firstPage}><Glyphicon glyph="step-backward"/></Button>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.currentPage === 1} onClick={this.prevPage}><Glyphicon glyph="chevron-left"/></Button>
<label style={{marginLeft: "10px", marginRight: "10px"}}>{this.props.currentPage} / {this.props.pages}</label>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.currentPage === this.props.pages} onClick={this.nextPage}><Glyphicon glyph="chevron-right"/></Button>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.currentPage === this.props.pages} onClick={this.lastPage}><Glyphicon glyph="step-forward"/></Button>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.currentPage === 0} onClick={this.firstPage}><Glyphicon glyph="step-backward"/></Button>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.currentPage === 0} onClick={this.prevPage}><Glyphicon glyph="chevron-left"/></Button>
<label style={{marginLeft: "10px", marginRight: "10px"}}>{this.props.currentPage + 1} / {this.props.pages}</label>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.currentPage === this.props.pages - 1} onClick={this.nextPage}><Glyphicon glyph="chevron-right"/></Button>
<Button bsStyle={this.props.buttonStyle} disabled={this.props.currentPage === this.props.pages - 1} onClick={this.lastPage}><Glyphicon glyph="step-forward"/></Button>
</div>
</div>
);
}
return null;
},
firstPage() {
if (this.props.currentPage > 1) {
this.props.setPage(1);
if (this.props.currentPage > 0) {
this.props.setPage(0);
}
},
lastPage() {
if (this.props.currentPage < this.props.pages) {
this.props.setPage(this.props.pages);
if (this.props.currentPage < this.props.pages - 1 ) {
this.props.setPage(this.props.pages - 1);
}
},
prevPage() {
if (this.props.currentPage > 1) {
if (this.props.currentPage > 0) {
this.props.setPage(this.props.currentPage - 1);
}
},
nextPage() {
if (this.props.currentPage < this.props.pages) {
if (this.props.currentPage < this.props.pages - 1) {
this.props.setPage(this.props.currentPage + 1);
}
},
Expand Down
24 changes: 8 additions & 16 deletions web/client/components/print/__tests__/PrintPreview-test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,42 +48,34 @@ describe("Test the PrintPreview component", () => {
expect(node).toExist();
});

it('creates component and loads pdf', (done) => {
const handler = (pages) => {
expect(pages).toBe(10);
done();
};
ReactDOM.render(<PrintPreview setPages={handler} url="base/web/client/test-resources/print.pdf"/>, document.getElementById("container"));
});

it('pdf next page', (done) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove this test?

Copy link
Contributor Author

@Gnafu Gnafu Mar 14, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was testing ReactPDF and it is no longer mockable

const handler = (page) => {
expect(page).toBe(2);
done();
};
const cmp = ReactDOM.render(<PrintPreview pages={10} currentPage={1} setPage={handler} url="base/web/client/test-resources/print.pdf"/>, document.getElementById("container"));
const cmp = ReactDOM.render(<PrintPreview pages={10} currentPage={1} setPage={handler} url=""/>, document.getElementById("container"));
expect(cmp).toExist();
const node = ReactDOM.findDOMNode(cmp);
ReactTestUtils.Simulate.click(node.getElementsByTagName('button')[5]);
});

it('pdf last page', (done) => {
const handler = (page) => {
expect(page).toBe(10);
expect(page).toBe(9);
done();
};
const cmp = ReactDOM.render(<PrintPreview pages={10} currentPage={1} setPage={handler} url="base/web/client/test-resources/print.pdf"/>, document.getElementById("container"));
const cmp = ReactDOM.render(<PrintPreview pages={10} currentPage={1} setPage={handler} url=""/>, document.getElementById("container"));
expect(cmp).toExist();
const node = ReactDOM.findDOMNode(cmp);
ReactTestUtils.Simulate.click(node.getElementsByTagName('button')[6]);
});

it('pdf first page', (done) => {
const handler = (page) => {
expect(page).toBe(1);
expect(page).toBe(0);
done();
};
const cmp = ReactDOM.render(<PrintPreview pages={10} currentPage={10} setPage={handler} url="base/web/client/test-resources/print.pdf"/>, document.getElementById("container"));
const cmp = ReactDOM.render(<PrintPreview pages={10} currentPage={10} setPage={handler} url=""/>, document.getElementById("container"));
expect(cmp).toExist();
const node = ReactDOM.findDOMNode(cmp);
ReactTestUtils.Simulate.click(node.getElementsByTagName('button')[3]);
Expand All @@ -94,7 +86,7 @@ describe("Test the PrintPreview component", () => {
expect(page).toBe(9);
done();
};
const cmp = ReactDOM.render(<PrintPreview pages={10} currentPage={10} setPage={handler} url="base/web/client/test-resources/print.pdf"/>, document.getElementById("container"));
const cmp = ReactDOM.render(<PrintPreview pages={10} currentPage={10} setPage={handler} url=""/>, document.getElementById("container"));
expect(cmp).toExist();
const node = ReactDOM.findDOMNode(cmp);
ReactTestUtils.Simulate.click(node.getElementsByTagName('button')[4]);
Expand All @@ -106,7 +98,7 @@ describe("Test the PrintPreview component", () => {
done();
};
const cmp = ReactDOM.render(<PrintPreview zoomFactor={2.0} scale={1.0}
pages={10} currentPage={1} setScale={handler} url="base/web/client/test-resources/print.pdf"/>, document.getElementById("container"));
pages={10} currentPage={1} setScale={handler} url=""/>, document.getElementById("container"));
expect(cmp).toExist();
const node = ReactDOM.findDOMNode(cmp);
ReactTestUtils.Simulate.click(node.getElementsByTagName('button')[1]);
Expand All @@ -118,7 +110,7 @@ describe("Test the PrintPreview component", () => {
done();
};
const cmp = ReactDOM.render(<PrintPreview zoomFactor={2.0} scale={4.0}
pages={10} currentPage={1} setScale={handler} url="base/web/client/test-resources/print.pdf"/>, document.getElementById("container"));
pages={10} currentPage={1} setScale={handler} url=""/>, document.getElementById("container"));
expect(cmp).toExist();
const node = ReactDOM.findDOMNode(cmp);
ReactTestUtils.Simulate.click(node.getElementsByTagName('button')[2]);
Expand Down
2 changes: 1 addition & 1 deletion web/client/plugins/Print.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ const Print = React.createClass({
},
print() {
const spec = this.props.getPrintSpecification(this.props.printSpec);
this.props.setPage(1);
this.props.setPage(0);
this.props.onBeforePrint();
this.props.onPrint(this.props.capabilities.createURL, spec);
}
Expand Down
2 changes: 1 addition & 1 deletion web/client/plugins/print/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const PrintSubmit = connect((state) => ({
const PrintPreview = connect((state) => ({
url: state.print && ConfigUtils.getProxiedUrl(state.print.pdfUrl),
scale: state.controls && state.controls.print && state.controls.print.viewScale || 0.5,
currentPage: state.controls && state.controls.print && state.controls.print.currentPage || 1,
currentPage: state.controls && state.controls.print && state.controls.print.currentPage || 0,
pages: state.controls && state.controls.print && state.controls.print.pages || 1
}), {
back: printCancel,
Expand Down