spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade FBJS, remove temporary type casts

pull/563/head
Rick Carlino 2017-12-11 13:16:57 -06:00
parent 8085e3492b
commit f1d725276c
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -52,7 +52,7 @@
"enzyme": "^3.1.0",
"enzyme-adapter-react-15": "^1.0.2",
"extract-text-webpack-plugin": "^3.0.1",
"farmbot": "5.2.0-rc5",
"farmbot": "5.2.0-rc6",
"farmbot-toastr": "^1.0.3",
"fastclick": "^1.0.6",
"file-loader": "^1.1.5",

4
spec/lib/celery_script/point_spec.rb
View File

@ -11,8 +11,8 @@ describe "Celery Script `point` node" do
args:{
location: {
kind:"point",
args: { pointer_type: Point.last.pointer.class.to_s,
pointer_id: Point.last.id }
args: { pointer_type: plant.class.to_s,
pointer_id: plant.id }
},
offset:{ kind:"coordinate", args:{ x: 0, y: 0, z: 0} },
speed: 100

4
webpack/logs/components/__tests__/settings_menu_test.tsx
View File

@ -36,6 +36,6 @@ describe("<LogsSettingsMenu />", () => {
testSettingToggle("sequence_init_log", 0);
testSettingToggle("sequence_body_log", 1);
testSettingToggle("sequence_complete_log", 2);
testSettingToggle("firmware_output_log" as ConfigurationName, 3);
testSettingToggle("firmware_input_log" as ConfigurationName, 4);
testSettingToggle("firmware_output_log", 3);
testSettingToggle("firmware_input_log", 4);
});

13
webpack/logs/components/settings_menu.tsx
View File

@ -6,7 +6,6 @@ import { ToggleButton } from "../../controls/toggle_button";
import { updateConfig } from "../../devices/actions";
import { noop } from "lodash";
import { LogSettingProps, LogsSettingsMenuProps } from "../interfaces";
import { ConfigurationName } from "farmbot";
const LogSetting = (props: LogSettingProps) => {
const { label, setting, toolTip, value, setFilterLevel } = props;
@ -20,8 +19,8 @@ const LogSetting = (props: LogSettingProps) => {
updateConfig({ [setting]: !value })(noop);
if (!value === true) {
switch (setting) {
case "firmware_output_log" as ConfigurationName:
case "firmware_input_log" as ConfigurationName:
case "firmware_output_log":
case "firmware_input_log":
setFilterLevel("debug")(3);
break;
case "sequence_init_log":
@ -68,15 +67,15 @@ export const LogsSettingsMenu = (props: LogsSettingsMenuProps) => {
*/}
<LogSetting
label={"Sent"}
setting={"firmware_output_log" as ConfigurationName}
setting={"firmware_output_log"}
toolTip={ToolTips.FIRMWARE_LOG_SENT}
value={!!configuration["firmware_output_log" as ConfigurationName]}
value={!!configuration["firmware_output_log"]}
setFilterLevel={setFilterLevel} />
<LogSetting
label={"Received"}
setting={"firmware_input_log" as ConfigurationName}
setting={"firmware_input_log"}
toolTip={ToolTips.FIRMWARE_LOG_RECEIVED}
value={!!configuration["firmware_input_log" as ConfigurationName]}
value={!!configuration["firmware_input_log"]}
setFilterLevel={setFilterLevel} />
</div>;
};

6
yarn.lock
View File

@ -1996,9 +1996,9 @@ farmbot-toastr@^1.0.0, farmbot-toastr@^1.0.3:
farmbot-toastr "^1.0.0"
typescript "^2.3.4"
farmbot@5.2.0-rc5:
version "5.2.0-rc5"
resolved "https://registry.yarnpkg.com/farmbot/-/farmbot-5.2.0-rc5.tgz#cf82dfa8391764068f9bffda2946a2ab50cb5ae4"
farmbot@5.2.0-rc6:
version "5.2.0-rc6"
resolved "https://registry.yarnpkg.com/farmbot/-/farmbot-5.2.0-rc6.tgz#8b4d5801cb974dfe19cf344d8d7edc7ff2405b66"
dependencies:
mqtt "^2.13.1"
typescript "^2.4.2"