remove firmware setting section

frontend/constants.ts

@@ -1870,16 +1870,13 @@ export enum DeviceSetting {
   osAutoUpdate = `auto update`,
   farmbotOS = `Farmbot OS`,
   bootSequence = `Boot Sequence`,
-
-  // Firmware
-  firmwareSection = `Firmware`,
   firmware = `Firmware`,
   firmwarePath = `Firmware path`,
-  restartFirmware = `Restart Firmware`,
   flashFirmware = `Flash firmware`,
 
   // Power and Reset
   powerAndReset = `Power and Reset`,
+  restartFirmware = `Restart Firmware`,
   restartFarmbot = `Restart Farmbot`,
   shutdownFarmbot = `Shutdown Farmbot`,
   softReset = `Soft Reset`,

frontend/settings/fbos_settings/__tests__/farmbot_os_settings_test.tsx

@@ -2,26 +2,42 @@ jest.mock("../boot_sequence_selector", () => ({
   BootSequenceSelector: () => <div />
 }));
 
+const mockDevice = {
+  flashFirmware: jest.fn((_) => Promise.resolve()),
+};
+jest.mock("../../../device", () => ({ getDevice: () => mockDevice }));
+
 import React from "react";
 import { FarmBotSettings } from "../farmbot_os_settings";
-import { shallow } from "enzyme";
+import { mount, shallow } from "enzyme";
 import { bot } from "../../../__test_support__/fake_state/bot";
 import { FarmbotSettingsProps } from "../interfaces";
 import { fakeTimeSettings } from "../../../__test_support__/fake_time_settings";
-import { fakeDevice } from "../../../__test_support__/resource_index_builder";
+import {
+  buildResourceIndex, fakeDevice,
+} from "../../../__test_support__/resource_index_builder";
 import { settingsPanelState } from "../../../__test_support__/panel_state";
+import { clickButton } from "../../../__test_support__/helpers";
+import { fakeFbosConfig } from "../../../__test_support__/fake_state/resources";
+import { fakeState } from "../../../__test_support__/fake_state";
+import { isFunction } from "lodash";
 
 describe("<FarmBotSettings />", () => {
+  const fakeConfig = fakeFbosConfig();
+  const state = fakeState();
+  state.resources = buildResourceIndex([fakeConfig, fakeDevice()]);
+
   const fakeProps = (): FarmbotSettingsProps => ({
     device: fakeDevice(),
-    dispatch: jest.fn(),
+    dispatch: jest.fn(x => isFunction(x) && x(jest.fn(), () => state)),
     bot,
     alerts: [],
     botOnline: true,
     sourceFbosConfig: x =>
       ({ value: bot.hardware.configuration[x], consistent: true }),
     timeSettings: fakeTimeSettings(),
     settingsPanelState: settingsPanelState(),
+    showAdvanced: true,
   });
 
   it("displays boot sequence selector", () => {
@@ -30,4 +46,14 @@ describe("<FarmBotSettings />", () => {
     const osSettings = shallow(<FarmBotSettings {...p} />);
     expect(osSettings.find("BootSequenceSelector").length).toEqual(1);
   });
+
+  it("flashes firmware", () => {
+    const p = fakeProps();
+    p.settingsPanelState.farmbot_settings = true;
+    p.sourceFbosConfig = () => ({ value: "arduino", consistent: true });
+    const wrapper = mount(<FarmBotSettings {...p} />);
+    expect(wrapper.text().toLowerCase()).toContain("flash");
+    clickButton(wrapper, 5, "flash");
+    expect(mockDevice.flashFirmware).toHaveBeenCalledWith("arduino");
+  });
 });

frontend/settings/fbos_settings/__tests__/power_and_reset_test.tsx

@@ -11,6 +11,7 @@ import { fakeFbosConfig } from "../../../__test_support__/fake_state/resources";
 import {
   buildResourceIndex,
 } from "../../../__test_support__/resource_index_builder";
+import { clickButton } from "../../../__test_support__/helpers";
 
 describe("<PowerAndReset/>", () => {
   const fakeConfig = fakeFbosConfig();
@@ -21,6 +22,7 @@ describe("<PowerAndReset/>", () => {
     settingsPanelState: settingsPanelState(),
     dispatch: jest.fn(x => x(jest.fn(), () => state)),
     botOnline: true,
+    showAdvanced: true,
   });
 
   it("renders in open state", () => {
@@ -41,4 +43,14 @@ describe("<PowerAndReset/>", () => {
     expect(wrapper.text().toLowerCase())
       .not.toContain("Soft Reset".toLowerCase());
   });
+
+  it("restarts firmware", () => {
+    const p = fakeProps();
+    p.settingsPanelState.power_and_reset = true;
+    const wrapper = mount(<PowerAndReset {...p} />);
+    expect(wrapper.text().toLowerCase())
+      .toContain("Restart Firmware".toLowerCase());
+    clickButton(wrapper, 0, "restart");
+    expect(mockDevice.rebootFirmware).toHaveBeenCalled();
+  });
 });

frontend/settings/fbos_settings/boot_sequence_selector.tsx

@@ -72,14 +72,12 @@ export class RawBootSequenceSelector
   render() {
     return <Highlight settingName={DeviceSetting.bootSequence}>
       <Row>
-        <Col xs={12}>
+        <Col xs={5}>
           <label>
             {t("BOOT SEQUENCE")}
           </label>
         </Col>
-      </Row>
-      <Row>
-        <Col xs={12} className="no-pad">
+        <Col xs={7} className="no-pad">
           <this.SelectionInput />
         </Col>
       </Row>

frontend/settings/fbos_settings/farmbot_os_settings.tsx

@@ -12,6 +12,9 @@ import { DeviceSetting } from "../../constants";
 import { Collapse } from "@blueprintjs/core";
 import { OrderNumberRow } from "./order_number_row";
 import { GardenLocationRow } from "./garden_location_row";
+import { BoardType } from "../firmware/board_type";
+import { FirmwarePathRow } from "../firmware/firmware_path";
+import { validFirmwareHardware } from "../firmware/firmware_hardware_support";
 
 export enum ColWidth {
   label = 3,
@@ -23,6 +26,8 @@ export const FarmBotSettings = (props: FarmbotSettingsProps) => {
   const {
     dispatch, device, timeSettings, sourceFbosConfig, botOnline,
   } = props;
+  const { value } = props.sourceFbosConfig("firmware_hardware");
+  const firmwareHardware = validFirmwareHardware(value);
   const commonProps = { dispatch, device };
   return <Highlight className={"section"}
     settingName={DeviceSetting.farmbotSettings}>
@@ -47,6 +52,18 @@ export const FarmBotSettings = (props: FarmbotSettingsProps) => {
         botOnline={botOnline}
         timeSettings={timeSettings} />
       <BootSequenceSelector />
+      <BoardType
+        botOnline={botOnline}
+        bot={props.bot}
+        alerts={props.alerts}
+        dispatch={props.dispatch}
+        timeSettings={props.timeSettings}
+        firmwareHardware={firmwareHardware}
+        sourceFbosConfig={sourceFbosConfig} />
+      <FirmwarePathRow
+        dispatch={props.dispatch}
+        firmwarePath={"" + sourceFbosConfig("firmware_path").value}
+        showAdvanced={props.showAdvanced} />
     </Collapse>
   </Highlight>;
 };

frontend/settings/fbos_settings/fbos_button_row.tsx

@@ -10,11 +10,15 @@ export interface FbosButtonRowProps {
   description: string;
   buttonText: string;
   color: string;
+  advanced?: boolean;
+  showAdvanced?: boolean;
   action: () => void;
 }
 
 export const FbosButtonRow = (props: FbosButtonRowProps) => {
-  return <Highlight settingName={props.label}>
+  return <Highlight settingName={props.label}
+    hidden={props.advanced && !props.showAdvanced}
+    className={props.advanced ? "advanced" : ""}>
     <Row>
       <Col xs={7}>
         <label>

frontend/settings/fbos_settings/interfaces.ts

@@ -11,6 +11,7 @@ export interface FarmbotSettingsProps {
   timeSettings: TimeSettings;
   botOnline: boolean;
   settingsPanelState: SettingsPanelState;
+  showAdvanced: boolean;
 }
 
 export interface NameRowProps {
@@ -57,6 +58,7 @@ export interface PowerAndResetProps {
   settingsPanelState: SettingsPanelState;
   dispatch: Function;
   botOnline: boolean;
+  showAdvanced: boolean;
 }
 
 export interface FactoryResetRowsProps {

frontend/settings/fbos_settings/ota_time_selector.tsx

@@ -3,7 +3,6 @@ import moment from "moment";
 import { t } from "../../i18next_wrapper";
 import { FBSelect, Row, Col, DropDownItem, Help } from "../../ui";
 import { edit, save } from "../../api/crud";
-import { ColWidth } from "./farmbot_os_settings";
 import { Content, DeviceSetting } from "../../constants";
 import { Highlight } from "../maybe_highlight";
 import { OtaTimeSelectorProps, OtaTimeSelectorRowProps } from "./interfaces";
@@ -75,7 +74,7 @@ export function OtaTimeSelectorRow(props: OtaTimeSelectorRowProps) {
         </label>
         <Help text={Content.OS_AUTO_UPDATE} />
       </Col>
-      <Col xs={ColWidth.description}>
+      <Col xs={7}>
         <OtaTimeSelector
           sourceFbosConfig={props.sourceFbosConfig}
           timeSettings={props.timeSettings}

frontend/settings/fbos_settings/power_and_reset.tsx

@@ -5,7 +5,7 @@ import { FactoryResetRows } from "./factory_reset_row";
 import { PowerAndResetProps } from "./interfaces";
 import { FbosButtonRow } from "./fbos_button_row";
 import { Content, DeviceSetting } from "../../constants";
-import { reboot, powerOff } from "../../devices/actions";
+import { reboot, powerOff, restartFirmware } from "../../devices/actions";
 import { t } from "../../i18next_wrapper";
 import { Highlight } from "../maybe_highlight";
 
@@ -20,6 +20,15 @@ export function PowerAndReset(props: PowerAndResetProps) {
       panel={"power_and_reset"}
       dispatch={dispatch} />
     <Collapse isOpen={!!power_and_reset}>
+      <FbosButtonRow
+        botOnline={botOnline}
+        label={DeviceSetting.restartFirmware}
+        description={Content.RESTART_FIRMWARE}
+        buttonText={t("RESTART")}
+        color={"yellow"}
+        advanced={true}
+        showAdvanced={props.showAdvanced}
+        action={() => { restartFirmware(); }} />
       <FbosButtonRow
         botOnline={botOnline}
         label={DeviceSetting.restartFarmbot}

frontend/settings/firmware/board_type.tsx

@@ -1,7 +1,6 @@
 import React from "react";
 import { Row, Col, DropDownItem, FBSelect } from "../../ui";
 import { info } from "../../toast/toast";
-import { ColWidth } from "../fbos_settings/farmbot_os_settings";
 import { updateConfig } from "../../devices/actions";
 import { BoardTypeProps } from "./interfaces";
 import { t } from "../../i18next_wrapper";
@@ -50,12 +49,12 @@ export class BoardType extends React.Component<BoardTypeProps, {}> {
   render() {
     return <Highlight settingName={DeviceSetting.firmware}>
       <Row>
-        <Col xs={ColWidth.label}>
+        <Col xs={2}>
           <label>
             {t("FIRMWARE")}
           </label>
         </Col>
-        <Col xs={ColWidth.button}>
+        <Col xs={1}>
           <FirmwareHardwareStatus
             botOnline={this.props.botOnline}
             apiFirmwareValue={this.props.firmwareHardware}
@@ -64,14 +63,13 @@ export class BoardType extends React.Component<BoardTypeProps, {}> {
             dispatch={this.props.dispatch}
             timeSettings={this.props.timeSettings} />
         </Col>
-        <Col xs={ColWidth.description}>
+        <Col xs={2}>
           <FlashFirmwareBtn
+            short={true}
             apiFirmwareValue={this.props.firmwareHardware}
             botOnline={this.props.botOnline} />
         </Col>
-      </Row>
-      <Row>
-        <Col xs={12} className="no-pad">
+        <Col xs={7} className="no-pad">
           <this.FirmwareSelection />
         </Col>
       </Row>