Skip to content

Commit c1bab70

Browse files
committed
Refactor backend
1 parent 4796f55 commit c1bab70

File tree

6 files changed

+16
-39
lines changed

6 files changed

+16
-39
lines changed

src/browser_panel/messaging.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const handleBackendToPanelMessage = (message, port) => {
2222
setTurboCables(message.turboCables, message.url)
2323
setPort(port)
2424
break
25-
case BACKEND_TO_PANEL_MESSAGES.SET_STIMULUS_CONTROLLERS:
25+
case BACKEND_TO_PANEL_MESSAGES.SET_STIMULUS_DATA:
2626
setStimulusData(message.stimulusData, message.url)
2727
setPort(port)
2828
break

src/browser_panel/page/backend.js

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -95,36 +95,14 @@ function init() {
9595
}
9696
}
9797

98-
// TurboFrameObserver delegate methods
99-
frameConnected(frame) {
98+
// Delegate methods
99+
turboFramesChanged() {
100100
this.sendTurboFrames()
101101
}
102-
frameDisconnected(frame) {
103-
this.sendTurboFrames()
104-
}
105-
frameAttributeChanged(frame, attributeName, oldValue, newValue) {
106-
this.sendTurboFrames()
107-
}
108-
109-
// TurboCableObserver delegate methods
110-
turboCableConnected(element) {
111-
this.sendTurboCableData()
112-
}
113-
turboCableDisconnected(element) {
102+
turboCableChaned() {
114103
this.sendTurboCableData()
115104
}
116-
turboCableAttributeChanged(element, attributeName, oldValue, newValue) {
117-
this.sendTurboCableData()
118-
}
119-
120-
// Stimulus delegate methods
121-
stimulusControllerConnected(element) {
122-
this.sendStimulusData()
123-
}
124-
stimulusControllerDisonnected(element) {
125-
this.sendStimulusData()
126-
}
127-
stimulusControllerChanged(element, attributeName, oldValue, newValue) {
105+
stimulusDataChanged() {
128106
this.sendStimulusData()
129107
}
130108

@@ -190,7 +168,7 @@ function init() {
190168
this._postMessage({
191169
stimulusData: this.observers.stimulus.getStimulusData(),
192170
url: btoa(window.location.href),
193-
type: BACKEND_TO_PANEL_MESSAGES.SET_STIMULUS_CONTROLLERS,
171+
type: BACKEND_TO_PANEL_MESSAGES.SET_STIMULUS_DATA,
194172
})
195173
}, 10)
196174

src/browser_panel/page/stimulus_observer.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ export default class StimulusObserver {
3333
const controllerData = this.buildStimulusElementData(element, identifier)
3434
this.controllerElements.get(uuid).push(controllerData)
3535
})
36-
this.delegate.stimulusControllerConnected(element)
36+
this.delegate.stimulusDataChanged()
3737
}
3838

3939
elementUnmatched(element) {
4040
const uuid = getUUIDFromElement(element)
4141

4242
if (this.controllerElements.has(uuid)) {
4343
this.controllerElements.delete(uuid)
44-
this.delegate.stimulusControllerDisonnected(element)
44+
this.delegate.stimulusDataChanged()
4545
}
4646
}
4747

@@ -50,12 +50,11 @@ export default class StimulusObserver {
5050
if (this.matchElement(element)) {
5151
const uuid = getUUIDFromElement(element)
5252
if (this.controllerElements.has(uuid)) {
53-
const newValue = element.getAttribute(attributeName)
5453
const newControllerElementData = this.controllerElements.get(uuid).map((controllerData) => {
5554
return this.buildStimulusElementData(element, controllerData.identifier)
5655
})
5756
this.controllerElements.set(uuid, newControllerElementData)
58-
this.delegate.stimulusControllerChanged(element, attributeName, oldValue, newValue)
57+
this.delegate.stimulusDataChanged()
5958
}
6059
}
6160
}

src/browser_panel/page/turbo_cable_observer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default class TurboCableObserver {
2424
if (!this.streamSources.has(uuid)) {
2525
const turboCableData = this.buildTurboCableData(element)
2626
this.streamSources.set(uuid, turboCableData)
27-
this.delegate.turboCableConnected(element)
27+
this.delegate.turboCableChaned()
2828
}
2929
}
3030

@@ -33,7 +33,7 @@ export default class TurboCableObserver {
3333

3434
if (this.streamSources.has(uuid)) {
3535
this.streamSources.delete(uuid)
36-
this.delegate.turboCableDisconnected(element)
36+
this.delegate.turboCableChaned()
3737
}
3838
}
3939

@@ -51,7 +51,7 @@ export default class TurboCableObserver {
5151
}
5252
turboCableData.connected = element.hasAttribute("connected")
5353

54-
this.delegate.turboCableAttributeChanged(element, attributeName, oldValue, newValue)
54+
this.delegate.turboCableChaned()
5555
}
5656
}
5757
}

src/browser_panel/page/turbo_frame_observer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default class TurboFrameObserver {
2222
if (!this.frames.has(uuid)) {
2323
const frameData = this.buildFrameData(element)
2424
this.frames.set(uuid, frameData)
25-
this.delegate.frameConnected(element)
25+
this.delegate.turboFramesChanged()
2626
}
2727
}
2828

@@ -31,7 +31,7 @@ export default class TurboFrameObserver {
3131

3232
if (this.frames.has(uuid)) {
3333
this.frames.delete(uuid)
34-
this.delegate.frameDisconnected(element)
34+
this.delegate.turboFramesChanged()
3535
}
3636
}
3737

@@ -50,7 +50,7 @@ export default class TurboFrameObserver {
5050

5151
frameData.serializedTag = stringifyHTMLElementTag(element)
5252

53-
this.delegate.frameAttributeChanged(element, attributeName, oldValue, newValue)
53+
this.delegate.turboFramesChanged()
5454
}
5555
}
5656
}

src/lib/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const PORT_IDENTIFIERS = {
1010
export const BACKEND_TO_PANEL_MESSAGES = {
1111
SET_TURBO_FRAMES: "set-turbo-frames",
1212
SET_TURBO_CABLES: "set-turbo-cables",
13-
SET_STIMULUS_CONTROLLERS: "set-stimulus-controllers",
13+
SET_STIMULUS_DATA: "set-stimulus-data",
1414
TURBO_STREAM_RECEIVED: "turbo-stream-received",
1515
TURBO_EVENT_RECEIVED: "turbo-event-received",
1616
HEALTH_CHECK_RESPONSE: "health-check-response",

0 commit comments

Comments
 (0)