Consolidate bulk-dialog controllers

Author: amatsuda

app/controllers/staff/grids/bulk_time_slots_controller.rb

@@ -31,9 +31,7 @@ def cancel
 
   def edit
     @bulk = BulkTimeSlot.new(bulk_time_slot_params)
-    respond_to do |format|
-      format.turbo_stream
-    end
+    render partial: 'create_dialog', locals: {bulk: @bulk}
   end
 
   def create

app/javascript/controllers/bulk_dialog_controller.js

@@ -3,7 +3,10 @@ import { Modal } from "bootstrap"
 
 export default class extends Controller {
   connect() {
-    const modalElement = this.element.closest('.modal')
+    this.element.addEventListener('turbo:frame-load', () => this.open())
+  }
+
+  open() {
     const formatSelect = this.element.querySelector('select.session-format')
     const durationInput = this.element.querySelector('.time-slot-duration')
 
@@ -19,9 +22,6 @@ export default class extends Controller {
       })
     }
 
-    if (!modalElement.classList.contains('show')) {
-      const modal = Modal.getOrCreateInstance(modalElement)
-      modal.show()
-    }
+    Modal.getOrCreateInstance(this.element).show()
   }
 }

app/javascript/controllers/bulk_dialog_show_controller.js

@@ -13,7 +13,6 @@ import AlertAutodismissController from "./alert_autodismiss_controller"
 import AlertController from "./alert_controller"
 import BannerAdsController from "./banner_ads_controller"
 import BulkDialogController from "./bulk_dialog_controller"
-import BulkDialogShowController from "./bulk_dialog_show_controller"
 import CfpDatatableController from "./cfp_datatable_controller"
 import ContentController from "./content_controller"
 import CopySpeakerEmailsController from "./copy_speaker_emails_controller"
@@ -60,7 +59,6 @@ application.register("alert-autodismiss", AlertAutodismissController)
 application.register("alert", AlertController)
 application.register("banner-ads", BannerAdsController)
 application.register("bulk-dialog", BulkDialogController)
-application.register("bulk-dialog-show", BulkDialogShowController)
 application.register("cfp-datatable", CfpDatatableController)
 application.register("content", ContentController)
 application.register("copy-speaker-emails", CopySpeakerEmailsController)

app/javascript/controllers/index.js

@@ -1,10 +1,10 @@
 = turbo_frame_tag 'bulk-time-slot-dialog' do
-  .modal-dialog{data: {controller: 'bulk-dialog'}}
+  .modal-dialog
     .modal-content
       = simple_form_for bulk, url: preview_event_staff_schedule_grid_bulk_time_slot_path, data: {turbo: true}, html: {role: 'form'} do |f|
         .modal-header
           %h3 Bulk Generate Time Slots
-        .errors
+        #bulk-errors.errors
         .modal-body
           = render partial: 'staff/grids/bulk_time_slots/form', locals: {f: f, bulk: bulk}
         .modal-footer

app/views/staff/grids/bulk_time_slots/_create_dialog.html.haml

@@ -4,7 +4,7 @@
     = cancel_bulk_preview_button(bulk.day)
 
     = simple_form_for bulk, url: edit_event_staff_schedule_grid_bulk_time_slot_path(current_event),
-        data: {turbo: true}, html: {role: 'form'} do |f|
+        data: {turbo: true, turbo_frame: 'bulk-time-slot-dialog'}, html: {role: 'form'} do |f|
       = render partial: 'preview_form', locals: {f: f, bulk: bulk}
       = f.button :submit, 'Edit', class: 'btn btn-info btn-sm'
 

app/views/staff/grids/bulk_time_slots/_preview_bar.html.haml

@@ -1,10 +1,6 @@
 - if @bulk.errors.present?
-  = turbo_stream.update '#bulk-time-slot-create-dialog .errors' do
+  = turbo_stream.update 'bulk-errors' do
     = @bulk.errors.full_messages.join(', ')
-
-  = turbo_stream.append 'grid-time-slot-actions' do
-    %div{data: {controller: 'bulk-dialog-show'}}
-
 - else
   = turbo_stream.replace "schedule_day_#{@bulk.day}" do
     = render partial: 'staff/grids/grid', locals: {schedule: @schedule, day: @bulk.day}

app/views/staff/grids/bulk_time_slots/create.turbo_stream.haml

@@ -31,7 +31,7 @@
               = render partial: 'staff/grids/unscheduled_sessions', locals: {day: day}
 
   / Modals
-  #bulk-time-slot-create-dialog.modal.fade{role: "dialog"}
+  #bulk-time-slot-create-dialog.modal.fade{role: "dialog", data: {controller: 'bulk-dialog'}}
     = turbo_frame_tag 'bulk-time-slot-dialog'
   #grid-time-slot-edit-dialog.modal.fade{role: "dialog", data: {controller: 'modal-form', modal_form_target: 'modal'}}
   #program-session-show-dialog.modal.fade{role: "dialog"}