From 4e93b491048faa9e17a80ad5b93dca7672d5dee2 Mon Sep 17 00:00:00 2001 From: wandji20 Date: Tue, 15 Oct 2024 03:13:47 +0100 Subject: [PATCH] Replace bulk invoice CableReady broadcast with ActionCable --- app/jobs/bulk_invoice_job.rb | 10 +++++----- app/webpacker/channels/session_channel.js | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/jobs/bulk_invoice_job.rb b/app/jobs/bulk_invoice_job.rb index c77eb077f9..f2b4ab8b82 100644 --- a/app/jobs/bulk_invoice_job.rb +++ b/app/jobs/bulk_invoice_job.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true class BulkInvoiceJob < ApplicationJob - include CableReady::Broadcaster delegate :render, to: ActionController::Base attr_reader :options @@ -40,13 +39,14 @@ class BulkInvoiceJob < ApplicationJob def broadcast(filepath, channel) file_id = filepath.split("/").last.split(".").first - cable_ready[channel]. - inner_html( + ActionCable.server.broadcast( + channel, + { selector: "#bulk_invoices_modal .modal-content", html: render(partial: "spree/admin/orders/bulk/invoice_link", locals: { invoice_url: "/admin/orders/invoices/#{file_id}" }) - ). - broadcast + } + ) end def ensure_directory_exists(filepath) diff --git a/app/webpacker/channels/session_channel.js b/app/webpacker/channels/session_channel.js index d43acef462..fd5e716fe8 100644 --- a/app/webpacker/channels/session_channel.js +++ b/app/webpacker/channels/session_channel.js @@ -1,8 +1,9 @@ import consumer from './consumer' -import CableReady from 'cable_ready' consumer.subscriptions.create("SessionChannel", { received(data) { - if (data.cableReady) CableReady.perform(data.operations) + if (!data.selector) return; + + document.querySelector(data.selector).innerHTML = data.html; } });