Skip to content

Commit 80b00d8

Browse files
committed
Moved mark aware actions to the sidebar
1 parent 808457c commit 80b00d8

3 files changed

Lines changed: 14 additions & 8 deletions

File tree

app/javascript/controllers/topics_aware_controller.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,15 @@ export default class extends Controller {
44
static values = {
55
awareUrl: String,
66
awareAllUrl: String,
7+
confirmVisible: String,
8+
confirmAll: String,
79
}
810

911
markVisibleAware(event) {
1012
event.preventDefault()
13+
if (this.confirmVisibleValue && !window.confirm(this.confirmVisibleValue)) {
14+
return
15+
}
1116
const rows = Array.from(document.querySelectorAll("[data-topic-id][data-last-message-id]"))
1217
const payload = rows.map(row => ({
1318
topic_id: Number(row.dataset.topicId),
@@ -32,9 +37,7 @@ export default class extends Controller {
3237

3338
markAllAware(event) {
3439
event.preventDefault()
35-
if (!window.confirm("Mark ALL threads as aware up to now? This will clear the 'New' status everywhere.")) {
36-
return
37-
}
40+
if (this.confirmAllValue && !window.confirm(this.confirmAllValue)) return
3841
fetch(this.awareAllUrlValue, {
3942
method: "POST",
4043
headers: {

app/views/topics/_sidebar.html.slim

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
- content_for :sidebar do
22
.sidebar
3+
4+
- if user_signed_in?
5+
.sidebar-section
6+
.sidebar-content
7+
.topics-actions data-controller="topics-aware" data-topics-aware-aware-url-value=aware_bulk_topics_path data-topics-aware-aware-all-url-value=aware_all_topics_path data-topics-aware-confirm-visible-value="Mark the displayed threads as aware?" data-topics-aware-confirm-all-value="Mark ALL threads as aware up to now? This will clear the 'New' status everywhere."
8+
button.mark-aware-button data-action="click->topics-aware#markVisibleAware" Mark displayed threads aware
9+
button.mark-aware-button.secondary data-action="click->topics-aware#markAllAware" Mark everything up to now aware
10+
311
.sidebar-section
412
h3.sidebar-heading Search
513
.sidebar-search.sidebar-content

app/views/topics/index.html.slim

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
= link_to "Clear", topics_path, class: "clear-tag-filter"
99

1010
.topics-table
11-
- if user_signed_in?
12-
.topics-actions data-controller="topics-aware" data-topics-aware-aware-url-value=aware_bulk_topics_path data-topics-aware-aware-all-url-value=aware_all_topics_path
13-
button.mark-aware-button data-action="click->topics-aware#markVisibleAware" Mark displayed threads aware
14-
button.mark-aware-button.secondary data-action="click->topics-aware#markAllAware" Mark everything up to now aware
15-
1611
table
1712
thead
1813
tr

0 commit comments

Comments
 (0)