Add user store credit: Load modal with turbo frame

Author: tvdeyen

admin/app/components/solidus_admin/users/store_credits/index/component.html.erb

@@ -5,9 +5,14 @@
 
     <%= page_header_actions do %>
       <%= render component("ui/button").new(
-        "data-action": "click->#{stimulus_id}#actionButtonClicked",
-        "data-#{stimulus_id}-url-param": solidus_admin.new_user_store_credit_path(user_id: @user.id, _turbo_frame: :new_store_credit_modal),
+        tag: :a,
+        href: solidus_admin.new_user_store_credit_path(user_id: @user.id),
+        data: {
+          turbo_frame: :new_store_credit_modal,
+          turbo_prefetch: false
+        },
         text: t(".add_store_credit"),
+        icon: "add-line"
       )%>
     <% end %>
   <% end %>

admin/app/components/solidus_admin/users/store_credits/new/component.html.erb

@@ -28,4 +28,3 @@
     <% end %>
   <% end %>
 <% end %>
-<%= render component("users/store_credits/index").new(user: @user, store_credits: @store_credits) %>

admin/app/components/solidus_admin/users/store_credits/new/component.rb

@@ -5,7 +5,6 @@ def initialize(user:, store_credit:, categories:)
     @user = user
     @store_credit = store_credit
     @store_credit_categories = categories
-    @store_credits = Spree::StoreCredit.where(user_id: @user.id).order(id: :desc)
   end
 
   def form_id

admin/spec/features/store_credits_spec.rb

@@ -34,7 +34,7 @@
     it "allows creation of a new store credit" do
       click_on "Create One"
 
-      expect(page).to have_selector("dialog", wait: 5)
+      expect(page).to have_selector("dialog")
       expect(page).to have_content("New Store Credit")
 
       within("dialog") do
@@ -47,7 +47,7 @@
 
       click_on "Create One"
 
-      expect(page).to have_selector("dialog", wait: 5)
+      expect(page).to have_selector("dialog")
       expect(page).to have_content("New Store Credit")
 
       within("dialog") do
@@ -109,7 +109,7 @@
         context "with invalid amount" do
           it "shows the appropriate error message" do
             click_on "Edit Amount"
-            expect(page).to have_selector("dialog", wait: 5)
+            expect(page).to have_selector("dialog")
             expect(page).to have_content("Edit Store Credit Amount")
 
             within("dialog") do
@@ -124,7 +124,7 @@
         context "without a valid reason" do
           it "shows the appropriate error message" do
             click_on "Edit Amount"
-            expect(page).to have_selector("dialog", wait: 5)
+            expect(page).to have_selector("dialog")
             expect(page).to have_content("Edit Store Credit Amount")
 
             within("dialog") do
@@ -139,7 +139,7 @@
         context "with valid params" do
           it "allows editing of the store credit amount" do
             click_on "Edit Amount"
-            expect(page).to have_selector("dialog", wait: 5)
+            expect(page).to have_selector("dialog")
             expect(page).to have_content("Edit Store Credit Amount")
 
             within("dialog") do
@@ -159,7 +159,7 @@
         context "without a valid reason" do
           it "shows the appropriate error message" do
             click_on "Invalidate"
-            expect(page).to have_selector("dialog", wait: 5)
+            expect(page).to have_selector("dialog")
             expect(page).to have_content("Invalidate Store Credit")
 
             within("dialog") do
@@ -173,7 +173,7 @@
         context "with a valid reason" do
           it "invalidates the store credit" do
             click_on "Invalidate"
-            expect(page).to have_selector("dialog", wait: 5)
+            expect(page).to have_selector("dialog")
             expect(page).to have_content("Invalidate Store Credit")
 
             within("dialog") do
@@ -192,7 +192,7 @@
       context "when editing the store credit memo" do
         it "allows editing of the store credit memo" do
           click_on "Edit Memo"
-          expect(page).to have_selector("dialog", wait: 5)
+          expect(page).to have_selector("dialog")
           expect(page).to have_content("Edit Store Credit Memo")
 
           within("dialog") do

admin/spec/requests/solidus_admin/store_credits_spec.rb

@@ -60,7 +60,6 @@
     it "renders the new store credit template with a 200 OK status" do
       get solidus_admin.new_user_store_credit_path(user)
       expect(response).to have_http_status(:ok)
-      expect(response.body).to include(store_credit.amount.to_s)
     end
   end