From 7f6449ece212cd954c72a97ce0a88e7ed307e3aa Mon Sep 17 00:00:00 2001
From: Rick Carlino <rick.carlino@gmail.com>
Date: Wed, 11 Dec 2019 14:24:47 -0600
Subject: [PATCH] Bug fix: Save newly saved sequences under the correct folder

---
 app/mutations/sequences/create.rb       |  2 ++
 frontend/folders/component.tsx          |  2 +-
 spec/mutations/sequences/create_spec.rb | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/mutations/sequences/create.rb b/app/mutations/sequences/create.rb
index 416845ed9..6f39bf155 100644
--- a/app/mutations/sequences/create.rb
+++ b/app/mutations/sequences/create.rb
@@ -12,6 +12,7 @@ module Sequences
     optional do
       color
       args
+      integer :folder_id
     end
 
     def validate
@@ -25,6 +26,7 @@ module Sequences
           p = inputs
             .merge(migrated_nodes: true)
             .without(:body, :args, "body", "args")
+            .merge(folder: device.folders.find_by(id: folder_id))
           seq = Sequence.create!(p)
           x = CeleryScript::FirstPass.run!(sequence: seq,
                                            args: args || {},
diff --git a/frontend/folders/component.tsx b/frontend/folders/component.tsx
index 81d926a5e..f54ec0d18 100644
--- a/frontend/folders/component.tsx
+++ b/frontend/folders/component.tsx
@@ -191,7 +191,7 @@ export class RawFolders extends React.Component<Props, State> {
         onChange={({ currentTarget }) => { updateSearchTerm(currentTarget.value); }} />
       <button onClick={this.toggleAll}>{this.state.toggleDirection ? "📂" : "📁"}</button>
       <button onClick={() => createFolder()}>+📁</button>
-      <button title="+Sequence">+</button>
+      <button onClick={() => addNewSequenceToFolder(0)}>+</button>
       <this.Graph />
       {this.state.movedSequenceUuid && <FolderDropButton onClick={() => this.endSequenceMove(0)} />}
       <ul>
diff --git a/spec/mutations/sequences/create_spec.rb b/spec/mutations/sequences/create_spec.rb
index 26a3d7827..6a9c348b8 100644
--- a/spec/mutations/sequences/create_spec.rb
+++ b/spec/mutations/sequences/create_spec.rb
@@ -18,6 +18,17 @@ describe Sequences::Create do
     expect(Sequence.find(seq[:id]).device).to eq(device)
   end
 
+  it "creates a sequence with a folder" do
+    folder = Folder.create!(name: "parent",
+                            color: "red",
+                            device: user.device)
+    seq = Sequences::Create.run!(device: device,
+                                name: "X",
+                                body: [],
+                                folder_id: folder.id)
+    expect(folder.id).to eq(seq.fetch("folder_id"))
+  end
+
   it 'Gives validation errors for malformed AST nodes' do
     move_abs = body.select{ |x| x["kind"] == "move_absolute" }.first
     move_abs["args"]["location"]["args"]["x"] = "not a number"