Merge pull request #2513 from FarmBot/staging

v15.24.0

Author: gabrielburnworth

Gemfile.lock

@@ -87,7 +87,7 @@ GEM
     base64 (0.3.0)
     bcrypt (3.1.22)
     benchmark (0.5.0)
-    bigdecimal (4.1.1)
+    bigdecimal (4.1.2)
     brakeman (8.0.4)
       racc
     builder (3.3.0)
@@ -133,14 +133,14 @@ GEM
     docile (1.4.1)
     drb (2.2.3)
     e2mmap (0.1.0)
-    erb (6.0.2)
+    erb (6.0.4)
     erubi (1.13.1)
     factory_bot (6.5.6)
       activesupport (>= 6.1.0)
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.6.1)
+    faker (3.8.0)
       i18n (>= 1.8.11, < 2)
     faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
@@ -200,7 +200,7 @@ GEM
       prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.19.3)
+    json (2.19.4)
     jsonapi-renderer (0.2.2)
     jwt (3.1.2)
       base64
@@ -236,10 +236,10 @@ GEM
     marcel (1.1.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (6.0.3)
+    minitest (6.0.5)
       drb (~> 2.0)
       prism (~> 1.5)
-    multi_json (1.19.1)
+    multi_json (1.20.1)
     mutations (0.9.2)
       activesupport
     mutex_m (0.3.0)
@@ -262,7 +262,7 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.4)
     ostruct (0.6.3)
-    parallel (1.28.0)
+    parallel (2.0.1)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
@@ -300,7 +300,7 @@ GEM
     rack-cors (3.0.0)
       logger
       rack (>= 3.0.14)
-    rack-session (2.1.1)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -338,7 +338,7 @@ GEM
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.3.1)
+    rake (13.4.2)
     rbtree (0.4.6)
     rdoc (7.2.0)
       erb
@@ -383,11 +383,11 @@ GEM
     rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.86.0)
+    rubocop (1.86.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)

app/views/layouts/dashboard.html.erb

@@ -17,7 +17,7 @@
       .initial-loading-text { position: absolute; top: 385px;
       text-align: center; width: 100%; padding-top: 10%; color: #434343; }
     </style>
-    <%= stylesheet_link_tag *@css_assets %>
+    <%= stylesheet_link_tag(*@css_assets, preload_links_header: false) %>
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
     <link rel="apple-touch-icon" href="/images/favicon.png" type="image/png">
     <% manifest_file =

bun.lock

@@ -0,0 +1,11 @@
+class AddNew3dViewOptionsToWebAppConfig < ActiveRecord::Migration[8.1]
+  def up
+    add_column :web_app_configs, :top_down_view, :boolean, default: false
+    add_column :web_app_configs, :viewpoint_heading, :integer, default: 0
+  end
+
+  def down
+    remove_column :web_app_configs, :top_down_view
+    remove_column :web_app_configs, :viewpoint_heading
+  end
+end

db/migrate/20260417190743_add_new_3d_view_options_to_web_app_config.rb

@@ -0,0 +1,5 @@
+class ChangeViewpointHeadingDefault < ActiveRecord::Migration[8.1]
+  def change
+    change_column_default(:web_app_configs, :viewpoint_heading, from: 0, to: 30)
+  end
+end

db/migrate/20260422013033_change_viewpoint_heading_default.rb

@@ -2037,7 +2037,9 @@ CREATE TABLE public.web_app_configs (
     show_missed_step_plot boolean DEFAULT false,
     enable_3d_electronics_box_top boolean DEFAULT true,
     three_d_garden boolean DEFAULT false,
-    dark_mode boolean DEFAULT true
+    dark_mode boolean DEFAULT true,
+    top_down_view boolean DEFAULT false,
+    viewpoint_heading integer DEFAULT 30
 );
 
 
@@ -3763,6 +3765,8 @@ ALTER TABLE ONLY public.users
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
+('20260422013033'),
+('20260417190743'),
 ('20260305192457'),
 ('20250930204600'),
 ('20250925195004'),

db/structure.sql

@@ -28,7 +28,7 @@ const ensureSyntaxError = () => {
       writable: true,
     });
   };
-  assign(globalThis as unknown as Record<string, unknown>);
+  assign(globalThis);
   assign(globalAny.window as unknown as Record<string, unknown> | undefined);
   const windowCtor = globalAny.window?.constructor as
     | { prototype?: Record<string, unknown> }
@@ -74,13 +74,11 @@ const withAxiosDefaultExport = (factory: () => unknown) => () => {
 
 if (globalAny.jest?.mock) {
   const originalMock = globalAny.jest.mock.bind(globalAny.jest);
-  globalAny.jest.mock = ((specifier: string, factory?: unknown) => {
-    const moduleFactory =
-      typeof factory === "function" ? factory as () => unknown : undefined;
+  globalAny.jest.mock = ((specifier: string, factory?: () => unknown) => {
     return specifier === "axios" && typeof factory === "function"
       ? originalMock(specifier,
-        withAxiosDefaultExport(moduleFactory as () => unknown))
-      : originalMock(specifier, factory as never);
+        withAxiosDefaultExport(factory))
+      : originalMock(specifier, factory);
   }) as typeof globalAny.jest.mock;
 }
 
@@ -229,6 +227,10 @@ const defaultThreeFiberState = () => ({
   scene: { traverse: jest.fn() },
   size: { width: 800, height: 600 },
   pointer: { x: 0, y: 0 },
+  raycaster: {
+    setFromCamera: jest.fn(),
+    intersectObjects: jest.fn(() => []),
+  },
 });
 
 type MockLike<TArgs extends unknown[] = unknown[], TResult = unknown> = {
@@ -274,7 +276,7 @@ beforeEach(() => {
     resetMutableFixture(globalAny.globalConfig, globalConfigBaseline);
   } else {
     globalAny.globalConfig =
-      cloneForReset(globalConfigBaseline) as Record<string, string>;
+      cloneForReset(globalConfigBaseline);
   }
   globalThis.localStorage?.clear();
   globalThis.sessionStorage?.clear();

frontend/__test_support__/bun_test_setup.ts

@@ -51,7 +51,8 @@ export const fakeDesignerState = (): DesignerState => ({
   cropRadius: undefined,
   distanceIndicator: "",
   panelOpen: true,
-  threeDTopDownView: false,
+  threeDTopDownView: undefined,
+  threeDCameraSelection: false,
   threeDExaggeratedZ: false,
   threeDTime: undefined,
 });

frontend/__test_support__/fake_designer_state.ts

@@ -1,2 +1,17 @@
 import "@testing-library/jest-dom";
 import "./customMatchers";
+
+expect.extend({
+  toContainHTML(received: Element | { innerHTML?: string }, expected: string) {
+    const actual = received?.innerHTML ?? "";
+    const pass = actual.includes(expected);
+
+    return {
+      pass,
+      message: () =>
+        `expected html to${pass ? " not" : ""} contain ` +
+        `${this.utils.printExpected(expected)}\n` +
+        `received: ${this.utils.printReceived(actual)}`,
+    };
+  },
+});

frontend/__test_support__/setup_tests.ts

@@ -119,7 +119,7 @@ jest.mock("../three_d_garden/components", () => ({
           instanceColor: { needsUpdate: false },
         }) as unknown as THREE.InstancedMesh);
       return <InstancedMeshForTests
-        ref={ref as React.Ref<THREE.InstancedMesh>}
+        ref={ref}
         {...rest} />;
     },
   ),
@@ -203,6 +203,10 @@ jest.mock("@react-three/fiber", () => ({
     scene: { traverse: jest.fn() },
     size: { width: 800, height: 600 },
     pointer: { x: 0, y: 0 },
+    raycaster: {
+      setFromCamera: jest.fn(),
+      intersectObjects: jest.fn(() => []),
+    },
   })),
   useThree: jest.fn(() => ({
     gl: {
@@ -214,6 +218,10 @@ jest.mock("@react-three/fiber", () => ({
     scene: { traverse: jest.fn() },
     pointer: { x: 0, y: 0 },
     camera: new THREE.PerspectiveCamera(),
+    raycaster: {
+      setFromCamera: jest.fn(),
+      intersectObjects: jest.fn(() => []),
+    },
     size: { width: 800, height: 600 },
   })),
   extend: jest.fn(),