dep updates (fe)

pull/1667/head
gabrielburnworth 2020-01-24 11:46:05 -08:00
parent 3b2422607f
commit 981d005423
3 changed files with 30 additions and 22 deletions

View File

@ -5,3 +5,14 @@ jest.mock("browser-speech", () => ({
jest.mock("../open_farm/cached_crop", () => ({ jest.mock("../open_farm/cached_crop", () => ({
cachedCrop: jest.fn(() => Promise.resolve({ svg_icon: "icon" })), cachedCrop: jest.fn(() => Promise.resolve({ svg_icon: "icon" })),
})); }));
const { ancestorOrigins } = window.location;
delete window.location;
window.location = {
assign: jest.fn(),
reload: jest.fn(),
replace: jest.fn(),
ancestorOrigins,
pathname: "", href: "", hash: "", search: "",
hostname: "", origin: "", port: "", protocol: "", host: "",
};

View File

@ -13,7 +13,6 @@ import { BoardType } from "./fbos_settings/board_type";
import { FarmbotOsRow } from "./fbos_settings/farmbot_os_row"; import { FarmbotOsRow } from "./fbos_settings/farmbot_os_row";
import { AutoUpdateRow } from "./fbos_settings/auto_update_row"; import { AutoUpdateRow } from "./fbos_settings/auto_update_row";
import { AutoSyncRow } from "./fbos_settings/auto_sync_row"; import { AutoSyncRow } from "./fbos_settings/auto_sync_row";
import { isUndefined } from "lodash";
import { PowerAndReset } from "./fbos_settings/power_and_reset"; import { PowerAndReset } from "./fbos_settings/power_and_reset";
import { SendDiagnosticReport } from "./send_diagnostic_report"; import { SendDiagnosticReport } from "./send_diagnostic_report";
import { BootSequenceSelector } from "./fbos_settings/boot_sequence_selector"; import { BootSequenceSelector } from "./fbos_settings/boot_sequence_selector";
@ -154,11 +153,9 @@ export class FarmbotOsSettings
botToMqttLastSeen={new Date(this.props.botToMqttLastSeen).getTime()} botToMqttLastSeen={new Date(this.props.botToMqttLastSeen).getTime()}
timeSettings={this.props.timeSettings} timeSettings={this.props.timeSettings}
deviceAccount={this.props.deviceAccount} /> deviceAccount={this.props.deviceAccount} />
{(location.host.includes("localhost") <AutoSyncRow
|| !isUndefined(sourceFbosConfig("auto_sync").value)) && dispatch={this.props.dispatch}
<AutoSyncRow sourceFbosConfig={sourceFbosConfig} />
dispatch={this.props.dispatch}
sourceFbosConfig={sourceFbosConfig} />}
{this.props.shouldDisplay(Feature.boot_sequence) && {this.props.shouldDisplay(Feature.boot_sequence) &&
<BootSequenceSelector />} <BootSequenceSelector />}
<PowerAndReset <PowerAndReset

View File

@ -24,22 +24,22 @@
"author": "farmbot.io", "author": "farmbot.io",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/core": "7.7.7", "@babel/core": "7.8.3",
"@blueprintjs/core": "3.22.3", "@blueprintjs/core": "3.23.1",
"@blueprintjs/datetime": "3.15.1", "@blueprintjs/datetime": "3.15.2",
"@blueprintjs/select": "3.11.2", "@blueprintjs/select": "3.11.2",
"@types/enzyme": "3.10.4", "@types/enzyme": "3.10.4",
"@types/jest": "24.0.25", "@types/jest": "24.9.1",
"@types/lodash": "4.14.149", "@types/lodash": "4.14.149",
"@types/markdown-it": "0.0.9", "@types/markdown-it": "0.0.9",
"@types/moxios": "0.4.9", "@types/moxios": "0.4.9",
"@types/node": "13.1.6", "@types/node": "13.5.0",
"@types/promise-timeout": "1.3.0", "@types/promise-timeout": "1.3.0",
"@types/react": "16.9.17", "@types/react": "16.9.19",
"@types/react-color": "3.0.1", "@types/react-color": "3.0.1",
"@types/react-dom": "16.9.4", "@types/react-dom": "16.9.5",
"@types/react-redux": "7.1.5", "@types/react-redux": "7.1.7",
"axios": "0.19.1", "axios": "0.19.2",
"boxed_value": "1.0.0", "boxed_value": "1.0.0",
"browser-speech": "1.1.1", "browser-speech": "1.1.1",
"coveralls": "3.0.9", "coveralls": "3.0.9",
@ -69,21 +69,21 @@
"redux": "4.0.5", "redux": "4.0.5",
"redux-immutable-state-invariant": "2.1.0", "redux-immutable-state-invariant": "2.1.0",
"redux-thunk": "2.3.0", "redux-thunk": "2.3.0",
"sass": "1.24.4", "sass": "1.25.0",
"sass-lint": "1.13.1", "sass-lint": "1.13.1",
"takeme": "0.11.3", "takeme": "0.11.3",
"ts-jest": "24.3.0", "ts-jest": "25.0.0",
"ts-lint": "4.5.1", "ts-lint": "4.5.1",
"tslint": "5.20.1", "tslint": "6.0.0",
"typescript": "3.7.4", "typescript": "3.7.5",
"which": "2.0.2" "which": "2.0.2"
}, },
"devDependencies": { "devDependencies": {
"jest": "24.9.0", "jest": "25.1.0",
"jest-cli": "24.9.0", "jest-cli": "25.1.0",
"jest-skipped-reporter": "0.0.5", "jest-skipped-reporter": "0.0.5",
"jest-junit": "10.0.0", "jest-junit": "10.0.0",
"jshint": "2.11.0-rc1", "jshint": "2.11.0",
"madge": "3.6.0" "madge": "3.6.0"
} }
} }