Add Save & Close button for snippet

Author: rossta

app/controllers/share/snippets_controller.rb

@@ -66,7 +66,9 @@ def destroy
 
   def share_snippet_redirect_url(snippet)
     case params[:commit]
-    when "Share"
+    when /Close/
+      share_snippet_url(snippet)
+    when /Share/
       new_share_snippet_screenshot_url(snippet, auto: true)
     else
       edit_share_snippet_url(snippet)

app/views/share/snippets/form.rb

@@ -52,10 +52,14 @@ def view_template
 
         fieldset do
           flex_block do
+            language_select(form, data: {action: "change->snippet-preview#preview"})
+
             plain form.submit "Share", class: "button primary"
 
             plain form.submit "Save", class: "button secondary"
 
+            plain form.submit "Save & Close", class: "button secondary"
+
             plain form.submit "Preview",
               class: "button secondary hidden",
               formaction: form_path,
@@ -65,13 +69,12 @@ def view_template
                 snippet_preview_target: "previewButton",
                 turbo_frame: dom_id(snippet, :code_block)
               }
-
-            language_select(form, data: {action: "change->snippet-preview#preview"})
           end
         end
       end
 
       if @snippet.persisted?
+        br
         br
         div do
           flex_block do

app/views/share/snippets/show.html.erb

@@ -13,13 +13,14 @@
 <%= render Pages::Header.new(title: "Snippet Share") %>
 <div class="section-content container py-gap mb-3xl">
   <%= turbo_frame_tag :snippet_form do %>
-    <%= render CodeBlock::Snippet.new(@snippet) %>
+    <div class="section-content">
+      <%= render CodeBlock::Snippet.new(@snippet) %>
+      <div>
+        <%= render Share::Snippets::Toolbar.new(@snippet, current_user: current_user) %>
+      </div>
+    </div>
   <% end %>
 
-  <div>
-    <%= render Share::Snippets::Toolbar.new(@snippet, current_user: current_user) %>
-  </div>
-
   <br>
 
   <div>

app/views/share/snippets/toolbar.rb

@@ -12,7 +12,9 @@ def view_template
     flex_block do
       link_to "Share", share_url, class: "button primary"
       if @current_user&.can_edit?(@snippet)
-        link_to "Edit this snippet", edit_share_snippet_path(@snippet), class: "button secondary"
+        link_to "Edit this snippet", edit_share_snippet_path(@snippet),
+          class: "button secondary",
+          data: {turbo_frame: "snippet_form"}
       end
     end
   end

spec/requests/share/snippets_spec.rb

@@ -109,6 +109,11 @@
         post share_snippets_url, params: {snippet: {source: "puts \"Hello!\"", language: "ruby"}, commit: "Share"}
         expect(response).to redirect_to(new_share_snippet_screenshot_url(Snippet.last, auto: true))
       end
+
+      it "redirects to the show page" do
+        post share_snippets_url, params: {snippet: {source: "puts \"Hello!\"", language: "ruby"}, commit: "Save & Close"}
+        expect(response).to redirect_to(share_snippet_url(Snippet.last))
+      end
     end
 
     context "with invalid parameters" do
@@ -173,6 +178,15 @@
         snippet.reload
         expect(response).to redirect_to(new_share_snippet_screenshot_url(snippet, auto: true))
       end
+
+      it "redirects to the show page" do
+        user = login_as_user
+        Flipper.enable(:snippets, user)
+        snippet = FactoryBot.create(:snippet, author: user)
+        patch share_snippet_url(snippet), params: {snippet: {source: "puts \"Goodbye!\""}, commit: "Save & Close"}
+        snippet.reload
+        expect(response).to redirect_to(share_snippet_url(snippet))
+      end
     end
 
     context "with invalid parameters" do