Merge branch 'staging' of github.com:FarmBot/Farmbot-Web-App into tue…

…sday

frontend/css/farm_designer/farm_designer_panels.scss

@@ -733,9 +733,6 @@
   .location-form {
     width: 100% !important;
   }
-  .note {
-    margin-top: 4rem;
-  }
   .bp3-popover-wrapper {
     display: inline;
     margin-left: 0.5rem;

frontend/css/global.scss

@@ -894,6 +894,7 @@ ul {
 }
 
 .note {
+  margin-top: 1rem;
   font-style: italic;
   font-size: 1.2rem;
 }
@@ -1976,7 +1977,9 @@ ul {
   }
   &.bulletin-alert {
     img, iframe {
+      margin: 1rem auto;
       width: 100%;
+      border-radius: 5px;
     }
   }
   .problem-alert-title {

frontend/css/sequences.scss

@@ -425,6 +425,12 @@
   }
 }
 
+.preview-variables {
+  .locals-list {
+    pointer-events: none;
+  }
+}
+
 .regimen-editor-tools {
   .button-group {
     margin-bottom: 1rem;

frontend/os_download/__tests__/content_test.tsx

@@ -20,4 +20,19 @@ describe("<OsDownloadPage />", () => {
     expect(rpiLink.text()).toEqual("DOWNLOAD v1.0.0");
     expect(rpiLink.props().href).toEqual("fake rpi img url");
   });
+
+  it("doesn't show rpi4 releases", () => {
+    globalConfig.rpi4_release_url = "fake rpi4 img url";
+    globalConfig.rpi4_release_tag = "1.0.1";
+    const wrapper = mount(<OsDownloadPage />);
+    expect(wrapper.text().toLowerCase()).not.toContain("pi 4");
+  });
+
+  it("shows rpi4 releases", () => {
+    globalConfig.rpi4_release_url = "fake rpi4 img url";
+    globalConfig.rpi4_release_tag = "1.0.1";
+    localStorage.setItem("rpi4", "true");
+    const wrapper = mount(<OsDownloadPage />);
+    expect(wrapper.text().toLowerCase()).toContain("pi 4");
+  });
 });

frontend/os_download/content.tsx

@@ -3,7 +3,7 @@ import { t } from "../i18next_wrapper";
 import { Content } from "../constants";
 
 interface PlatformContent {
-  imageUrl: string;
+  imageUrl: string | undefined;
   releaseTag: string;
   kits: string[];
   computer: string;
@@ -25,6 +25,17 @@ const PLATFORM_DATA = (): PlatformContent[] => [
       "Genesis XL v1.6",
     ],
   },
+  ...(localStorage.getItem("rpi4")
+    ? [{
+      computer: "Raspberry Pi 4",
+      imageUrl: globalConfig.rpi4_release_url,
+      releaseTag: globalConfig.rpi4_release_tag,
+      kits: [
+        "Genesis v1.6.1",
+        "Genesis XL v1.6.1",
+      ],
+    }]
+    : []),
   {
     computer: "Raspberry Pi Zero W",
     imageUrl: globalConfig.rpi_release_url,

frontend/regimens/editor/active_editor.tsx

@@ -44,6 +44,7 @@ export class ActiveEditor
         resource: regimen,
         variableData: this.props.variableData,
       })}
+      labelOnly={true}
       allowedVariableNodes={AllowedVariableNodes.parameter} />;
   };
 

frontend/resources/__tests__/sequence_meta_test.ts

@@ -20,7 +20,7 @@ import {
 } from "../../sequences/locals_list/sanitize_nodes";
 import {
   formatPoint, NO_VALUE_SELECTED_DDI, formatTool,
-} from "../../sequences/locals_list/location_form_list";
+} from "../../sequences/locals_list/variable_form_list";
 import { Point, Tool } from "farmbot";
 import { fakeVariableNameSet } from "../../__test_support__/fake_variables";
 import { NOTHING_SELECTED } from "../../sequences/locals_list/handle_select";

frontend/resources/sequence_meta.ts

@@ -12,7 +12,7 @@ import {
   NO_VALUE_SELECTED_DDI,
   formatTool,
   COORDINATE_DDI,
-} from "../sequences/locals_list/location_form_list";
+} from "../sequences/locals_list/variable_form_list";
 import { VariableNode } from "../sequences/locals_list/locals_list_support";
 import { t } from "../i18next_wrapper";
 
@@ -112,11 +112,13 @@ export const determineDropdown =
         return {
           label: `${t("Number")}: ${data_value.args.number}`,
           value: data_value.args.number,
+          headingId: "Numeric",
         };
       case "text":
         return {
           label: `${t("Text")}: ${data_value.args.string}`,
           value: data_value.args.string,
+          headingId: "Text",
         };
       case "point":
         const { pointer_id, pointer_type } = data_value.args;

frontend/sequences/locals_list/__tests__/default_value_form_test.tsx

@@ -5,7 +5,7 @@ import {
   buildResourceIndex,
 } from "../../../__test_support__/resource_index_builder";
 import { Coordinate, ParameterApplication } from "farmbot";
-import { LocationForm } from "../location_form";
+import { VariableForm } from "../variable_form";
 import { changeBlurableInput } from "../../../__test_support__/helpers";
 
 describe("<DefaultValueForm />", () => {
@@ -50,7 +50,7 @@ describe("<DefaultValueForm />", () => {
       kind: "parameter_application",
       args: { label: "label", data_value: COORDINATE },
     };
-    wrapper.find(LocationForm).simulate("change", pa);
+    wrapper.find(VariableForm).simulate("change", pa);
     expect(p.onChange).toHaveBeenCalledWith({
       kind: "parameter_declaration",
       args: { label: "label", default_value: COORDINATE }
@@ -68,7 +68,7 @@ describe("<DefaultValueForm />", () => {
         }
       }
     };
-    wrapper.find(LocationForm).simulate("change", pa);
+    wrapper.find(VariableForm).simulate("change", pa);
     expect(p.onChange).not.toHaveBeenCalled();
   });
 });

frontend/sequences/locals_list/__tests__/handle_select_test.ts

@@ -2,7 +2,7 @@ import {
   addOrEditBodyVariables, convertDDItoVariable, NOTHING_SELECTED,
 } from "../handle_select";
 import { Point, Tool, Coordinate } from "farmbot";
-import { NO_VALUE_SELECTED_DDI, COORDINATE_DDI } from "../location_form_list";
+import { NO_VALUE_SELECTED_DDI, COORDINATE_DDI } from "../variable_form_list";
 import {
   VariableNode, AllowedVariableNodes, VariableType,
 } from "../locals_list_support";

frontend/sequences/locals_list/__tests__/locals_list_test.tsx

@@ -20,7 +20,7 @@ import {
 } from "../../../__test_support__/resource_index_builder";
 import { LocalsListProps, AllowedVariableNodes } from "../locals_list_support";
 import { VariableNameSet } from "../../../resources/interfaces";
-import { LocationForm } from "../location_form";
+import { VariableForm } from "../variable_form";
 import { error } from "../../../toast/toast";
 import { overwrite } from "../../../api/crud";
 import { fakeVariableNameSet } from "../../../__test_support__/fake_variables";
@@ -57,14 +57,14 @@ describe("<LocalsList/>", () => {
 
   it("doesn't have any variables to render", () => {
     const wrapper = shallow(<LocalsList {...fakeProps()} />);
-    expect(wrapper.find(LocationForm).length).toBe(0);
+    expect(wrapper.find(VariableForm).length).toBe(0);
   });
 
   it("shows all variables", () => {
     const p = fakeProps();
     p.variableData = variableData;
     const wrapper = shallow(<LocalsList {...p} />);
-    expect(wrapper.find(LocationForm).length).toBe(1);
+    expect(wrapper.find(VariableForm).length).toBe(1);
   });
 
   it("hides already assigned variables", () => {
@@ -73,7 +73,7 @@ describe("<LocalsList/>", () => {
     p.bodyVariables = [];
     p.variableData = variableData;
     const wrapper = shallow(<LocalsList {...p} />);
-    expect(wrapper.find(LocationForm).length).toBe(0);
+    expect(wrapper.find(VariableForm).length).toBe(0);
   });
 });
 

frontend/sequences/locals_list/__tests__/location_form_list_test.ts → frontend/sequences/locals_list/__tests__/variable_form_list_test.ts

@@ -1,6 +1,6 @@
 import {
-  locationFormList, dropDownName, formatTool, groups2Ddi, activeToolDDIs,
-} from "../location_form_list";
+  variableFormList, dropDownName, formatTool, groups2Ddi, activeToolDDIs,
+} from "../variable_form_list";
 import { fakeResourceIndex } from "../test_helpers";
 import {
   fakeToolSlot, fakeTool, fakePointGroup,
@@ -9,12 +9,12 @@ import {
   buildResourceIndex,
 } from "../../../__test_support__/resource_index_builder";
 
-describe("locationFormList()", () => {
+describe("variableFormList()", () => {
   it("returns dropdown list", () => {
     const pointGroup = fakePointGroup();
     pointGroup.body.id = 1;
     const resources = fakeResourceIndex([pointGroup]);
-    expect(locationFormList(resources, [], [], true))
+    expect(variableFormList(resources, [], [], true))
       .toEqual([
         {
           headingId: "Coordinate",
@@ -86,7 +86,7 @@ describe("locationFormList()", () => {
 
   it("returns empty dropdown list", () => {
     const resources = buildResourceIndex([]).index;
-    expect(locationFormList(resources, []))
+    expect(variableFormList(resources, []))
       .toEqual([
         {
           headingId: "Coordinate",