Merge pull request #236 from opf/fix/custom-button-text-regression

Fix Danger Dialog regression: unable to set custom button text

Author: HDinger

.changeset/gold-moles-beg.md

@@ -0,0 +1,5 @@
+---
+'@openproject/primer-view-components': patch
+---
+
+Fix regression: callers unable to set custom button text

app/components/primer/open_project/danger_dialog.rb

@@ -77,6 +77,9 @@ def initialize(
         @form_wrapper = FormWrapper.new(**form_arguments)
         @dialog_id = id.to_s
 
+        @confirm_button_text = confirm_button_text
+        @cancel_button_text = cancel_button_text
+
         @system_arguments = system_arguments
         @system_arguments[:id] = @dialog_id
         @system_arguments[:classes] = class_names(

previews/primer/open_project/danger_dialog_preview/playground.html.erb

@@ -1,4 +1,5 @@
 <%= render(Primer::OpenProject::DangerDialog.new(id: "my-dialog",
+                                                 title: "My dialog",
                                                  confirm_button_text: confirm_button_text,
                                                  cancel_button_text: cancel_button_text)) do |dialog| %>
   <% dialog.with_show_button { "Click me" } %>

test/components/primer/open_project/danger_dialog_test.rb

@@ -32,6 +32,22 @@ def test_renders_default_button_text
     end
   end
 
+  def test_renders_default_with_custom_button_text
+    render_inline(Primer::OpenProject::DangerDialog.new(
+      confirm_button_text: "Do it!",
+      cancel_button_text: "Don't do it!"
+    )) do |dialog|
+      dialog.with_confirmation_message do |message|
+        message.with_heading(tag: :h2) { "Danger" }
+      end
+    end
+
+    assert_selector("dialog.DangerDialog") do
+      assert_selector(".Overlay-footer .Button", text: "Don't do it!")
+      assert_selector(".Overlay-footer .Button", text: "Do it!")
+    end
+  end
+
   def test_renders_with_confirmation_check_box
     render_inline(Primer::OpenProject::DangerDialog.new) do |dialog|
       dialog.with_confirmation_message do |message|
@@ -62,6 +78,23 @@ def test_renders_with_confirmation_check_box_button_text
     end
   end
 
+  def test_renders_with_confirmation_check_box_custom_button_text
+    render_inline(Primer::OpenProject::DangerDialog.new(
+      confirm_button_text: "Do it FOREVER!",
+      cancel_button_text: "Nah"
+    )) do |dialog|
+      dialog.with_confirmation_message do |message|
+        message.with_heading(tag: :h2) { "Danger" }
+        dialog.with_confirmation_check_box { "I am sure about this deletion" }
+      end
+    end
+
+    assert_selector("dialog.DangerDialog") do
+      assert_selector(".Overlay-footer .Button", text: "Nah")
+      assert_selector(".Overlay-footer .Button", text: "Do it FOREVER!")
+    end
+  end
+
   def test_does_not_render_if_no_confirmation_message_provided
     error = assert_raises(ArgumentError) do
       render_inline(Primer::OpenProject::DangerDialog.new)

test/system/open_project/danger_dialog_test.rb

@@ -36,6 +36,17 @@ def test_submit_button_enabled_when_confirmation_check_box_checked
     end
   end
 
+  def test_playground_custom_button_text
+    visit_preview(:playground, confirm_button_text: "Löschen", cancel_button_text: "Abbrechen")
+
+    click_button("Click me")
+    assert_selector(".DangerDialog")
+    within(".DangerDialog") do
+      assert_selector("button[data-submit-dialog-id]", text: "Löschen")
+      assert_selector("button[data-close-dialog-id]", text: "Abbrechen")
+    end
+  end
+
   def test_submit_button_submits_form
     visit_preview(:with_form_test, route_format: :json)