From 319d20e9d51160e49c4b121ad00ded89d1f1f0a7 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 8 Jan 2018 11:09:56 -0500 Subject: [PATCH 1/4] :arrow_up: dashboard v1.14.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c037f09..19334a48 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "buildings", - "version": "1.13.0", + "version": "1.14.0", "private": true, "engines": { "node": ">=8" -- GitLab From cd6abf36ab81ea7120037c420bcdee5ffe9609dd Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 8 Jan 2018 11:10:33 -0500 Subject: [PATCH 2/4] Add smoke test for SensorGraph --- src/containers/Sensors/SensorGraph.js | 8 ++++---- src/containers/Sensors/SensorGraph.test.js | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/containers/Sensors/SensorGraph.test.js diff --git a/src/containers/Sensors/SensorGraph.js b/src/containers/Sensors/SensorGraph.js index d682acb7..950f2550 100644 --- a/src/containers/Sensors/SensorGraph.js +++ b/src/containers/Sensors/SensorGraph.js @@ -20,7 +20,7 @@ import { subtractDaysFromNow } from '../../utils/date'; import { GRAPH_COLORS } from './colors'; -class Sensors extends Component { +export class SensorGraph extends Component { NUM_DAYS = 4; // eslint-disable-line constructor(props) { @@ -291,7 +291,7 @@ class Sensors extends Component { } } -Sensors.propTypes = { +SensorGraph.propTypes = { buildingId: PropTypes.string, className: PropTypes.string, loadAllNodeData: PropTypes.func, @@ -299,7 +299,7 @@ Sensors.propTypes = { buildingArea: PropTypes.object, // eslint-disable-line }; -Sensors.defaultProps = { +SensorGraph.defaultProps = { className: '', }; @@ -316,4 +316,4 @@ const mapDispatchToProps = dispatch => ( }, dispatch) ); -export default connect(mapStateToProps, mapDispatchToProps)(Sensors); +export default connect(mapStateToProps, mapDispatchToProps)(SensorGraph); diff --git a/src/containers/Sensors/SensorGraph.test.js b/src/containers/Sensors/SensorGraph.test.js new file mode 100644 index 00000000..1bc5a764 --- /dev/null +++ b/src/containers/Sensors/SensorGraph.test.js @@ -0,0 +1,18 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import { SensorGraph } from './SensorGraph'; + +const sensorInitialState = { + loading: false, + error: false, + sensorData: [], +} + +it('renders without crashing', () => { + const div = document.createElement('div'); + ReactDOM.render( + {}} + />, div); +}); -- GitLab From d5d7324ff622a1c5ea81896c08067101648f27e2 Mon Sep 17 00:00:00 2001 From: Alessandro DiMarco Date: Mon, 22 Jan 2018 15:26:44 -0500 Subject: [PATCH 3/4] Disable camel case errors --- .env.default | 27 ++++++++++++++++++++++++ .eslintrc.json | 2 ++ package-lock.json | 2 +- src/components/TurkHit/index.js | 3 ++- src/containers/Envelope/index.js | 2 +- src/containers/Envelope/retrofitTable.js | 4 ++-- src/containers/Sensors/Sensors.js | 4 ++-- 7 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 .env.default diff --git a/.env.default b/.env.default new file mode 100644 index 00000000..9460ac93 --- /dev/null +++ b/.env.default @@ -0,0 +1,27 @@ +ENVIRONMENT +NODE_ENV + +REACT_APP_KEY +REACT_APP_FEEDBACK_LINK +REACT_APP_GOOGLE_CLIENT +REACT_APP_GA_TRACKING_ID + +# Services +REACT_APP_BUILDING_SERVICE +REACT_APP_UTILITY_SERVICE +REACT_APP_DOCUMENT_SERVICE +REACT_APP_PROJECT_SERVICE +REACT_APP_REPORT_SERVICE +REACT_APP_IOT_SERVICE +REACT_APP_USER_SERVICE +REACT_APP_GOOGLE_CLIENT +REACT_APP_COUCH_DB_URL +REACT_APP_BLOCLINK_URL +REACT_APP_BLOCNOTE_URL + +# AUTH0 +REACT_APP_AUTH0_DOMAIN +REACT_APP_AUTH0_CLIENT_ID +REACT_APP_AUTH0_CALLBACK_URL +REACT_APP_AUTH0_CLAIMS_NAMESPACE +REACT_APP_AUTH0_AUDIENCE diff --git a/.eslintrc.json b/.eslintrc.json index 0251ca47..61ce849a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -28,7 +28,9 @@ "import/prefer-default-export": "off" }, "env": { + "es6": true, "browser": true, + "commonjs": true, "jest": true } } diff --git a/package-lock.json b/package-lock.json index 2f82cfde..5b104203 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "buildings", - "version": "1.13.0", + "version": "1.14.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/components/TurkHit/index.js b/src/components/TurkHit/index.js index 1452a161..e31712d2 100644 --- a/src/components/TurkHit/index.js +++ b/src/components/TurkHit/index.js @@ -13,6 +13,7 @@ import userPropType from '../../containers/User/propTypes'; // Need to call this to load the 3D highcharts module Highcharts3D(ReactHighcharts.Highcharts); + class TurkHit extends Component { constructor(props) { super(props); @@ -595,7 +596,7 @@ class TurkHit extends Component { ) renderCreateHitButton = () => { - const { createHitConfirmation, address, building_id } = this.props; + const { createHitConfirmation, address, building_id } = this.props; // eslint-disable-line return (