create and use account_seeded_at field

gabrielburnworth · gabrielburnworth · commit 03c9c4d3ff3a · 2025-10-01T13:33:19.000-07:00
diff --git a/app/mutations/devices/create_seed_data.rb b/app/mutations/devices/create_seed_data.rb
@@ -34,6 +34,10 @@ class CreateSeedData < Mutations::Command
     end
 
     def execute
+      if device.account_seeded_at
+        return { done: "Device already has seed data." }
+      end
+      device.update(account_seeded_at: Time.now)
       self.delay.run_seeds!
       { done: "Loading resources now." }
     end
diff --git a/app/mutations/devices/reset.rb b/app/mutations/devices/reset.rb
@@ -20,7 +20,10 @@ def execute
 
     def run_it
       ActiveRecord::Base.transaction do
-        device.update!(name: "FarmBot", mounted_tool_id: nil)
+        device.update!(name: "FarmBot",
+          mounted_tool_id: nil,
+          setup_completed_at: nil,
+          account_seeded_at: nil)
         device.folders.update_all(parent_id: nil)
         Device::SINGULAR_RESOURCES.keys.map do |resource|
           device.send(resource).destroy!
diff --git a/app/mutations/devices/seeders/demo_account_seeder.rb b/app/mutations/devices/seeders/demo_account_seeder.rb
@@ -8,7 +8,9 @@ class DemoAccountSeeder < AbstractSeeder
         "Genesis XL" => "Genesis_XL_Demo_Webcam.jpg",
         "Genesis" => "Genesis_Demo_Webcam.jpg",
       }
-      UNUSED_ALERTS = ["api.seed_data.missing", "api.user.not_welcomed"]
+      UNUSED_ALERTS = [
+        Alert::USER[:problem_tag],
+      ]
 
       def feed(product_line)
         feed_name = ""
diff --git a/app/mutations/devices/update.rb b/app/mutations/devices/update.rb
@@ -11,6 +11,7 @@ class Update < Mutations::Command
       string :timezone
       string :fb_order_number, nils: true
       string :setup_completed_at, nils: true
+      string :account_seeded_at, nils: true
       integer :mounted_tool_id, nils: true
       integer :ota_hour, nils: true
       float :lat, nils: true
diff --git a/app/serializers/device_serializer.rb b/app/serializers/device_serializer.rb
@@ -12,6 +12,7 @@ class DeviceSerializer < ApplicationSerializer
              :rpi,
              :serial_number,
              :setup_completed_at,
+             :account_seeded_at,
              :throttled_at,
              :throttled_until,
              :timezone,
diff --git a/db/migrate/20250930204600_add_account_seeded_at_to_device.rb b/db/migrate/20250930204600_add_account_seeded_at_to_device.rb
@@ -0,0 +1,9 @@
+class AddAccountSeededAtToDevice < ActiveRecord::Migration[6.1]
+  def up
+    add_column :devices, :account_seeded_at, :datetime
+  end
+
+  def down
+    remove_column :devices, :account_seeded_at
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
@@ -389,7 +389,8 @@ CREATE TABLE public.devices (
     rpi character varying(3),
     max_log_age_in_days integer DEFAULT 0,
     max_sequence_count integer DEFAULT 0,
-    max_sequence_length integer DEFAULT 0
+    max_sequence_length integer DEFAULT 0,
+    account_seeded_at timestamp without time zone
 );
 
 
@@ -3988,6 +3989,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20250514203443'),
 ('20250722234106'),
 ('20250802174543'),
-('20250925195004');
+('20250925195004'),
+('20250930204600');
 
 
diff --git a/frontend/messages/cards.tsx b/frontend/messages/cards.tsx
@@ -359,7 +359,7 @@ const UserNotWelcomed = (props: CommonAlertCardProps) =>
   <AlertCardTemplate
     alert={props.alert}
     className={"user-not-welcomed-alert"}
-    title={t("Welcome to the FarmBot Web App")}
+    title={t("Welcome")}
     message={t(Content.WELCOME)}
     timeSettings={props.timeSettings}
     dispatch={props.dispatch}
diff --git a/frontend/wizard/__tests__/checks_test.tsx b/frontend/wizard/__tests__/checks_test.tsx
@@ -33,7 +33,7 @@ jest.mock("../../messages/actions", () => ({
 }));
 
 import React from "react";
-import { render, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import { mount, shallow } from "enzyme";
 import { bot } from "../../__test_support__/fake_state/bot";
 import {
@@ -103,7 +103,7 @@ import { PLACEHOLDER_FARMBOT } from "../../photos/images/image_flipper";
 import {
   changeBlurableInput, changeBlurableInputRTL, clickButton,
 } from "../../__test_support__/helpers";
-import { Actions } from "../../constants";
+import { Actions, SetupWizardContent } from "../../constants";
 import { tourPath } from "../../help/tours";
 import { FBSelect } from "../../ui";
 
@@ -395,12 +395,14 @@ describe("<FirmwareHardwareSelection />", () => {
 
   it("selects model", () => {
     const p = fakeProps();
-    p.resources = buildResourceIndex([fakeFbosConfig(), fakeDevice()]).index;
+    const device = fakeDevice();
+    p.resources = buildResourceIndex([fakeFbosConfig(), device]).index;
     p.dispatch = mockDispatch(jest.fn(), () => state);
-    const wrapper = shallow(<FirmwareHardwareSelection {...p} />);
-    wrapper.find("FBSelect").simulate("change", {
-      label: "", value: "genesis_1.2"
-    });
+    render(<FirmwareHardwareSelection {...p} />);
+    const dropdown = screen.getByRole("button");
+    fireEvent.click(dropdown);
+    const item = screen.getByRole("menuitem", { name: "Genesis v1.2" });
+    fireEvent.click(item);
     expect(edit).toHaveBeenCalledWith(expect.any(Object), {
       firmware_hardware: "arduino"
     });
@@ -411,61 +413,66 @@ describe("<FirmwareHardwareSelection />", () => {
     const alert = fakeAlert();
     alert.body.id = 1;
     alert.body.problem_tag = "api.seed_data.missing";
-    p.resources = buildResourceIndex([alert, fakeDevice()]).index;
-    mockState.resources = buildResourceIndex([alert]);
-    p.dispatch = mockDispatch(jest.fn(), () => state);
-    const wrapper = mount<FirmwareHardwareSelection>(
-      <FirmwareHardwareSelection {...p} />);
-    wrapper.instance().onChange({ label: "", value: "genesis_1.2" });
-    expect(destroy).toHaveBeenCalled();
-  });
-
-  it("doesn't seed account twice", () => {
-    const p = fakeProps();
-    const alert = fakeAlert();
-    alert.body.id = 1;
-    alert.body.problem_tag = "api.seed_data.missing";
-    p.resources = buildResourceIndex([alert, fakeDevice()]).index;
+    const device = fakeDevice();
+    p.resources = buildResourceIndex([alert, device]).index;
     mockState.resources = buildResourceIndex([alert]);
     p.dispatch = mockDispatch(jest.fn(), () => state);
-    const wrapper = mount<FirmwareHardwareSelection>(
-      <FirmwareHardwareSelection {...p} />);
-    wrapper.setState({ seeded: true });
-    wrapper.instance().onChange({ label: "", value: "genesis_1.2" });
-    expect(destroy).not.toHaveBeenCalled();
+    render(<FirmwareHardwareSelection {...p} />);
+    expect(screen.getByText(SetupWizardContent.SEED_DATA)).toBeInTheDocument();
+    // once
+    const dropdown = screen.getByRole("button");
+    fireEvent.click(dropdown);
+    const item = screen.getByRole("menuitem", { name: "Genesis v1.2" });
+    fireEvent.click(item);
+    expect(edit).toHaveBeenCalledWith(expect.any(Object), {
+      firmware_hardware: "arduino"
+    });
+    expect(destroy).toHaveBeenCalledTimes(1);
+    expect(screen.getByText("Resources added!")).toBeInTheDocument();
+    // not twice
+    const newDropdown = screen.getByRole("button");
+    fireEvent.click(newDropdown);
+    const newItem = screen.getByRole("menuitem", { name: "Genesis v1.3" });
+    fireEvent.click(newItem);
+    expect(edit).toHaveBeenCalledWith(expect.any(Object), {
+      firmware_hardware: "farmduino"
+    });
+    expect(destroy).toHaveBeenCalledTimes(1);
   });
 
   it("doesn't seed account", () => {
     const p = fakeProps();
-    p.resources = buildResourceIndex([fakeDevice()]).index;
+    const device = fakeDevice();
+    device.body.account_seeded_at = "2023-01-01T11:22:33.000Z";
+    p.resources = buildResourceIndex([device]).index;
     p.dispatch = mockDispatch(jest.fn(), () => state);
-    const wrapper = mount<FirmwareHardwareSelection>(
-      <FirmwareHardwareSelection {...p} />);
-    wrapper.instance().onChange({ label: "", value: "genesis_1.2" });
+    render(<FirmwareHardwareSelection {...p} />);
+    expect(screen.queryByText(SetupWizardContent.SEED_DATA))
+      .not.toBeInTheDocument();
+    const dropdown = screen.getByRole("button");
+    fireEvent.click(dropdown);
+    const item = screen.getByRole("menuitem", { name: "Genesis v1.2" });
+    fireEvent.click(item);
+    expect(edit).toHaveBeenCalledWith(expect.any(Object), {
+      firmware_hardware: "arduino"
+    });
     expect(destroy).not.toHaveBeenCalled();
-    expect(wrapper.text().toLowerCase()).not.toContain("resources");
-  });
-
-  it("renders after account seeding", () => {
-    const p = fakeProps();
-    p.resources = buildResourceIndex([fakeDevice()]).index;
-    const wrapper = mount<FirmwareHardwareSelection>(
-      <FirmwareHardwareSelection {...p} />);
-    wrapper.setState({ autoSeed: true });
-    expect(wrapper.text().toLowerCase()).toContain("resources added");
+    expect(screen.queryByText("Resources added!")).not.toBeInTheDocument();
   });
 
   it("toggles auto-seed", () => {
     const p = fakeProps();
     const alert = fakeAlert();
     alert.body.id = 1;
     alert.body.problem_tag = "api.seed_data.missing";
-    p.resources = buildResourceIndex([alert, fakeDevice()]).index;
-    const wrapper = shallow<FirmwareHardwareSelection>(
-      <FirmwareHardwareSelection {...p} />);
-    expect(wrapper.state().autoSeed).toEqual(true);
-    wrapper.instance().toggleAutoSeed();
-    expect(wrapper.state().autoSeed).toEqual(false);
+    const device = fakeDevice();
+    p.resources = buildResourceIndex([alert, device]).index;
+    render(<FirmwareHardwareSelection {...p} />);
+    expect(screen.getByText(SetupWizardContent.SEED_DATA)).toBeInTheDocument();
+    const checkbox = screen.getByRole("checkbox");
+    fireEvent.click(checkbox);
+    expect(screen.queryByText(SetupWizardContent.SEED_DATA))
+      .not.toBeInTheDocument();
   });
 });
 
diff --git a/frontend/wizard/checks.tsx b/frontend/wizard/checks.tsx
@@ -373,74 +373,54 @@ const FW_HARDWARE_TO_RPI: Record<FirmwareHardware, string | undefined> = {
   "none": "3",
 };
 
-interface FirmwareHardwareSelectionState {
-  selection: string;
-  autoSeed: boolean;
-  seeded: boolean;
-}
-
-export class FirmwareHardwareSelection
-  extends React.Component<WizardStepComponentProps,
-    FirmwareHardwareSelectionState> {
-  state: FirmwareHardwareSelectionState = {
-    selection: "",
-    autoSeed: this.seedAlerts.length > 0,
-    seeded: false,
-  };
-
-  get seedAlerts() {
-    return selectAllAlerts(this.props.resources)
-      .filter(alert => alert.body.problem_tag == "api.seed_data.missing");
-  }
-
-  onChange = (ddi: DropDownItem) => {
-    const { dispatch, resources } = this.props;
-
-    this.setState({ selection: "" + ddi.value });
+export const FirmwareHardwareSelection = (props: WizardStepComponentProps) => {
+  const device = getDeviceAccountSettings(props.resources);
+  const notSeeded = !device.body.account_seeded_at;
+  const [selection, setSelection] = React.useState("");
+  const [autoSeed, setAutoSeed] = React.useState(notSeeded);
+  const [seeded, setSeeded] = React.useState(!notSeeded);
+  const seedAlerts = selectAllAlerts(props.resources)
+    .filter(alert => alert.body.problem_tag == "api.seed_data.missing");
+
+  const onChange = (ddi: DropDownItem) => {
+    const { dispatch, resources } = props;
+    setSelection("" + ddi.value);
     const firmwareHardware = SEED_DATA_OPTION_TO_FW_HARDWARE["" + ddi.value];
     changeFirmwareHardware(dispatch)({ label: "", value: firmwareHardware });
     const rpi = FW_HARDWARE_TO_RPI[firmwareHardware];
     if (rpi) {
-      const device = getDeviceAccountSettings(this.props.resources);
       dispatch(edit(device, { rpi }));
       dispatch(save(device.uuid));
     }
-
-    const seedAlertId = this.seedAlerts[0]?.body.id;
+    const seedAlertId = seedAlerts[0]?.body.id;
     const dismiss = () => seedAlertId && dispatch(destroy(
       findUuid(resources, "Alert", seedAlertId)));
-    if (this.state.autoSeed && !this.state.seeded) {
-      this.setState({ seeded: true });
+    if (autoSeed && !seeded) {
+      setSeeded(true);
       seedAccount(dismiss)({ label: "", value: ddi.value });
     }
   };
 
-  toggleAutoSeed = () => this.setState({ autoSeed: !this.state.autoSeed });
-
-  render() {
-    const { selection, autoSeed } = this.state;
-    const notSeeded = this.seedAlerts.length > 0;
-    return <div className={"farmbot-model-selection"}>
-      <FBSelect
-        key={selection}
-        list={SEED_DATA_OPTIONS()}
-        selectedItem={SEED_DATA_OPTIONS_DDI()[selection]}
-        onChange={this.onChange} />
-      {notSeeded &&
-        <div className={"seed-checkbox"}>
-          <Checkbox
-            onChange={this.toggleAutoSeed}
-            checked={autoSeed}
-            title={t("Add pre-made resources upon selection")} />
-          <p>{t("Add pre-made resources upon selection")}</p>
-        </div>}
-      {autoSeed && notSeeded &&
-        <p>{t(SetupWizardContent.SEED_DATA)}</p>}
-      {autoSeed && !notSeeded &&
-        <p>{t("Resources added!")}</p>}
-    </div>;
-  }
-}
+  return <div className={"farmbot-model-selection"}>
+    <FBSelect
+      key={selection + autoSeed + seeded}
+      list={SEED_DATA_OPTIONS()}
+      selectedItem={SEED_DATA_OPTIONS_DDI()[selection]}
+      onChange={onChange} />
+    {!seeded &&
+      <div className={"seed-checkbox"}>
+        <Checkbox
+          onChange={() => setAutoSeed(!autoSeed)}
+          checked={autoSeed}
+          title={t("Add pre-made resources upon selection")} />
+        <p>{t("Add pre-made resources upon selection")}</p>
+      </div>}
+    {autoSeed &&
+      (!seeded
+        ? <p>{t(SetupWizardContent.SEED_DATA)}</p>
+        : <p>{t("Resources added!")}</p>)}
+  </div>;
+};
 
 export const RpiSelection = (props: WizardStepComponentProps) => {
   const device = getDeviceAccountSettings(props.resources);
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "browser-speech": "1.1.1",
     "delaunator": "5.0.1",
     "events": "3.3.0",
-    "farmbot": "15.9.2",
+    "farmbot": "15.9.3",
     "fengari": "0.1.4",
     "fengari-web": "0.1.4",
     "i18next": "25.5.2",
diff --git a/spec/mutations/devices/create_seed_data_spec.rb b/spec/mutations/devices/create_seed_data_spec.rb
@@ -10,7 +10,32 @@
     previous_sequences_count = device.sequences.count
     previous_tool_slots_count = device.tool_slots.count
     previous_tools_count = device.tools.count
-    Devices::CreateSeedData.run!(device: device, product_line: "none")
+    run_jobs_now do
+      Devices::CreateSeedData.run!(device: device, product_line: "none")
+    end
+    device.reload
+    expect(device.peripherals.count).to eq(previous_peripherals_count)
+    expect(device.pin_bindings.count).to eq(previous_pin_bindings_count)
+    expect(device.plants.count).to eq(previous_plants_count)
+    expect(device.sensors.count).to eq(previous_sensors_count)
+    expect(device.sequences.count).to eq(previous_sequences_count)
+    expect(device.tool_slots.count).to eq(previous_tool_slots_count)
+    expect(device.tools.count).to eq(previous_tools_count)
+  end
+
+  it "doesn't seed twice" do
+    device = FactoryBot.create(:device)
+    device.account_seeded_at = Time.now
+    previous_peripherals_count = device.peripherals.count
+    previous_pin_bindings_count = device.pin_bindings.count
+    previous_plants_count = device.plants.count
+    previous_sensors_count = device.sensors.count
+    previous_sequences_count = device.sequences.count
+    previous_tool_slots_count = device.tool_slots.count
+    previous_tools_count = device.tools.count
+    run_jobs_now do
+      Devices::CreateSeedData.run!(device: device, product_line: "genesis_1.2")
+    end
     device.reload
     expect(device.peripherals.count).to eq(previous_peripherals_count)
     expect(device.pin_bindings.count).to eq(previous_pin_bindings_count)
