nquery 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +17 -0
  3. data/app/assets/builds/nquery/application.css +88 -4
  4. data/app/assets/builds/nquery/application.js +353 -3
  5. data/app/controllers/concerns/nquery/chart_actions.rb +1 -1
  6. data/app/controllers/concerns/nquery/chart_results.rb +54 -7
  7. data/app/controllers/nquery/dashboard/cards_controller.rb +28 -0
  8. data/app/controllers/nquery/dashboards_controller.rb +49 -9
  9. data/app/controllers/nquery/embed/dashboards_controller.rb +17 -1
  10. data/app/controllers/nquery/public/dashboards_controller.rb +14 -1
  11. data/app/controllers/nquery/queries_controller.rb +23 -2
  12. data/app/models/nquery/chart.rb +4 -0
  13. data/app/models/nquery/dashboard.rb +129 -0
  14. data/app/models/nquery/query.rb +68 -0
  15. data/app/services/nquery/application_service.rb +9 -0
  16. data/app/services/nquery/dashboards/card_parameters.rb +37 -0
  17. data/app/services/nquery/dashboards/filters.rb +75 -0
  18. data/app/services/nquery/dashboards/parameter_charts.rb +31 -0
  19. data/app/services/nquery/dashboards/parameter_rows.rb +60 -0
  20. data/app/views/layouts/nquery/application.html.erb +8 -0
  21. data/app/views/nquery/charts/_builder_form.html.erb +12 -0
  22. data/app/views/nquery/charts/_variable_row.html.erb +10 -0
  23. data/app/views/nquery/charts/_variables.html.erb +28 -0
  24. data/app/views/nquery/charts/update.turbo_stream.erb +3 -0
  25. data/app/views/nquery/dashboards/_chart_card.html.erb +27 -1
  26. data/app/views/nquery/dashboards/_parameter_chart_ids.html.erb +6 -0
  27. data/app/views/nquery/dashboards/_parameters.html.erb +159 -0
  28. data/app/views/nquery/dashboards/edit.html.erb +10 -0
  29. data/app/views/nquery/dashboards/show.html.erb +37 -1
  30. data/app/views/nquery/shared/_icon.html.erb +4 -0
  31. data/app/views/nquery/shared/_sidebar.html.erb +1 -1
  32. data/app/views/nquery/shared/_topbar.html.erb +3 -0
  33. data/config/routes.rb +4 -0
  34. data/db/migrate/20261005145000_add_parameters_to_nquery_dashboards.rb +7 -0
  35. data/db/migrate/20261005190000_add_parameters_to_nquery_queries.rb +7 -0
  36. data/lib/nquery/dashboard_parameters.rb +56 -0
  37. data/lib/nquery/data_sources/adapter.rb +10 -1
  38. data/lib/nquery/data_sources/mysql_adapter.rb +2 -2
  39. data/lib/nquery/data_sources/postgresql_adapter.rb +2 -2
  40. data/lib/nquery/data_sources/rails_adapter.rb +2 -7
  41. data/lib/nquery/data_sources/row_limit.rb +211 -0
  42. data/lib/nquery/parameter_value.rb +97 -0
  43. data/lib/nquery/query_runner.rb +37 -4
  44. data/lib/nquery/seeder.rb +9 -1
  45. data/lib/nquery/statement_binds.rb +112 -0
  46. data/lib/nquery/version.rb +1 -1
  47. data/lib/nquery.rb +4 -0
  48. data/nquery.gemspec +2 -2
  49. metadata +22 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 16f10a8cbf379951ca3ba531d4692f3caa98ff41bedd49ebdb77fcc44244a6c7
4
- data.tar.gz: 32a28cf89669ce5b093e090a22fe54cbd7c40b2f6ca9cd374498c601ad63d735
3
+ metadata.gz: 0e586b48ffb884fbeaf4cecaf5247784a7b74de36bf9d0d3830d346117608b7a
4
+ data.tar.gz: 4fdb3e7a0274cd1c4956138b84d1c1d539a08856b5b04a07bcc70cc547bc193c
5
5
  SHA512:
6
- metadata.gz: e3a624fc4b6737a76b3a702a3d7a3c700f7ff6e416e5878b60c744ad2efc949b3002d4cf632201a91851ff6b9724fe23793f2ce3eea0c8147dad7529e71b352d
7
- data.tar.gz: 4364b0dada29cb6324dba7c2e1649d47ea714f5a6edaf3900a05865066798dbe4852bd2f614863a9295f3fd3f7406b5ad0e0893572ad97983256b9d015daee54
6
+ metadata.gz: 1255083420dea72ff15f705764af93d33eede4e99b58b97ba411440775bd96eaea02b8f4436ae8606404691ce6a7c74950422b9cabcbcc220ab2523611573c6e
7
+ data.tar.gz: 94043e4ee6b0f08bb2b024c515df5a9c35929a7540f13e54f2af8fcaeb092de5ad30392ee721c3de6ee7c3371c526c94fe3d75e834c729d6c42754d20e444e7b
data/CHANGELOG.md CHANGED
@@ -2,6 +2,23 @@
2
2
 
3
3
  ## [Unreleased]
4
4
 
5
+ ## [0.1.4] - 2026-11-21
6
+
7
+ Host apps should `bundle update nquery` and run `rails db:migrate`.
8
+
9
+ ### Added
10
+ - Dashboard and chart parameters (`{{name}}`) with typed values bound into SQL (#31)
11
+ - Dashboard filter bar to link chart variables and apply dates, strings, integers, UUIDs, and booleans
12
+ - Embed and public dashboard URLs accept declared values from the query string or token
13
+ - Sidebar hide/show control
14
+
15
+ ### Changed
16
+ - Tighten Puma (`>= 7.2.2`) and sqlite3 (`>= 2.10.2`) minimums for known CVEs
17
+ - Patch Rails to 8.1.4.1 and related sanitizer/parser gems
18
+
19
+ ### Fixed
20
+ - Wrap or rewrite SQL that already ends with a LIMIT (#30)
21
+
5
22
  ## [0.1.3] - 2026-09-08
6
23
 
7
24
  Host apps should `bundle update nquery` and run `rails db:migrate`. Re-run `rails generate nquery:install` (or add the sharing/embed keys to `config/initializers/nquery.rb`) if you want public links or static embeds.
@@ -10,11 +10,21 @@
10
10
  --nq-card: #ffffff;
11
11
  --nq-danger: #ef4444;
12
12
  --nq-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
13
+ --nq-sidebar-width: 240px;
14
+ --nq-topbar-height: 3.75rem;
13
15
  }
14
16
  * { box-sizing: border-box; }
15
17
  body.nq-body { margin: 0; font-family: var(--nq-font); color: var(--nq-text); background: var(--nq-bg); }
16
- .nq-layout { display: flex; min-height: 100vh; }
17
- .nq-sidebar { width: 240px; background: var(--nq-sidebar); color: #fff; padding: 1rem; flex-shrink: 0; }
18
+ .nq-layout { display: flex; min-height: 100vh; overflow-x: clip; }
19
+ .nq-sidebar { width: var(--nq-sidebar-width); background: var(--nq-sidebar); color: #fff; padding: 1rem; flex-shrink: 0; transition: margin-left 0.22s ease; }
20
+ html.nq-sidebar-collapsed .nq-sidebar,
21
+ .nq-layout.is-sidebar-collapsed .nq-sidebar { margin-left: calc(var(--nq-sidebar-width) * -1); }
22
+ .nq-sidebar-toggle { display: inline-flex; align-items: center; justify-content: center; width: 2.25rem; height: 2.25rem; padding: 0; border: none; border-radius: 6px; background: transparent; color: var(--nq-text); cursor: pointer; }
23
+ .nq-sidebar-toggle:hover { background: #f1f5f9; }
24
+ .nq-sidebar-toggle:focus-visible { outline: 2px solid var(--nq-primary); outline-offset: 2px; }
25
+ .nq-sidebar-toggle .nq-icon { width: 1.25rem; height: 1.25rem; }
26
+ .nq-sidebar-backdrop { position: fixed; inset: 0; z-index: 30; border: 0; padding: 0; background: rgba(15, 23, 42, 0.45); cursor: pointer; }
27
+ .nq-sidebar-backdrop[hidden] { display: none; }
18
28
  .nq-logo { font-size: 1.5rem; font-weight: 700; margin-bottom: 2rem; color: var(--nq-primary); }
19
29
  .nq-nav-link { display: block; padding: 0.5rem 0.75rem; color: #cbd5e1; text-decoration: none; border-radius: 6px; margin-bottom: 0.25rem; border-left: 3px solid transparent; }
20
30
  .nq-nav-link:hover { background: rgba(255,255,255,0.08); color: #fff; }
@@ -29,7 +39,7 @@ body.nq-body { margin: 0; font-family: var(--nq-font); color: var(--nq-text); ba
29
39
  .nq-breadcrumb-item a[aria-current="page"] { color: var(--nq-text); font-weight: 500; }
30
40
  .nq-nav-section { font-size: 0.75rem; text-transform: uppercase; color: #94a3b8; margin: 1rem 0 0.5rem; }
31
41
  .nq-main { flex: 1; display: flex; flex-direction: column; min-width: 0; }
32
- .nq-topbar { display: flex; justify-content: flex-end; align-items: center; padding: 0.75rem 1.5rem; background: var(--nq-card); border-bottom: 1px solid var(--nq-border); }
42
+ .nq-topbar { display: flex; justify-content: space-between; align-items: center; gap: 1rem; height: var(--nq-topbar-height); padding: 0 1.5rem; background: var(--nq-card); border-bottom: 1px solid var(--nq-border); }
33
43
  .nq-content { padding: 1.5rem; flex: 1; }
34
44
  .nq-page-header { display: grid; grid-template-columns: minmax(0, 1fr) auto; grid-template-areas: "title actions" "meta meta"; gap: 0.375rem 1rem; align-items: start; margin-bottom: 1.5rem; }
35
45
  .nq-page-header h1 { grid-area: title; margin: 0; font-size: 1.5rem; }
@@ -78,9 +88,21 @@ body.nq-body { margin: 0; font-family: var(--nq-font); color: var(--nq-text); ba
78
88
  .nq-chart-builder-workspace .CodeMirror-cursor { border-left: 2px solid var(--nq-primary); }
79
89
  .nq-chart-builder-workspace .CodeMirror-activeline-background { background: rgba(80, 158, 227, 0.08); }
80
90
  .nq-chart-builder-workspace .cm-s-eclipse .CodeMirror-selected { background: rgba(80, 158, 227, 0.2); }
91
+ .nq-chart-builder-workspace .CodeMirror .nq-sql-parameter { background: rgba(80, 158, 227, 0.35); border-radius: 3px; box-shadow: inset 0 -2px 0 var(--nq-primary); }
81
92
  .nq-sql-editor-hint { margin-left: auto; font-size: 0.75rem; }
82
93
  .nq-sql-save-status { font-size: 0.75rem; min-width: 3.5rem; }
83
94
  .nq-chart-builder-query-actions { display: flex; align-items: center; gap: 0.75rem; flex-wrap: wrap; }
95
+ .nq-chart-variables { display: flex; flex-direction: column; gap: 0.5rem; }
96
+ .nq-chart-variables-bar { display: flex; flex-wrap: wrap; align-items: center; gap: 0.5rem; }
97
+ .nq-chart-variables-rows { display: contents; }
98
+ .nq-chart-variable-chip { display: inline-flex; align-items: center; padding: 0.25rem 0.55rem; border: 1px solid var(--nq-border); border-radius: 999px; background: #fff; color: var(--nq-text); cursor: pointer; font: inherit; }
99
+ .nq-chart-variable-chip code { font-size: 0.8125rem; }
100
+ .nq-chart-variable-chip.is-selected { border-color: var(--nq-primary); background: rgba(80, 158, 227, 0.12); color: var(--nq-primary-dark); }
101
+ .nq-chart-variable-add { height: 2rem; padding: 0.25rem 0.7rem; }
102
+ .nq-chart-variable-options { display: flex; flex-direction: column; gap: 0.35rem; padding-bottom: 0.875rem; margin-bottom: 0.25rem; border-bottom: 1px solid var(--nq-border); }
103
+ .nq-chart-variable-options[hidden] { display: none !important; }
104
+ .nq-chart-variable-options code { display: inline-block; width: fit-content; padding: 0.2rem 0.45rem; border-radius: 6px; background: #f1f5f9; font-size: 0.8125rem; }
105
+ .nq-chart-variable-options label { margin-top: 0.35rem; font-size: 0.75rem; font-weight: 600; color: var(--nq-muted); }
84
106
  .nq-query-meta { font-size: 0.8125rem; }
85
107
  .nq-output-tabs { display: inline-flex; gap: 0.25rem; padding: 0.25rem; background: #f1f5f9; border-radius: 8px; }
86
108
  .nq-output-tab { padding: 0.4375rem 0.875rem; border: none; border-radius: 6px; background: transparent; color: var(--nq-muted); font-size: 0.8125rem; font-weight: 600; cursor: pointer; transition: background-color 0.15s, color 0.15s, box-shadow 0.15s; }
@@ -134,6 +156,45 @@ button.nq-menu-item-button.is-loading::before { content: ""; width: 1em; height:
134
156
  .nq-input, .nq-textarea { width: 100%; padding: 0.5rem 0.75rem; border: 1px solid var(--nq-border); border-radius: 6px; font-size: 0.875rem; }
135
157
  .nq-textarea { font-family: ui-monospace, monospace; resize: vertical; }
136
158
  .nq-form-row { margin-bottom: 1rem; }
159
+ .nq-dashboard-filters { display: flex; flex-wrap: wrap; align-items: flex-end; gap: 0.75rem 1rem; margin-bottom: 1.75rem; }
160
+ .nq-dashboard-filter-bar { display: flex; flex: 1; flex-wrap: wrap; align-items: flex-end; gap: 0.75rem 1rem; }
161
+ .nq-dashboard-filter { position: relative; }
162
+ .nq-dashboard-filter label { display: block; margin-bottom: 0.25rem; font-size: 0.75rem; font-weight: 600; }
163
+ .nq-dashboard-filter .nq-input { width: auto; min-width: 11rem; height: 2.25rem; box-sizing: border-box; }
164
+ .nq-dashboard-filter-actions { display: flex; align-items: center; gap: 0.75rem; }
165
+ .nq-dashboard-filter-actions .nq-btn { height: 2.25rem; box-sizing: border-box; }
166
+ .nq-dashboard-filter.is-invalid .nq-input { border-color: var(--nq-danger); }
167
+ .nq-dashboard-filter-error { position: absolute; top: calc(100% + 0.2rem); left: 0; margin: 0; font-size: 0.75rem; line-height: 1.2; color: var(--nq-danger); white-space: nowrap; }
168
+ .nq-dashboard-filter-edit { margin-left: auto; align-self: flex-end; height: 2.25rem; box-sizing: border-box; }
169
+ .nq-dashboard-filter-editor.is-editing { flex-basis: 100%; align-self: stretch; margin: 0.25rem 0 0; border: 1px solid var(--nq-border); border-radius: 10px; background: #fff; box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04); overflow: hidden; }
170
+ .nq-dashboard-filter-editor-bar { display: flex; align-items: center; justify-content: space-between; gap: 1rem; padding: 0.75rem 1rem; border-bottom: 1px solid var(--nq-border); background: #f8fafc; font-weight: 600; }
171
+ .nq-dashboard-filter-panel { padding: 1rem 1rem 0.5rem; }
172
+ .nq-dashboard-filter-hint { margin: 0 0 0.875rem; font-size: 0.8125rem; line-height: 1.45; color: var(--nq-muted); }
173
+ .nq-dashboard-filter-hint code { padding: 0.1rem 0.35rem; border-radius: 4px; background: #f1f5f9; color: var(--nq-text); font-size: 0.75rem; }
174
+ .nq-dashboard-filter-add,
175
+ .nq-dashboard-parameter-create { display: grid; grid-template-columns: minmax(10rem, 1.3fr) minmax(8rem, 0.7fr) minmax(10rem, 1fr) auto; gap: 0.75rem; align-items: end; margin: 0 0 0.875rem; padding: 0.875rem; border: 1px solid var(--nq-border); border-radius: 8px; background: #f8fafc; }
176
+ .nq-dashboard-filter-field label { display: block; margin-bottom: 0.3rem; font-size: 0.75rem; font-weight: 600; color: var(--nq-muted); }
177
+ .nq-dashboard-filter-field .nq-input { width: 100%; min-width: 0; background: #fff; }
178
+ .nq-dashboard-filter-add-action { display: flex; }
179
+ .nq-dashboard-filter-list-title { margin: 1rem 0 0.25rem; font-size: 0.75rem; font-weight: 600; letter-spacing: 0.04em; text-transform: uppercase; color: var(--nq-muted); }
180
+ .nq-dashboard-filter-list { list-style: none; margin: 0; padding: 0; }
181
+ .nq-dashboard-filter-list li:last-child { border-bottom: none; }
182
+ .nq-dashboard-filter-list form { margin: 0; }
183
+ .nq-dashboard-filter-meta { display: flex; align-items: center; gap: 0.5rem; min-width: 0; }
184
+ .nq-dashboard-filter-meta code { padding: 0.15rem 0.45rem; border-radius: 6px; background: #f1f5f9; color: var(--nq-text); font-size: 0.8125rem; }
185
+ .nq-badge-filter { font-weight: 600; }
186
+ .nq-badge-filter-string { background: #e2e8f0; color: #334155; }
187
+ .nq-badge-filter-integer { background: #dbeafe; color: #1d4ed8; }
188
+ .nq-badge-filter-date { background: #dcfce7; color: #15803d; }
189
+ .nq-badge-filter-datetime { background: #ede9fe; color: #6d28d9; }
190
+ .nq-badge-filter-uuid { background: #ffedd5; color: #c2410c; }
191
+ .nq-badge-filter-boolean { background: #ccfbf1; color: #0f766e; }
192
+ .nq-dashboard-filter-default { font-size: 0.8125rem; color: var(--nq-muted); }
193
+ .nq-dashboard-filter-default strong { color: var(--nq-text); font-weight: 600; }
194
+ @media (max-width: 760px) {
195
+ .nq-dashboard-filter-add,
196
+ .nq-dashboard-parameter-create { grid-template-columns: 1fr; }
197
+ }
137
198
  .nq-form-row label { display: block; margin-bottom: 0.25rem; font-weight: 500; font-size: 0.875rem; }
138
199
  .nq-form-grid { margin-bottom: 1rem; }
139
200
  .nq-form-grid .nq-form-row { margin-bottom: 0; }
@@ -251,6 +312,21 @@ button.nq-menu-item-button.is-loading::before { content: ""; width: 1em; height:
251
312
  .nq-dashboard-grid { display: grid; grid-template-columns: repeat(12, 1fr); gap: 1rem; }
252
313
  .nq-dashboard-card { background: var(--nq-card); border: 1px solid var(--nq-border); border-radius: 8px; padding: 1rem; min-height: 120px; display: flex; flex-direction: column; }
253
314
  .nq-dashboard-card-header { display: flex; justify-content: space-between; align-items: flex-start; gap: 0.5rem; margin-bottom: 0.75rem; }
315
+ .nq-dashboard-filter-list li { display: flex; flex-direction: column; align-items: stretch; gap: 0.65rem; padding: 0.75rem 0; border-bottom: 1px solid var(--nq-border); }
316
+ .nq-dashboard-filter-list-row { display: flex; align-items: center; justify-content: space-between; gap: 1rem; }
317
+ .nq-dashboard-wire { display: flex; flex-wrap: wrap; align-items: center; gap: 0.75rem 1rem; margin: -0.5rem 0 1rem; padding: 0.75rem 1rem; border: 1px solid var(--nq-primary); border-radius: 8px; background: rgba(80, 158, 227, 0.08); }
318
+ .nq-dashboard-wire p { margin: 0; font-size: 0.875rem; }
319
+ .nq-dashboard-wire form { margin: 0; }
320
+ .nq-dashboard-wire code { padding: 0.1rem 0.35rem; border-radius: 4px; background: #fff; }
321
+ .nq-dashboard-card.is-wiring { position: relative; border-color: var(--nq-primary); box-shadow: 0 0 0 1px var(--nq-primary); }
322
+ .nq-dashboard-card.is-wiring .nq-chart-preview { opacity: 0.45; }
323
+ .nq-dashboard-card-column { position: absolute; left: 1rem; right: 1rem; top: 3.25rem; bottom: 1rem; z-index: 2; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 0.35rem; pointer-events: none; }
324
+ .nq-dashboard-card-column-label { margin: 0; font-size: 0.8125rem; color: var(--nq-muted); }
325
+ .nq-dashboard-card-wire { margin: 0; pointer-events: auto; }
326
+ .nq-dashboard-card-column .nq-input { width: auto; min-width: 9rem; pointer-events: auto; background: #fff; }
327
+ .nq-dashboard-filter-field-link { text-decoration: none; }
328
+ .nq-dashboard-filter-field-link[aria-current="true"] code { box-shadow: 0 0 0 2px var(--nq-primary); }
329
+ .nq-dashboard-filter-list li.is-wiring { margin: 0 -1rem; padding-left: 1rem; padding-right: 1rem; background: rgba(80, 158, 227, 0.08); }
254
330
  .nq-dashboard-card-title { margin: 0; font-size: 0.9375rem; font-weight: 600; min-width: 0; flex: 1; }
255
331
  .nq-dashboard-card-header .nq-menu { flex-shrink: 0; }
256
332
  .nq-dashboard-card .nq-chart-preview { flex: 1; }
@@ -366,9 +442,17 @@ button.nq-menu-item-button.is-loading::before { content: ""; width: 1em; height:
366
442
  .nq-home-list-time { flex-shrink: 0; font-size: 0.75rem; white-space: nowrap; }
367
443
  .nq-home-empty { display: flex; flex-direction: column; align-items: center; gap: 0.75rem; padding: 2.5rem 1.25rem 1.75rem; text-align: center; border-top: 1px solid var(--nq-border); margin-top: 1rem; }
368
444
  .nq-home-empty p { margin: 0; }
445
+ @media (prefers-reduced-motion: reduce) {
446
+ .nq-sidebar { transition: none; }
447
+ }
369
448
  @media (max-width: 768px) {
370
449
  .nq-grid-2, .nq-grid-3, .nq-grid-sidebar, .nq-grid-editor, .nq-chart-builder-layout { grid-template-columns: 1fr; }
371
- .nq-sidebar { display: none; }
450
+ .nq-topbar { position: sticky; top: 0; z-index: 50; }
451
+ .nq-sidebar { position: fixed; top: var(--nq-topbar-height); left: 0; bottom: 0; z-index: 40; margin-left: 0; transform: translateX(-100%); transition: transform 0.22s ease; }
452
+ .nq-sidebar-backdrop { top: var(--nq-topbar-height); }
453
+ html.nq-sidebar-collapsed .nq-sidebar,
454
+ .nq-layout.is-sidebar-collapsed .nq-sidebar { margin-left: 0; }
455
+ .nq-layout.is-sidebar-open .nq-sidebar { transform: translateX(0); }
372
456
  .nq-page-header { grid-template-columns: 1fr; grid-template-areas: "title" "meta" "actions"; }
373
457
  .nq-page-header > .nq-actions,
374
458
  .nq-page-header > .nq-btn,
@@ -430,6 +430,166 @@ function initChartPreviews() {
430
430
  })
431
431
  }
432
432
 
433
+ function chartVariableNames(sql) {
434
+ const names = []
435
+ const seen = new Set()
436
+ const pattern = /\{\{\s*([a-z][a-z0-9_]*)\s*\}\}/g
437
+ let match
438
+ while ((match = pattern.exec(sql))) {
439
+ if (seen.has(match[1])) continue
440
+ seen.add(match[1])
441
+ names.push(match[1])
442
+ }
443
+ return names
444
+ }
445
+
446
+ let focusVariableName = null
447
+ let chartVariableMarks = []
448
+
449
+ function chartVariableParameters() {
450
+ return Array.from(document.querySelectorAll("#chart_variables [data-variable-name]")).map(row => ({
451
+ name: row.dataset.variableName,
452
+ type: row.querySelector("[data-variable-type]")?.value || "string",
453
+ default: row.querySelector("[data-variable-default]")?.value || ""
454
+ })).filter(row => row.name)
455
+ }
456
+
457
+ function nextParameterName(sql) {
458
+ const names = new Set(chartVariableNames(sql))
459
+ if (!names.has("parameter")) return "parameter"
460
+ let index = 2
461
+ while (names.has(`parameter_${index}`)) index += 1
462
+ return `parameter_${index}`
463
+ }
464
+
465
+ function selectedVariableField(selector) {
466
+ const name = document.getElementById("chart_variable_options")?.dataset.variableName
467
+ if (!name) return null
468
+ const row = document.querySelector(`#chart_variables [data-variable-name="${CSS.escape(name)}"]`)
469
+ return row?.querySelector(selector) || null
470
+ }
471
+
472
+ function clearChartVariableMarks() {
473
+ chartVariableMarks.forEach(mark => mark.clear())
474
+ chartVariableMarks = []
475
+ }
476
+
477
+ function highlightChartVariable(name, { scroll = false } = {}) {
478
+ clearChartVariableMarks()
479
+ const editor = document.querySelector("[data-chart-builder-target='statement']")?._sqlEditor
480
+ if (!editor || !name) return
481
+
482
+ const pattern = new RegExp(`\\{\\{\\s*${name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\s*\\}\\}`, "g")
483
+ const text = editor.getValue()
484
+ let match
485
+ let first = null
486
+ while ((match = pattern.exec(text))) {
487
+ const from = editor.posFromIndex(match.index)
488
+ const to = editor.posFromIndex(match.index + match[0].length)
489
+ if (!first) first = from
490
+ chartVariableMarks.push(editor.markText(from, to, { className: "nq-sql-parameter" }))
491
+ }
492
+ if (scroll && first) editor.scrollIntoView(first, 80)
493
+ }
494
+
495
+ function clearChartVariableSelection() {
496
+ clearChartVariableMarks()
497
+ const options = document.getElementById("chart_variable_options")
498
+ if (options) {
499
+ options.hidden = true
500
+ delete options.dataset.variableName
501
+ }
502
+ document.querySelectorAll("#chart_variables [data-variable-select]").forEach(button => {
503
+ button.classList.remove("is-selected")
504
+ button.setAttribute("aria-pressed", "false")
505
+ })
506
+ }
507
+
508
+ function selectChartVariable(name, { focus = true } = {}) {
509
+ const row = document.querySelector(`#chart_variables [data-variable-name="${CSS.escape(name)}"]`)
510
+ const options = document.getElementById("chart_variable_options")
511
+ if (!row || !options) return
512
+
513
+ document.querySelectorAll("#chart_variables [data-variable-select]").forEach(button => {
514
+ const selected = button.closest("[data-variable-name]")?.dataset.variableName === name
515
+ button.classList.toggle("is-selected", selected)
516
+ button.setAttribute("aria-pressed", selected ? "true" : "false")
517
+ })
518
+
519
+ options.hidden = false
520
+ options.dataset.variableName = name
521
+ const label = options.querySelector("[data-chart-variable-options-name]")
522
+ if (label) label.textContent = `{{${name}}}`
523
+ const typeMirror = options.querySelector("[data-chart-variable-options-type]")
524
+ const defaultMirror = options.querySelector("[data-chart-variable-options-default]")
525
+ const type = row.querySelector("[data-variable-type]")
526
+ const fallback = row.querySelector("[data-variable-default]")
527
+ if (typeMirror && type) typeMirror.value = type.value
528
+ if (defaultMirror && fallback) defaultMirror.value = fallback.value
529
+ highlightChartVariable(name, { scroll: true })
530
+ if (focus) typeMirror?.focus()
531
+ }
532
+
533
+ function syncChartVariables(sql, { selectAdded = false } = {}) {
534
+ const panel = document.getElementById("chart_variables")
535
+ const rows = panel?.querySelector("[data-chart-variables-target='rows']")
536
+ const template = panel?.querySelector("[data-chart-variables-target='template']")
537
+ if (!rows || !template) return
538
+
539
+ const names = chartVariableNames(sql)
540
+ const previous = new Set()
541
+ const kept = new Map()
542
+ rows.querySelectorAll("[data-variable-name]").forEach(row => {
543
+ if (!row.dataset.variableName) return
544
+ previous.add(row.dataset.variableName)
545
+ kept.set(row.dataset.variableName, row)
546
+ })
547
+
548
+ rows.replaceChildren()
549
+ names.forEach(name => {
550
+ const existing = kept.get(name)
551
+ if (existing) {
552
+ rows.appendChild(existing)
553
+ return
554
+ }
555
+
556
+ const fragment = template.content.cloneNode(true)
557
+ const row = fragment.querySelector("[data-variable-name]")
558
+ row.dataset.variableName = name
559
+ const label = row.querySelector("[data-variable-label]")
560
+ if (label) label.textContent = `{{${name}}}`
561
+ const nameInput = row.querySelector("[data-variable-name-input]")
562
+ const typeInput = row.querySelector("[data-variable-type]")
563
+ const defaultInput = row.querySelector("[data-variable-default]")
564
+ if (nameInput) {
565
+ nameInput.value = name
566
+ nameInput.id = `chart_variable_${name}_name`
567
+ }
568
+ if (typeInput) typeInput.id = `chart_variable_${name}_type`
569
+ if (defaultInput) defaultInput.id = `chart_variable_${name}_default`
570
+ rows.appendChild(fragment)
571
+ })
572
+
573
+ const present = names.length > 0
574
+ panel.querySelector("[data-chart-variables-target='empty']")?.toggleAttribute("hidden", present)
575
+
576
+ const selected = document.getElementById("chart_variable_options")?.dataset.variableName
577
+ if (selected && !names.includes(selected)) clearChartVariableSelection()
578
+
579
+ if (selectAdded) {
580
+ const added = names.filter(name => !previous.has(name))
581
+ if (added.length) {
582
+ const name = added[added.length - 1]
583
+ const focus = focusVariableName === name
584
+ focusVariableName = null
585
+ selectChartVariable(name, { focus })
586
+ }
587
+ }
588
+
589
+ const current = document.getElementById("chart_variable_options")?.dataset.variableName
590
+ if (current && names.includes(current)) highlightChartVariable(current)
591
+ }
592
+
433
593
  function initChartBuilders() {
434
594
  document.querySelectorAll("[data-controller='chart-builder']:not([data-chart-builder-initialized])").forEach(root => {
435
595
  root.dataset.chartBuilderInitialized = "true"
@@ -476,6 +636,7 @@ function initChartBuilders() {
476
636
  let statementEditor = null
477
637
  let lastFormattedSql = null
478
638
  let lastSavedSql = statement?.value ?? ""
639
+ let lastSavedParameters = JSON.stringify(chartVariableParameters())
479
640
  let ignoreEditorChanges = false
480
641
  let autosaveTimer = null
481
642
  let saveChain = Promise.resolve()
@@ -517,9 +678,11 @@ function initChartBuilders() {
517
678
 
518
679
  const run = async () => {
519
680
  const statementText = getStatement()
681
+ const parameters = chartVariableParameters()
682
+ const parametersJson = JSON.stringify(parameters)
520
683
  syncStatementField()
521
684
 
522
- if (statementText === lastSavedSql) {
685
+ if (statementText === lastSavedSql && parametersJson === lastSavedParameters) {
523
686
  if (notice) showClientFlash(notice)
524
687
  return { saved: true, skipped: true }
525
688
  }
@@ -532,12 +695,13 @@ function initChartBuilders() {
532
695
  Accept: "application/json",
533
696
  "X-CSRF-Token": csrf
534
697
  },
535
- body: JSON.stringify({ query: { statement: statementText } })
698
+ body: JSON.stringify({ query: { statement: statementText, parameters } })
536
699
  })
537
700
  const data = await res.json().catch(() => ({}))
538
701
  if (!res.ok) throw new Error(data.error || "Failed to save query.")
539
702
 
540
703
  lastSavedSql = statementText
704
+ lastSavedParameters = parametersJson
541
705
  if (notice) showClientFlash(notice)
542
706
  return { saved: true }
543
707
  }
@@ -566,6 +730,7 @@ function initChartBuilders() {
566
730
  if (ignoreEditorChanges) return
567
731
 
568
732
  const current = getStatement()
733
+ syncChartVariables(current, { selectAdded: true })
569
734
  if (lastFormattedSql === null || current !== lastFormattedSql) setFormatEnabled(true)
570
735
  scheduleAutosave()
571
736
  }
@@ -852,7 +1017,11 @@ function initChartBuilders() {
852
1017
  const res = await fetch(queryRunUrl, {
853
1018
  method: "POST",
854
1019
  headers: { "Content-Type": "application/json", "X-CSRF-Token": csrf },
855
- body: JSON.stringify({ statement: getStatement(), data_source_id: dataSource?.value })
1020
+ body: JSON.stringify({
1021
+ statement: getStatement(),
1022
+ data_source_id: dataSource?.value,
1023
+ parameters: chartVariableParameters()
1024
+ })
856
1025
  })
857
1026
  const data = await res.json()
858
1027
  if (!res.ok || data.error) {
@@ -919,6 +1088,63 @@ function initChartBuilders() {
919
1088
  })
920
1089
 
921
1090
  lastSavedSql = getStatement()
1091
+ syncChartVariables(lastSavedSql)
1092
+ lastSavedParameters = JSON.stringify(chartVariableParameters())
1093
+
1094
+ const variableOptions = document.getElementById("chart_variable_options")
1095
+ variableOptions?.querySelector("[data-chart-variable-options-type]")?.addEventListener("change", (event) => {
1096
+ const input = selectedVariableField("[data-variable-type]")
1097
+ if (!input || input.value === event.target.value) return
1098
+ input.value = event.target.value
1099
+ input.dispatchEvent(new Event("change", { bubbles: true }))
1100
+ })
1101
+ variableOptions?.querySelector("[data-chart-variable-options-default]")?.addEventListener("input", (event) => {
1102
+ const input = selectedVariableField("[data-variable-default]")
1103
+ if (!input || input.value === event.target.value) return
1104
+ input.value = event.target.value
1105
+ input.dispatchEvent(new Event("input", { bubbles: true }))
1106
+ })
1107
+
1108
+ const insertChartParameter = () => {
1109
+ const name = nextParameterName(getStatement())
1110
+ const token = `{{${name}}}`
1111
+ focusVariableName = name
1112
+ if (statementEditor) {
1113
+ if (!statementEditor.hasFocus()) {
1114
+ const line = statementEditor.lastLine()
1115
+ statementEditor.setCursor({ line, ch: statementEditor.getLine(line).length })
1116
+ }
1117
+ const cursor = statementEditor.getCursor()
1118
+ const before = statementEditor.getLine(cursor.line).slice(0, cursor.ch)
1119
+ statementEditor.replaceSelection(`${before.length > 0 && !/\s$/.test(before) ? " " : ""}${token}`)
1120
+ return
1121
+ }
1122
+
1123
+ if (!statement) return
1124
+ const start = statement.selectionStart ?? statement.value.length
1125
+ const end = statement.selectionEnd ?? start
1126
+ statement.value = `${statement.value.slice(0, start)}${token}${statement.value.slice(end)}`
1127
+ handleStatementChange()
1128
+ }
1129
+
1130
+ root.addEventListener("click", (event) => {
1131
+ if (event.target.closest("[data-chart-variables-target='add']")) {
1132
+ event.preventDefault()
1133
+ insertChartParameter()
1134
+ return
1135
+ }
1136
+
1137
+ const chip = event.target.closest("[data-variable-select]")
1138
+ if (!chip || !root.contains(chip)) return
1139
+ const name = chip.closest("[data-variable-name]")?.dataset.variableName
1140
+ if (name) selectChartVariable(name)
1141
+ })
1142
+ root.addEventListener("input", (event) => {
1143
+ if (event.target.closest("#chart_variables")) scheduleAutosave()
1144
+ })
1145
+ root.addEventListener("change", (event) => {
1146
+ if (event.target.closest("#chart_variables")) scheduleAutosave()
1147
+ })
922
1148
  if (statementEditor) statementEditor.on("change", handleStatementChange)
923
1149
  else statement?.addEventListener("input", handleStatementChange)
924
1150
 
@@ -1073,6 +1299,128 @@ function initCopyButtons() {
1073
1299
  })
1074
1300
  }
1075
1301
 
1302
+ const SIDEBAR_STORAGE_KEY = "nq-sidebar-collapsed"
1303
+
1304
+ function sidebarIsMobile() {
1305
+ return window.matchMedia("(max-width: 768px)").matches
1306
+ }
1307
+
1308
+ function sidebarCollapsedPreference() {
1309
+ try {
1310
+ return localStorage.getItem(SIDEBAR_STORAGE_KEY) === "true"
1311
+ } catch {
1312
+ return false
1313
+ }
1314
+ }
1315
+
1316
+ function rememberSidebarCollapsed(collapsed) {
1317
+ try {
1318
+ localStorage.setItem(SIDEBAR_STORAGE_KEY, collapsed ? "true" : "false")
1319
+ } catch {
1320
+ // Private browsing can block storage.
1321
+ }
1322
+ }
1323
+
1324
+ function sidebarElements() {
1325
+ return {
1326
+ layout: document.querySelector(".nq-layout"),
1327
+ sidebar: document.getElementById("nq-sidebar"),
1328
+ toggle: document.querySelector(".nq-sidebar-toggle"),
1329
+ backdrop: document.querySelector(".nq-sidebar-backdrop")
1330
+ }
1331
+ }
1332
+
1333
+ function syncSidebar(layout, sidebar, toggle, backdrop) {
1334
+ if (!layout || !sidebar || !toggle) return
1335
+
1336
+ const showing = sidebarIsMobile()
1337
+ ? layout.classList.contains("is-sidebar-open")
1338
+ : !layout.classList.contains("is-sidebar-collapsed")
1339
+
1340
+ sidebar.toggleAttribute("inert", !showing)
1341
+ sidebar.setAttribute("aria-hidden", showing ? "false" : "true")
1342
+ toggle.setAttribute("aria-expanded", showing ? "true" : "false")
1343
+ toggle.setAttribute("aria-label", showing ? "Hide navigation" : "Show navigation")
1344
+ if (backdrop) backdrop.hidden = !(sidebarIsMobile() && showing)
1345
+ }
1346
+
1347
+ function applySidebarPreference() {
1348
+ const { layout, sidebar, toggle, backdrop } = sidebarElements()
1349
+ if (!layout || !sidebar || !toggle) return
1350
+
1351
+ const collapsed = !sidebarIsMobile() && (
1352
+ document.documentElement.classList.contains("nq-sidebar-collapsed") || sidebarCollapsedPreference()
1353
+ )
1354
+
1355
+ layout.classList.toggle("is-sidebar-collapsed", collapsed)
1356
+ document.documentElement.classList.remove("nq-sidebar-collapsed")
1357
+ syncSidebar(layout, sidebar, toggle, backdrop)
1358
+ }
1359
+
1360
+ function initSidebarToggle() {
1361
+ const { sidebar, toggle, backdrop } = sidebarElements()
1362
+ if (!sidebar || !toggle) return
1363
+
1364
+ applySidebarPreference()
1365
+ if (toggle.dataset.sidebarToggleInitialized === "true") return
1366
+ toggle.dataset.sidebarToggleInitialized = "true"
1367
+
1368
+ toggle.addEventListener("click", () => {
1369
+ const current = sidebarElements()
1370
+ if (!current.layout) return
1371
+
1372
+ if (sidebarIsMobile()) {
1373
+ current.layout.classList.toggle("is-sidebar-open")
1374
+ } else {
1375
+ const collapsed = !current.layout.classList.contains("is-sidebar-collapsed")
1376
+ current.layout.classList.toggle("is-sidebar-collapsed", collapsed)
1377
+ rememberSidebarCollapsed(collapsed)
1378
+ }
1379
+
1380
+ syncSidebar(current.layout, current.sidebar, current.toggle, current.backdrop)
1381
+ })
1382
+
1383
+ backdrop?.addEventListener("click", () => {
1384
+ const current = sidebarElements()
1385
+ current.layout?.classList.remove("is-sidebar-open")
1386
+ syncSidebar(current.layout, current.sidebar, current.toggle, current.backdrop)
1387
+ })
1388
+
1389
+ sidebar.addEventListener("click", (event) => {
1390
+ if (!sidebarIsMobile() || !event.target.closest("a")) return
1391
+
1392
+ const current = sidebarElements()
1393
+ current.layout?.classList.remove("is-sidebar-open")
1394
+ syncSidebar(current.layout, current.sidebar, current.toggle, current.backdrop)
1395
+ })
1396
+ }
1397
+
1398
+ function bindSidebarToggleOnce() {
1399
+ if (window.nqSidebarToggleBound) return
1400
+ window.nqSidebarToggleBound = true
1401
+
1402
+ document.addEventListener("keydown", (event) => {
1403
+ if (event.key !== "Escape") return
1404
+
1405
+ const { layout, sidebar, toggle, backdrop } = sidebarElements()
1406
+ if (!layout?.classList.contains("is-sidebar-open")) return
1407
+
1408
+ layout.classList.remove("is-sidebar-open")
1409
+ syncSidebar(layout, sidebar, toggle, backdrop)
1410
+ toggle?.focus()
1411
+ })
1412
+
1413
+ window.matchMedia("(max-width: 768px)").addEventListener("change", () => {
1414
+ sidebarElements().layout?.classList.remove("is-sidebar-open")
1415
+ applySidebarPreference()
1416
+ })
1417
+
1418
+ document.addEventListener("turbo:before-render", (event) => {
1419
+ if (sidebarIsMobile() || !sidebarCollapsedPreference()) return
1420
+ event.detail.newBody.querySelector(".nq-layout")?.classList.add("is-sidebar-collapsed")
1421
+ })
1422
+ }
1423
+
1076
1424
  function initPage() {
1077
1425
  applyChartFontDefaults()
1078
1426
  initButtonLoaders()
@@ -1083,6 +1431,8 @@ function initPage() {
1083
1431
  initChartPreviews()
1084
1432
  initDataSourceForms()
1085
1433
  initCopyButtons()
1434
+ bindSidebarToggleOnce()
1435
+ initSidebarToggle()
1086
1436
  }
1087
1437
 
1088
1438
  function bootPage() {
@@ -88,7 +88,7 @@ module Nquery
88
88
  params.require(:chart).permit(
89
89
  :name,
90
90
  visualization: {},
91
- query_attributes: %i[id name statement data_source_id]
91
+ query_attributes: [:id, :name, :statement, :data_source_id, { parameters: [:name, :type, :default] }]
92
92
  )
93
93
  end
94
94