Merge branch 'master' of https://git.heroku.com/farmbot-staging into staging

v9.2.0 - Jolly Juniper

app/models/celery_script_settings_bag.rb

@@ -251,7 +251,9 @@ module CeleryScriptSettingsBag
       # outside of the API. If `package` _was_ declared as a native enum (rather
       # than a string), it would cause false type errors in FE/FBJS.
       blk: ->(node) do
+        unless node.parent.kind.to_s == "flash_firmware"
           manual_enum(ALLOWED_PACKAGES, node, BAD_PACKAGE)
+        end
       end,
     },
     axis: {
@@ -529,7 +531,7 @@ module CeleryScriptSettingsBag
         resource_id = n.args.fetch(:point_group_id).value
         check_resource_type(n, "PointGroup", resource_id, Device.current)
       end,
-    }
+    },
   }.map { |(name, list)| Corpus.node(name, **list) }
 
   HASH = Corpus.as_json

frontend/sequences/step_button_cluster.tsx

@@ -95,6 +95,11 @@ export function StepButtonCluster(props: StepButtonProps) {
       color="brown">
       {t("REBOOT")}
     </StepButton>,
+    <StepButton {...commonStepProps}
+      step={{ kind: "flash_firmware", args: { package: "arduino_firmware" } }}
+      color="brown">
+      {t("REFLASH FIRMWARE")}
+    </StepButton>,
     <StepButton {...commonStepProps}
       step={{ kind: "emergency_lock", args: {} }}
       color="red">

frontend/sequences/step_tiles/tile_reboot.tsx

@@ -5,11 +5,6 @@ import { StepWrapper, StepHeader, StepContent } from "../step_ui/index";
 import { t } from "../../i18next_wrapper";
 import { ALLOWED_PACKAGES, SequenceBodyItem, Reboot } from "farmbot";
 import { editStep } from "../../api/crud";
-// import { StepRadio } from "../step_ui/step_radio";
-// const PACKAGE_CHOICES = (): Record<ALLOWED_PACKAGES, string> => ({
-//   "arduino_firmware": t("Just the Arduino"),
-//   "farmbot_os": t("Entire system")
-// });
 
 function assertReboot(x: SequenceBodyItem): asserts x is Reboot {
   if (x.kind !== "reboot") {

spec/lib/celery_script/corpus_spec.rb

@@ -257,4 +257,27 @@ describe CeleryScript::Corpus do
       expect(check.error.message).to eq("Can't find PointGroup with id of -1")
     end
   end
+
+  it "validates the `package` for flash_firmware" do
+    ok1 = CeleryScript::AstNode.new(**{
+                                      args: {
+                                        version: 20180209,
+                                        locals: {
+                                          kind: "scope_declaration",
+                                          args: {},
+                                        },
+                                      },
+                                      kind: "sequence",
+                                      body: [
+                                        {
+                                          kind: "flash_firmware",
+                                          args: {
+                                            package: "arduino_firmware",
+                                          },
+                                        },
+                                      ],
+                                    })
+    check1 = CeleryScript::Checker.new(ok1, corpus, device)
+    expect(check1.valid?).to be_truthy
+  end
 end