Merge pull request #1628 from FarmBot/fbjs_update

FBJS Upgrades

frontend/__test_support__/fake_state/resources.ts

@@ -47,6 +47,7 @@ export function fakeSequence(): TaggedSequence {
     color: "red",
     name: "fake",
     kind: "sequence",
+    folder_id: undefined,
     body: []
   });
 }

frontend/__test_support__/resource_index_builder.ts

@@ -39,6 +39,7 @@ const tr0: TaggedResource = {
     "id": 23,
     "name": "Goto 0, 0, 0",
     "color": "gray",
+    "folder_id": undefined,
     "body": [
       {
         "kind": "move_absolute",
@@ -366,6 +367,7 @@ const KIND_PRIORITY: ResourceLookupTable = {
   Sensor: 1,
   Tool: 1,
   Alert: 1,
+  Folder: 1,
   PointGroup: 2,
   SensorReading: 2,
   Sequence: 2,
@@ -400,6 +402,7 @@ const blankSeq: TaggedSequence = {
   "body": {
     "id": undefined,
     "name": "Repair sequence",
+    "folder_id": undefined,
     "color": "gray",
     "body": [],
     "args": {

frontend/regimens/bulk_scheduler/__tests__/actions_test.ts

@@ -39,6 +39,7 @@ describe("commitBulkEditor()", () => {
       id: sequence_id,
       name: "Test Sequence",
       color: "gray",
+      folder_id: undefined,
       body: [{ kind: "wait", args: { milliseconds: 100 } }],
       args: { "locals": { kind: "scope_declaration", args: {} }, "version": 4 },
       kind: "sequence"

frontend/resources/__tests__/in_use_test.ts

@@ -108,6 +108,7 @@ describe("in_use tracking at reducer level", () => {
       name: "Y",
       kind: "sequence",
       color: "blue",
+      folder_id: undefined,
       args: { version: 8, locals: { kind: "scope_declaration", args: {} } }
     })[0];
     sequence.body.id = sequence_id;

frontend/resources/__tests__/reducer_test.ts

@@ -27,6 +27,7 @@ describe("resource reducer", () => {
     const next = resourceReducer(state, overwrite(sequence, {
       kind: "sequence",
       name: "wow",
+      folder_id: undefined,
       args: { version: -0, locals: { kind: "scope_declaration", args: {} } },
       body: [],
       color: "red"

frontend/resources/__tests__/sequence_tagging_test.ts

@@ -10,6 +10,7 @@ describe("tagAllSteps()", () => {
     "body": {
       "id": 8,
       "name": "Goto 0, 0, 0",
+      "folder_id": undefined,
       "color": "gray",
       "body": [
         {

frontend/resources/reducer.ts

@@ -63,6 +63,7 @@ export const emptyState = (): RestResources => {
         User: {},
         WebAppConfig: {},
         WebcamFeed: {},
+        Folder: {}
       },
       byKindAndId: {},
       references: {},

frontend/sequences/__tests__/all_steps_test.tsx

@@ -15,6 +15,7 @@ describe("<AllSteps/>", () => {
     "body": sanitizeNodes({
       "id": 8,
       "name": "Goto 0, 0, 0",
+      "folder_id": undefined,
       "color": "gray",
       "body": [
         {

frontend/sequences/__tests__/test_button_test.tsx

@@ -36,6 +36,7 @@ describe("<TestButton/>", () => {
         "name": "Goto 0, 0, 0",
         "color": "gray",
         "body": [],
+        "folder_id": undefined,
         "args": {
           "version": 4,
           "locals": { kind: "scope_declaration", args: {} },

frontend/sequences/inputs/__tests__/input_default_test.tsx

@@ -40,6 +40,7 @@ describe("<InputDefault/>", () => {
         "name": "Goto 0, 0, 0",
         "color": "gray",
         "body": [step],
+        "folder_id": undefined,
         "args": {
           "version": 4,
           "locals": { kind: "scope_declaration", args: {} },

frontend/sequences/sequences_list.tsx

@@ -91,6 +91,7 @@ const SequenceListItem = (props: SequenceListItemProps) =>
 
 const emptySequenceBody = (seqCount: number): TaggedSequence["body"] => ({
   name: t("new sequence {{ num }}", { num: seqCount }),
+  folder_id: undefined,
   args: {
     version: -999,
     locals: { kind: "scope_declaration", args: {} },

frontend/sequences/step_tiles/tile_if/__tests__/lhs_test.ts

@@ -39,6 +39,7 @@ const seedSequence: TaggedSequence = {
     color: "red",
     name: "test",
     kind: "sequence",
+    folder_id: undefined,
     args: {
       locals: { kind: "scope_declaration", args: {} },
       version: 9999

package.json

@@ -45,7 +45,7 @@
     "coveralls": "3.0.9",
     "enzyme": "3.10.0",
     "enzyme-adapter-react-16": "1.15.1",
-    "farmbot": "8.3.1",
+    "farmbot": "9.0.0-rc1",
     "i18next": "19.0.2",
     "install": "0.13.0",
     "lodash": "4.17.15",