Skip to content

Commit c683ac3

Browse files
committed
Fix loading of stimulus controllers
1 parent 18c8762 commit c683ac3

File tree

6 files changed

+24
-43
lines changed

6 files changed

+24
-43
lines changed

app/javascript/better_together/application.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,15 @@
1414
//= require popper
1515
//= require bootstrap-sprockets
1616
//= require better_together/tooltips
17-
// require_tree .
1817

1918
import { Turbo } from '@hotwired/turbo-rails'
20-
// import 'trix'
21-
// import { start as startActionText } from '@rails/actiontext'
19+
import './better_together/controllers'
2220

23-
import { application } from 'better_together/controllers'
2421
// import 'better_together/trix-extensions/richtext'
22+
// import 'trix'
23+
// import { start as startActionText } from '@rails/actiontext'
2524

2625
// Turbo.session.drive = false
2726

28-
console.log('initializing engine')
29-
30-
// window.Stimulus = application
27+
// console.log('initializing engine')
3128

32-
export { application }
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { Application } from "@hotwired/stimulus"
2+
3+
const application = Application.start()
4+
5+
// Configure Stimulus development experience
6+
application.debug = false
7+
window.Stimulus = application
8+
9+
export { application }
Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,5 @@
1+
import { application } from './controllers/application'
12

2-
import { Application } from "@hotwired/stimulus"
3-
import FlashController from "./flash_controller"
4-
// import ModalController from "./modal_controller"
5-
import DynamicSelectController from "./dynamic_select_controller"
6-
import NewPersonCommunityMembershipController from "./new_person_community_membership_controller"
7-
import PersonCommunityMembershipController from "./person_community_membership_controller"
8-
9-
const application = Application.start()
10-
11-
// Configure Stimulus development experience
12-
application.debug = true
13-
window.Stimulus = application
14-
15-
console.log('start application')
16-
17-
Stimulus.register('flash', FlashController)
18-
// Stimulus.register('modal', ModalController)
19-
Stimulus.register('bt-dynamic-select', DynamicSelectController)
20-
Stimulus.register('bt-new-person-community-membership', NewPersonCommunityMembershipController)
21-
Stimulus.register('bt-person-community-membership', PersonCommunityMembershipController)
22-
23-
// Lazy load controllers as they appear in the DOM (remember not to preload controllers in import map!)
24-
import { lazyLoadControllersFrom } from 'stimulus-loading' // Adjust the path if necessary
25-
lazyLoadControllersFrom("controllers", application)
26-
27-
console.log('initializing engine controllers')
28-
29-
export { application }
3+
// Eager load all controllers defined in the import map under controllers/**/*_controller
4+
import { lazyLoadControllersFrom } from 'stimulus-loading'
5+
lazyLoadControllersFrom('./better_together/controllers', application)

app/javascript/better_together/controllers/new_person_community_membership_controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default class extends Controller {
55
static targets = ["modal", "sourceSelect"]
66

77
connect() {
8-
console.log("New BetterTogether::PersonCommunityMembership controller connected");
8+
// console.log("New BetterTogether::PersonCommunityMembership controller connected");
99
this.modal = new bootstrap.Modal(this.modalTarget)
1010
}
1111

app/views/better_together/communities/show.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
<% end %>
4141

4242
<!-- Add Member Button -->
43-
<div data-controller="bt-new-person-community-membership">
44-
<button type="button" class="btn btn-primary" data-action="click->bt-new-person-community-membership#openModal">
43+
<div data-controller="new-person-community-membership">
44+
<button type="button" class="btn btn-primary" data-action="click->new-person-community-membership#openModal">
4545
Add Member
4646
</button>
4747

4848
<!-- Add Member Modal -->
49-
<div class="modal fade" id="addMemberModal" tabindex="-1" aria-labelledby="addMemberModalLabel" data-bt-new-person-community-membership-target="modal" data-action="turbo:submit-end->bt-new-person-community-membership#handleSuccess">
49+
<div class="modal fade" id="addMemberModal" tabindex="-1" aria-labelledby="addMemberModalLabel" data-new-person-community-membership-target="modal" data-action="turbo:submit-end->new-person-community-membership#handleSuccess">
5050
<div class="modal-dialog">
5151
<div class="modal-content">
5252
<div class="modal-header">

config/importmap.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
# config/importmap.rb
44

5-
pin_all_from File.expand_path('../app/javascript', __dir__)
6-
# pin_all_from 'app/javascript/better_together/controllers', under: 'controllers', to: 'controllers'
7-
pin_all_from 'app/javascript/better_together/trix-extensions', under: 'trix-extensions', to: 'trix-extensions'
5+
pin_all_from File.expand_path('../app/javascript/better_together', __dir__)
6+
pin_all_from 'app/javascript/better_together/controllers', under: 'better_together/controllers', to: 'controllers'
7+
# pin_all_from 'app/javascript/better_together/trix-extensions', under: 'trix-extensions', to: 'trix-extensions'
88

99
pin '@hotwired/turbo-rails', to: 'turbo.min.js'
1010
pin '@hotwired/stimulus', to: 'stimulus.min.js'

0 commit comments

Comments
 (0)