fix
commit
d150d895d4
151
package.json
151
package.json
|
@ -25,9 +25,8 @@
|
|||
"webpack-dev-server": "^1.14.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blueprintjs/core": "^1.22.0",
|
||||
"@blueprintjs/labs": "^0.3.0",
|
||||
"@types/classnames": "^2.2.0",
|
||||
"@blueprintjs/core": "^1.23.1",
|
||||
"@blueprintjs/labs": "^0.4.0",
|
||||
"@types/deep-freeze": "^0.1.1",
|
||||
"@types/enzyme": "^2.8.4",
|
||||
"@types/fastclick": "^1.0.28",
|
||||
|
@ -89,40 +88,134 @@
|
|||
"webpack": "^3.3.0",
|
||||
"webpack-uglify-js-plugin": "^1.1.9",
|
||||
"weinre": "^2.0.0-pre-I0Z7U9OV",
|
||||
"yarn": "^0.27.5"
|
||||
"yarn": "^0.27.5",
|
||||
"@types/moxios": "^0.4.2",
|
||||
"moxios": "^0.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/moxios": "^0.4.2",
|
||||
"jscpd": "^0.6.13",
|
||||
"moxios": "^0.4.0",
|
||||
"webpack-notifier": "^1.5.0"
|
||||
},
|
||||
"jest": {
|
||||
"moduleNameMapper": {
|
||||
"^.*\\.scss$": "<rootDir>/src/__test_support__/stub.ts"
|
||||
},
|
||||
"setupFiles": [
|
||||
"./src/unmock_i18next.ts",
|
||||
"./src/__test_support__/localstorage.js"
|
||||
],
|
||||
"transform": {
|
||||
".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
|
||||
"scripts": {
|
||||
"coverage": "cat **/*lcov.info | ./node_modules/coveralls/bin/coveralls.js",
|
||||
"build": "node_modules/webpack/bin/webpack.js --config tools/webpack.config.prd.js --display-error-details",
|
||||
"start": "echo '===We use `npm run dev` now.==='",
|
||||
"heroku-postbuild": "./install_frontend.sh 2>&1",
|
||||
"dev": "PORT=3000 bundle exec foreman start --procfile=Procfile.dev",
|
||||
"webpack": "webpack-dev-server --config tools/webpack.config.dev.js --content-base public/ --host 0.0.0.0",
|
||||
"test": "jest --coverage --no-cache"
|
||||
},
|
||||
"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
|
||||
"moduleFileExtensions": [
|
||||
"ts",
|
||||
"tsx",
|
||||
"js"
|
||||
"keywords": [
|
||||
"farmbot"
|
||||
],
|
||||
"mapCoverage": true,
|
||||
"collectCoverage": true,
|
||||
"collectCoverageFrom": [
|
||||
"src/**/*.{ts,tsx}"
|
||||
],
|
||||
"coverageReporters": [
|
||||
"html",
|
||||
"json",
|
||||
"lcov"
|
||||
]
|
||||
}
|
||||
}
|
||||
"author": "farmbot.io",
|
||||
"license": "MIT",
|
||||
"optionalDependencies": {
|
||||
"webpack-dev-server": "^1.14.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@blueprintjs/core": "^1.22.0",
|
||||
"@blueprintjs/labs": "^0.3.0",
|
||||
"@types/classnames": "^2.2.0",
|
||||
"@types/deep-freeze": "^0.1.1",
|
||||
"@types/enzyme": "^2.8.4",
|
||||
"@types/fastclick": "^1.0.28",
|
||||
"@types/handlebars": "^4.0.35",
|
||||
"@types/history": "^4.6.0",
|
||||
"@types/i18next": "^2.3.32",
|
||||
"@types/jest": "^20.0.4",
|
||||
"@types/lodash": "^4.14.71",
|
||||
"@types/markdown-it": "^0.0.2",
|
||||
"@types/mqtt": "^0.0.34",
|
||||
"@types/node": "^8.0.16",
|
||||
"@types/react": "^15.0.39",
|
||||
"@types/react-color": "^2.11.4",
|
||||
"@types/react-dom": "^15.5.1",
|
||||
"@types/react-redux": "^4.4.47",
|
||||
"@types/react-router": "3",
|
||||
"@types/redux": "^3.6.31",
|
||||
"axios": "^0.16.2",
|
||||
"boxed_value": "^1.0.0",
|
||||
"coveralls": "^2.13.0",
|
||||
"css-loader": "^0.28.4",
|
||||
"deep-freeze": "^0.0.1",
|
||||
"enzyme": "^2.9.1",
|
||||
"extract-text-webpack-plugin": "^2.1.2",
|
||||
"farmbot": "4.1.0",
|
||||
"farmbot-toastr": "^1.0.3",
|
||||
"fastclick": "^1.0.6",
|
||||
"file-loader": "^0.11.2",
|
||||
"handlebars": "^4.0.10",
|
||||
"i18next": "^8.4.3",
|
||||
"imports-loader": "^0.7.0",
|
||||
"jest": "^20.0.4",
|
||||
"json-loader": "^0.5.7",
|
||||
"lodash": "^4.17.4",
|
||||
"markdown-it": "^8.2.1",
|
||||
"markdown-it-emoji": "^1.4.0",
|
||||
"moment": "^2.18.1",
|
||||
"node-sass": "^4.5.3",
|
||||
"optimize-css-assets-webpack-plugin": "^2.0.0",
|
||||
"react": "^15.6.1",
|
||||
"react-addons-css-transition-group": "^15.6.0",
|
||||
"react-addons-test-utils": "^15.6.0",
|
||||
"react-color": "^2.13.4",
|
||||
"react-dom": "^15.6.1",
|
||||
"react-redux": "^5.0.5",
|
||||
"react-router": "^3.0.0",
|
||||
"react-test-renderer": "^15.6.1",
|
||||
"redux": "^3.7.2",
|
||||
"redux-immutable-state-invariant": "^2.0.0",
|
||||
"redux-thunk": "^2.0.1",
|
||||
"sass-loader": "^6.0.6",
|
||||
"style-loader": "^0.18.2",
|
||||
"ts-jest": "^20.0.7",
|
||||
"ts-lint": "^4.5.1",
|
||||
"ts-loader": "^2.3.1",
|
||||
"tslint": "^5.5.0",
|
||||
"typescript": "^2.4.2",
|
||||
"url-loader": "^0.5.9",
|
||||
"webpack": "^3.3.0",
|
||||
"webpack-uglify-js-plugin": "^1.1.9",
|
||||
"weinre": "^2.0.0-pre-I0Z7U9OV",
|
||||
"yarn": "^0.27.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/moxios": "^0.4.2",
|
||||
"jscpd": "^0.6.13",
|
||||
"moxios": "^0.4.0",
|
||||
"webpack-notifier": "^1.5.0"
|
||||
},
|
||||
"jest": {
|
||||
"moduleNameMapper": {
|
||||
"^.*\\.scss$": "<rootDir>/src/__test_support__/stub.ts"
|
||||
},
|
||||
"setupFiles": [
|
||||
"./src/unmock_i18next.ts",
|
||||
"./src/__test_support__/localstorage.js"
|
||||
],
|
||||
"transform": {
|
||||
".(ts|tsx)": "<rootDir>/node_modules/ts-jest/preprocessor.js"
|
||||
},
|
||||
"testRegex": "(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$",
|
||||
"moduleFileExtensions": [
|
||||
"ts",
|
||||
"tsx",
|
||||
"js"
|
||||
],
|
||||
"mapCoverage": true,
|
||||
"collectCoverage": true,
|
||||
"collectCoverageFrom": [
|
||||
"src/**/*.{ts,tsx}"
|
||||
],
|
||||
"coverageReporters": [
|
||||
"html",
|
||||
"json",
|
||||
"lcov"
|
||||
]
|
||||
}
|
||||
}
|
|
@ -16,6 +16,7 @@ export function mapStateToProps(state: Everything): FarmEventProps {
|
|||
return { calendarRows, push };
|
||||
}
|
||||
|
||||
/** TODO: Reduce complexity, but write *good* unit tests *before* refactoring.*/
|
||||
export function mapResourcesToCalendar(ri: ResourceIndex, unixNow = moment.now()): Calendar {
|
||||
let x = joinFarmEventsToExecutable(ri);
|
||||
let calendar = new Calendar();
|
||||
|
@ -30,13 +31,16 @@ export function mapResourcesToCalendar(ri: ResourceIndex, unixNow = moment.now()
|
|||
.clone()
|
||||
.startOf("day")
|
||||
.add(regi.time_offset, "milliseconds");
|
||||
if (m2.isBefore(unixNow)) { return; }
|
||||
let o = occurrence(m2, fe);
|
||||
let seq = findSequenceById(ri, regi.sequence_id);
|
||||
let sequenceName = seq.body.name;
|
||||
o.parentExecutableName = fe.executable.name;
|
||||
o.childExecutableName = sequenceName;
|
||||
calendar.insert(o);
|
||||
if (m2.isBefore(m)) {
|
||||
return;
|
||||
} else {
|
||||
let o = occurrence(m2, fe);
|
||||
let seq = findSequenceById(ri, regi.sequence_id);
|
||||
let sequenceName = seq.body.name;
|
||||
o.parentExecutableName = fe.executable.name;
|
||||
o.childExecutableName = sequenceName;
|
||||
calendar.insert(o);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue