Merge pull request #2460 from FarmBot/staging

v15.9.4
FarmBot · Feb 22, 2024 · cabd84a · cabd84a
2 parents 2a46d7d + f0cd5c9
commit cabd84a
Show file tree

Hide file tree

Showing 10 changed files with 168 additions and 161 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,40 +7,40 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actioncable (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionmailbox (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionmailer (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      actionview (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.6)
-      actionview (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionpack (6.1.7.7)
+      actionview (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actiontext (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionview (6.1.7.7)
+      activesupport (= 6.1.7.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -50,22 +50,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activejob (6.1.7.7)
+      activesupport (= 6.1.7.7)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activerecord (6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activestorage (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activemodel (6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activerecord (6.1.7.7)
+      activemodel (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
+    activestorage (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.6)
+    activesupport (6.1.7.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -75,6 +75,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     amq-protocol (2.3.2)
     ast (2.4.2)
+    base64 (0.2.0)
     bcrypt (3.1.20)
     bigdecimal (3.1.6)
     builder (3.2.4)
@@ -86,7 +87,7 @@ GEM
     climate_control (1.2.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
-    crack (0.4.6)
+    crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
@@ -169,7 +170,7 @@ GEM
     google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.48.1)
+    google-cloud-storage (1.49.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-core (~> 0.13)
@@ -178,7 +179,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.9.2)
+    googleauth (1.11.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
@@ -191,7 +192,8 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jsonapi-renderer (0.2.2)
-    jwt (2.7.1)
+    jwt (2.8.0)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -245,7 +247,7 @@ GEM
     passenger (6.0.20)
       rack
       rake (>= 0.8.1)
-    pg (1.5.4)
+    pg (1.5.5)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -259,27 +261,27 @@ GEM
       hashie (~> 4.1)
       multi_json (~> 1.15)
     racc (1.7.3)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.6)
-      actioncable (= 6.1.7.6)
-      actionmailbox (= 6.1.7.6)
-      actionmailer (= 6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actiontext (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    rails (6.1.7.7)
+      actioncable (= 6.1.7.7)
+      actionmailbox (= 6.1.7.7)
+      actionmailer (= 6.1.7.7)
+      actionpack (= 6.1.7.7)
+      actiontext (= 6.1.7.7)
+      actionview (= 6.1.7.7)
+      activejob (= 6.1.7.7)
+      activemodel (= 6.1.7.7)
+      activerecord (= 6.1.7.7)
+      activestorage (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.6)
+      railties (= 6.1.7.7)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
@@ -293,9 +295,9 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    railties (6.1.7.7)
+      actionpack (= 6.1.7.7)
+      activesupport (= 6.1.7.7)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -306,14 +308,14 @@ GEM
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    request_store (1.5.1)
+    request_store (1.6.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
     rexml (3.2.6)
-    rollbar (3.5.1)
+    rollbar (3.5.2)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -345,7 +347,7 @@ GEM
       parser
     secure_headers (6.5.0)
     set (1.1.0)
-    signet (0.18.0)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -382,7 +384,7 @@ GEM
       rails
     warden (1.2.9)
       rack (>= 2.0.9)
-    webmock (3.20.0)
+    webmock (3.22.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

diff --git a/frontend/messages/__tests__/cards_test.tsx b/frontend/messages/__tests__/cards_test.tsx
@@ -259,7 +259,7 @@ describe("changeFirmwareHardware()", () => {
 describe("SEED_DATA_OPTIONS()", () => {
   it("returns options", () => {
     mockFeatureBoolean = false;
-    expect(SEED_DATA_OPTIONS().length).toEqual(13);
+    expect(SEED_DATA_OPTIONS().length).toEqual(15);
   });
 
   it("returns more options", () => {

diff --git a/frontend/messages/cards.tsx b/frontend/messages/cards.tsx
@@ -165,49 +165,49 @@ const FirmwareChoiceTable = () =>
     </thead>
     <tbody>
       <tr>
-        <td>{"Genesis v1.2"}</td>
-        <td>{"RAMPS"}</td>
-        <td><code>{FIRMWARE_CHOICES_DDI["arduino"].label}</code></td>
-      </tr>
-      <tr>
-        <td>{"Genesis v1.3"}</td>
+        <td>{"Genesis v1.7"}</td>
         <td>{"Farmduino"}</td>
-        <td><code>{FIRMWARE_CHOICES_DDI["farmduino"].label}</code></td>
+        <td><code>{FIRMWARE_CHOICES_DDI["farmduino_k17"].label}</code></td>
       </tr>
       <tr>
-        <td>{"Genesis v1.4"}</td>
+        <td>{"Genesis v1.6"}</td>
         <td>{"Farmduino"}</td>
-        <td><code>{FIRMWARE_CHOICES_DDI["farmduino_k14"].label}</code></td>
+        <td><code>{FIRMWARE_CHOICES_DDI["farmduino_k16"].label}</code></td>
       </tr>
       <tr>
         <td>{"Genesis v1.5"}</td>
         <td>{"Farmduino"}</td>
         <td><code>{FIRMWARE_CHOICES_DDI["farmduino_k15"].label}</code></td>
       </tr>
       <tr>
-        <td>{"Genesis v1.6"}</td>
+        <td>{"Genesis v1.4"}</td>
         <td>{"Farmduino"}</td>
-        <td><code>{FIRMWARE_CHOICES_DDI["farmduino_k16"].label}</code></td>
+        <td><code>{FIRMWARE_CHOICES_DDI["farmduino_k14"].label}</code></td>
       </tr>
       <tr>
-        <td>{"Genesis v1.7"}</td>
+        <td>{"Genesis v1.3"}</td>
         <td>{"Farmduino"}</td>
-        <td><code>{FIRMWARE_CHOICES_DDI["farmduino_k17"].label}</code></td>
+        <td><code>{FIRMWARE_CHOICES_DDI["farmduino"].label}</code></td>
       </tr>
       <tr>
-        <td>{"Express v1.0"}</td>
-        <td>{"Farmduino"}</td>
-        <td><code>{FIRMWARE_CHOICES_DDI["express_k10"].label}</code></td>
+        <td>{"Genesis v1.2"}</td>
+        <td>{"RAMPS"}</td>
+        <td><code>{FIRMWARE_CHOICES_DDI["arduino"].label}</code></td>
       </tr>
+      {/* <tr>
+        <td>{"Express v1.2"}</td>
+        <td>{"Farmduino"}</td>
+        <td><code>{FIRMWARE_CHOICES_DDI["express_k12"].label}</code></td>
+      </tr> */}
       <tr>
         <td>{"Express v1.1"}</td>
         <td>{"Farmduino"}</td>
         <td><code>{FIRMWARE_CHOICES_DDI["express_k11"].label}</code></td>
       </tr>
       <tr>
-        <td>{"Express v1.2"}</td>
+        <td>{"Express v1.0"}</td>
         <td>{"Farmduino"}</td>
-        <td><code>{FIRMWARE_CHOICES_DDI["express_k12"].label}</code></td>
+        <td><code>{FIRMWARE_CHOICES_DDI["express_k10"].label}</code></td>
       </tr>
     </tbody>
   </table>;
@@ -252,30 +252,26 @@ const FirmwareMissing = (props: FirmwareMissingProps) =>
   </AlertCardTemplate>;
 
 export const SEED_DATA_OPTIONS = (displayAll = false): DropDownItem[] => [
-  { label: "Genesis v1.2", value: "genesis_1.2" },
-  { label: "Genesis v1.3", value: "genesis_1.3" },
-  { label: "Genesis v1.4", value: "genesis_1.4" },
-  { label: "Genesis v1.5", value: "genesis_1.5" },
+  { label: "Genesis v1.7", value: "genesis_1.7" },
   { label: "Genesis v1.6", value: "genesis_1.6" },
-  ...((shouldDisplayFeature(Feature.farmduino_k17) || displayAll)
-    ? [{ label: "Genesis v1.7", value: "genesis_1.7" }]
-    : []),
-  { label: "Genesis v1.4 XL", value: "genesis_xl_1.4" },
-  { label: "Genesis v1.5 XL", value: "genesis_xl_1.5" },
+  { label: "Genesis v1.5", value: "genesis_1.5" },
+  { label: "Genesis v1.4", value: "genesis_1.4" },
+  { label: "Genesis v1.3", value: "genesis_1.3" },
+  { label: "Genesis v1.2", value: "genesis_1.2" },
+  { label: "Genesis v1.7 XL", value: "genesis_xl_1.7" },
   { label: "Genesis v1.6 XL", value: "genesis_xl_1.6" },
-  ...((shouldDisplayFeature(Feature.farmduino_k17) || displayAll)
-    ? [{ label: "Genesis v1.7 XL", value: "genesis_xl_1.7" }]
-    : []),
-  { label: "Express v1.0", value: "express_1.0" },
-  { label: "Express v1.1", value: "express_1.1" },
+  { label: "Genesis v1.5 XL", value: "genesis_xl_1.5" },
+  { label: "Genesis v1.4 XL", value: "genesis_xl_1.4" },
   ...((shouldDisplayFeature(Feature.express_k12) || displayAll)
     ? [{ label: "Express v1.2", value: "express_1.2" }]
     : []),
-  { label: "Express v1.0 XL", value: "express_xl_1.0" },
-  { label: "Express v1.1 XL", value: "express_xl_1.1" },
+  { label: "Express v1.1", value: "express_1.1" },
+  { label: "Express v1.0", value: "express_1.0" },
   ...((shouldDisplayFeature(Feature.express_k12) || displayAll)
     ? [{ label: "Express v1.2 XL", value: "express_xl_1.2" }]
     : []),
+  { label: "Express v1.1 XL", value: "express_xl_1.1" },
+  { label: "Express v1.0 XL", value: "express_xl_1.0" },
   { label: "Custom Bot", value: "none" },
 ];