minor missed step indicator updates

FarmBot · Jun 4, 2020 · e413fc6 · e413fc6
1 parent e9b9e81
commit e413fc6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/frontend/controls/__tests__/axis_display_group_test.ts b/frontend/controls/__tests__/axis_display_group_test.ts
@@ -6,6 +6,7 @@ jest.mock("../../account/dev/dev_support", () => ({
 import { mount } from "enzyme";
 import { AxisDisplayGroup } from "../axis_display_group";
 import { AxisDisplayGroupProps } from "../interfaces";
+import { MissedStepIndicator } from "../move/missed_step_indicator";
 
 describe("<AxisDisplayGroup />", () => {
   const fakeProps = (): AxisDisplayGroupProps => ({
@@ -44,7 +45,7 @@ describe("<AxisDisplayGroup />", () => {
 
   it("renders missed step indicator", () => {
     const p = fakeProps();
-    p.missedSteps = { x: 1, y: 2, z: 3 };
+    p.missedSteps = { x: 0, y: 2, z: 3 };
     const wrapper = mount(AxisDisplayGroup(p));
     expect(wrapper.find(".missed-step-indicator").length).toEqual(3);
   });
@@ -63,6 +64,18 @@ describe("<AxisDisplayGroup />", () => {
     expect(wrapper.find(".missed-step-indicator").length).toEqual(0);
   });
 
+  it("renders missed step indicator when idle", () => {
+    const p = fakeProps();
+    p.missedSteps = { x: 1, y: 2, z: 3 };
+    p.axisStates = { x: "idle", y: undefined, z: "stop" };
+    const wrapper = mount(AxisDisplayGroup(p));
+    const indicators = wrapper.find(MissedStepIndicator);
+    expect(indicators.length).toEqual(3);
+    expect(indicators.first().props().missedSteps).toEqual(0);
+    expect(indicators.at(1).props().missedSteps).toEqual(2);
+    expect(indicators.last().props().missedSteps).toEqual(3);
+  });
+
   it("renders axis state", () => {
     mockDev = true;
     const p = fakeProps();
@@ -72,11 +85,10 @@ describe("<AxisDisplayGroup />", () => {
     expect(wrapper.text()).toContain("idle");
   });
 
-  it("renders axis state", () => {
+  it("doesn't render axis state", () => {
     mockDev = false;
     const p = fakeProps();
-    p.busy = true;
-    p.axisStates = { x: "idle", y: "idle", z: "idle" };
+    p.axisStates = { x: undefined, y: undefined, z: undefined };
     const wrapper = mount(AxisDisplayGroup(p));
     expect(wrapper.text()).not.toContain("idle");
   });

diff --git a/frontend/controls/axis_display_group.tsx b/frontend/controls/axis_display_group.tsx
@@ -6,13 +6,14 @@ import { t } from "../i18next_wrapper";
 import { MissedStepIndicator } from "./move/missed_step_indicator";
 import { DevSettings } from "../account/dev/dev_support";
 
-const Axis = ({ axis, val, missedSteps, axisState, busy, index }: AxisProps) =>
+const Axis = ({ axis, val, missedSteps, axisState, index }: AxisProps) =>
   <Col xs={3} className={"index-" + index}>
-    {isNumber(missedSteps) && missedSteps > 0 &&
-      <MissedStepIndicator missedSteps={missedSteps} axis={axis} />}
+    {isNumber(missedSteps) && missedSteps >= 0 &&
+      <MissedStepIndicator
+        missedSteps={axisState == "idle" ? 0 : missedSteps}
+        axis={axis} />}
     <input disabled name={axis} value={isNumber(val) ? val : "---"} />
     {!isUndefined(axisState) && DevSettings.futureFeaturesEnabled() &&
-      busy &&
       <p>{t(axisState)}</p>}
   </Col>;
 

diff --git a/frontend/controls/move/__tests__/missed_step_indicator_test.tsx b/frontend/controls/move/__tests__/missed_step_indicator_test.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 import { mount } from "enzyme";
 import {
-  MissedStepIndicator, MissedStepIndicatorProps,
+  MissedStepIndicator, MissedStepIndicatorProps, MISSED_STEP_HISTORY_LENGTH,
 } from "../missed_step_indicator";
 import { range } from "lodash";
 
@@ -60,7 +60,8 @@ describe("<MissedStepIndicator />", () => {
     const wrapper = mount<MissedStepIndicator>(<MissedStepIndicator {...p} />);
     wrapper.setState({ history: range(30) });
     wrapper.instance().componentDidUpdate();
-    expect(wrapper.state().history).toEqual(range(6, 30).concat([10]));
+    const start = 30 - MISSED_STEP_HISTORY_LENGTH + 1;
+    expect(wrapper.state().history).toEqual(range(start, 30).concat([10]));
   });
 
   it.each<[

diff --git a/frontend/controls/move/missed_step_indicator.tsx b/frontend/controls/move/missed_step_indicator.tsx
@@ -4,7 +4,7 @@ import { Popover, Position } from "@blueprintjs/core";
 import { t } from "../../i18next_wrapper";
 import { Xyz } from "farmbot";
 
-const HISTORY_LENGTH = 25;
+export const MISSED_STEP_HISTORY_LENGTH = 10;
 
 enum StorageKey {
   x = "missed_step_history_x",
@@ -36,7 +36,7 @@ export class MissedStepIndicator
       this.props.missedSteps != last(this.state.history)) {
       const newHistory = [...this.state.history];
       newHistory.push(this.props.missedSteps);
-      this.setState({ history: newHistory.slice(-HISTORY_LENGTH) });
+      this.setState({ history: newHistory.slice(-MISSED_STEP_HISTORY_LENGTH) });
     }
   }
 

diff --git a/frontend/css/farm_designer/farm_designer_panels.scss b/frontend/css/farm_designer/farm_designer_panels.scss
@@ -933,6 +933,9 @@
   }
   .map-size-inputs {
     .row {
+      margin: 0;
+      padding: 0;
+      margin-top: 1rem;
       margin-bottom: 1rem;
     }
     label {