Merge pull request #2476 from FarmBot/staging

v15.12.0

.ruby-version

@@ -1 +1 @@
-3.3.6
+3.3.7

Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "~> 3.3.6"
+ruby "~> 3.3.7"
 
 gem "rails", "~> 6"
 gem "active_model_serializers"
@@ -11,6 +11,7 @@ gem "discard"
 gem "google-cloud-storage", "~> 1.11"
 gem "jwt"
 gem "kaminari"
+gem "logger"
 gem "mutations"
 gem "pg"
 gem "rabbitmq_http_api_client"

Gemfile.lock

@@ -71,7 +71,7 @@ GEM
     ast (2.4.2)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     builder (3.3.0)
     bunny (2.23.0)
       amq-protocol (~> 2.3, >= 2.3.1)
@@ -80,7 +80,7 @@ GEM
       activesupport
     climate_control (1.2.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -105,21 +105,21 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.1)
-    digest-crc (0.6.5)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
     discard (1.4.0)
       activerecord (>= 4.2, < 9.0)
     docile (1.4.1)
     e2mmap (0.1.0)
-    erubi (1.13.0)
+    erubi (1.13.1)
     factory_bot (6.5.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.12.1)
+    faraday (2.12.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -129,7 +129,7 @@ GEM
       net-http (>= 0.5.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-apis-core (0.15.1)
+    google-apis-core (0.16.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
       httpclient (>= 2.8.3, < 3.a)
@@ -139,15 +139,15 @@ GEM
       retriable (>= 2.0, < 4.a)
     google-apis-iamcredentials_v1 (0.22.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-storage_v1 (0.48.0)
+    google-apis-storage_v1 (0.49.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-cloud-core (1.7.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (2.2.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
-    google-cloud-storage (1.53.0)
+    google-cloud-storage (1.54.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-core (~> 0.13)
@@ -156,21 +156,23 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.11.2)
+    google-logging-utils (0.1.0)
+    googleauth (1.13.1)
       faraday (>= 1.0, < 3.a)
-      google-cloud-env (~> 2.1)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     hashdiff (1.1.2)
     hashie (4.1.0)
     httpclient (2.8.3)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.9.0)
+    json (2.9.1)
     jsonapi-renderer (0.2.2)
-    jwt (2.9.3)
+    jwt (2.10.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -184,13 +186,13 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    logger (1.6.2)
+    logger (1.6.5)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.23.1)
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -208,7 +210,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.1)
+    net-imap (0.5.5)
       date
       net-protocol
     net-pop (0.1.2)
@@ -218,21 +220,21 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.16.8-aarch64-linux)
+    nokogiri (1.18.2-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.8-x86_64-linux)
+    nokogiri (1.18.2-x86_64-linux-gnu)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     os (1.1.4)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     passenger (6.0.23)
       rack (>= 1.6.13)
       rackup
       rake (>= 12.3.3)
     pg (1.5.9)
-    pry (0.15.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-rails (0.3.11)
@@ -250,7 +252,7 @@ GEM
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
     rackup (1.0.1)
       rack (< 3)
@@ -274,7 +276,7 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.1)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails_12factor (0.0.3)
@@ -301,7 +303,7 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.3.9)
+    rexml (3.4.0)
     rollbar (3.6.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -329,9 +331,9 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    scout_apm (5.4.0)
+    scout_apm (5.6.0)
       parser
-    secure_headers (7.0.0)
+    secure_headers (7.1.0)
     set (1.1.1)
     signet (0.19.0)
       addressable (~> 2.8)
@@ -360,11 +362,11 @@ GEM
     thor (1.3.2)
     thwait (0.2.0)
       e2mmap
-    timeout (0.4.2)
+    timeout (0.4.3)
     trailblazer-option (0.1.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.2)
+    tzinfo-data (1.2025.1)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
     uri (1.0.2)
@@ -378,7 +380,8 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.7.1)
@@ -402,6 +405,7 @@ DEPENDENCIES
   hashdiff
   jwt
   kaminari
+  logger
   lograge
   mutations
   passenger
@@ -431,7 +435,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.6p108
+   ruby 3.3.7p123
 
 BUNDLED WITH
-   2.5.23
+   2.6.2

config/application.rb

@@ -77,7 +77,6 @@ class Application < Rails::Application
         ENV["MQTT_HOST"],
         "api.github.com",
         "raw.githubusercontent.com",
-        "openfarm.cc",
         "api.rollbar.com",
         PARCELJS_URL,
         ENV["FORCE_SSL"] ? "wss:" : "ws:",

config/boot.rb

@@ -2,3 +2,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require 'logger'

docker_configs/api.Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.3.6
+FROM ruby:3.3.7
 RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg > /dev/null && \
   sh -c '. /etc/os-release; echo $VERSION_CODENAME; echo "deb http://apt.postgresql.org/pub/repos/apt/ $VERSION_CODENAME-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
   apt-get update -qq && apt-get install -y build-essential libpq-dev postgresql postgresql-contrib && \

frontend/__test_support__/additional_mocks.tsx

@@ -4,10 +4,6 @@ jest.mock("browser-speech", () => ({
   talk: jest.fn(),
 }));
 
-jest.mock("../open_farm/cached_crop", () => ({
-  cachedCrop: jest.fn(() => Promise.resolve({ svg_icon: "icon" })),
-}));
-
 const { ancestorOrigins } = window.location;
 delete (window as { location: Location | undefined }).location;
 window.location = {

frontend/__test_support__/fake_crops.ts

@@ -0,0 +1,49 @@
+import { Crops } from "../crops/interfaces";
+
+export const FAKE_CROPS: Crops = {
+  "mint": {
+    name: "Mint",
+    binomial_name: "Mentha spicata",
+    common_names: ["Mint", "spearmint"],
+    description: "Mint is a perennial herb with a distinctive taste.",
+    sun_requirements: "Partial sun",
+    sowing_method: "Direct seed indoors or outside",
+    spread: 100,
+    row_spacing: 100,
+    height: 60,
+    growing_degree_days: 100,
+    companions: ["strawberry"],
+    image: "/crops/images/mint.jpg",
+    icon: "/crops/icons/mint.avif"
+  },
+  "strawberry": {
+    name: "Strawberry",
+    binomial_name: "",
+    common_names: [],
+    description: "",
+    sun_requirements: "",
+    sowing_method: "",
+    spread: 25,
+    row_spacing: 35,
+    height: 60,
+    growing_degree_days: 100,
+    companions: [],
+    icon: "",
+    image: "",
+  },
+  "generic-plant": {
+    name: "",
+    binomial_name: "",
+    common_names: [],
+    description: "",
+    sun_requirements: "",
+    sowing_method: "",
+    spread: 0,
+    row_spacing: 0,
+    height: 0,
+    growing_degree_days: 0,
+    companions: [],
+    icon: "",
+    image: "",
+  },
+};

frontend/__test_support__/fake_designer_state.ts

@@ -7,7 +7,6 @@ export const fakeDesignerState = (): DesignerState => ({
   selectionPointType: undefined,
   hoveredPlant: {
     plantUUID: undefined,
-    icon: ""
   },
   hoveredPoint: undefined,
   hoveredPlantListItem: undefined,
@@ -16,8 +15,6 @@ export const fakeDesignerState = (): DesignerState => ({
   hoveredImage: undefined,
   hoveredSpread: undefined,
   cropSearchQuery: "",
-  cropSearchResults: [],
-  cropSearchInProgress: false,
   companionIndex: undefined,
   plantTypeChangeId: undefined,
   bulkPlantSlug: undefined,
@@ -52,6 +49,7 @@ export const fakeDesignerState = (): DesignerState => ({
   cropHeightCurveId: undefined,
   cropStage: undefined,
   cropPlantedAt: undefined,
+  cropRadius: undefined,
   distanceIndicator: "",
   panelOpen: true,
 });

frontend/__test_support__/fake_props.ts

@@ -0,0 +1,13 @@
+import { TaggedPlant } from "../farm_designer/map/interfaces";
+import { AddPlantProps } from "../three_d_garden/bed";
+import { fakeDesignerState } from "./fake_designer_state";
+
+export const fakeAddPlantProps =
+  (plants: TaggedPlant[]): AddPlantProps => ({
+    gridSize: { x: 1000, y: 2000 },
+    dispatch: jest.fn(),
+    getConfigValue: jest.fn(),
+    plants,
+    curves: [],
+    designer: fakeDesignerState(),
+  });