9c46d1d · parseable-macos

git.iko.soy/parseable-macos

on master help sign in

Fix 3 bugs: zero-visible columns, column width recompute, completion clarity

9c46d1diko3 months ago

ParseableViewer/ViewModels/LiveTailViewModel.swift+10

compare with master

unifiedsplit

@@ -339,6 +339,16 @@ final class LiveTailViewModel {

339 hiddenColumns.formUnion(newCols.filter { savedHiddenColumns.contains($0) })

340 }

341 }

342+

343+ // The `visibleCount > 1` guard in toggleColumnVisibility only covers

344+ // user toggles. The config-load and incremental-merge paths above can

345+ // hide every known column (e.g. a saved-hidden set that happens to cover

346+ // all columns seen so far), which would render the live-tail table with

347+ // zero columns. Keep at least the first column visible.

348+ if !columnOrder.isEmpty, hiddenColumns.count >= columnOrder.count,

349+ let firstColumn = columnOrder.first {

350+ hiddenColumns.remove(firstColumn)

351+ }

342 }

352 }

343

353

344 private func poll(client: ParseableClient, stream: String) async {

354 private func poll(client: ParseableClient, stream: String) async {

ParseableViewer/Views/LogTableView.swift+27−23

@@ -288,26 +288,14 @@ struct LogTableView: View {

288 }

289 }

290 .onChange(of: records) { _, newRecords in

291− widthTask?.cancel()

292− let cols = columns

293− widthTask = Task.detached(priority: .userInitiated) {

294− let widths = computeColumnWidths(columns: cols, records: newRecords)

291+ recomputeColumnWidths(columns: columns, records: newRecords)

295− guard !Task.isCancelled else { return }

296− await MainActor.run {

297− // Preserve any width the user dragged or auto-fit; only fill

298− // in columns that don't have a width yet (e.g. newly appearing

299− // columns). A wholesale overwrite would discard manual resizes

300− // on every re-query/filter/refresh.

301− var merged = columnWidths

302− for (col, width) in widths where merged[col] == nil {

303− merged[col] = width

304− }

305− columnWidths = merged

306− }

307− }

308 debouncedRebuildSort()

292 debouncedRebuildSort()

309 }

293 }

310 .onChange(of: columns) { _, newColumns in

294 .onChange(of: columns) { _, newColumns in

295+ // New columns (e.g. shown via the Column Manager) need widths

296+ // computed; the width task otherwise only runs on a records

297+ // change, leaving them at the default width until the next query.

298+ recomputeColumnWidths(columns: newColumns, records: records)

311 // After a stream switch the previous sort column may not exist

299 // After a stream switch the previous sort column may not exist

312 // in the new schema, which would silently produce a no-op sort

300 // in the new schema, which would silently produce a no-op sort

313 // (every row compares as .null). Drop it so rows fall back to

301 // (every row compares as .null). Drop it so rows fall back to

@@ -326,17 +314,33 @@ struct LogTableView: View {

326 .onChange(of: sortColumn) { _, _ in debouncedRebuildSort() }

314 .onChange(of: sortColumn) { _, _ in debouncedRebuildSort() }

327 .onChange(of: sortAscending) { _, _ in debouncedRebuildSort() }

315 .onChange(of: sortAscending) { _, _ in debouncedRebuildSort() }

328 .onAppear {

316 .onAppear {

329− let cols = columns

317+ recomputeColumnWidths(columns: columns, records: records)

330− let recs = records

331− widthTask = Task.detached(priority: .userInitiated) {

332− let widths = computeColumnWidths(columns: cols, records: recs)

333− await MainActor.run { columnWidths = widths }

334− }

335 rebuildSort()

318 rebuildSort()

336 }

319 }

337 }

320 }

338 }

321 }

339

322

323+ /// Computes column widths off the main actor and merges them into

324+ /// `columnWidths`, filling only columns that don't yet have a width.

325+ /// Preserves any width the user dragged or auto-fit; a wholesale overwrite

326+ /// would discard manual resizes on every re-query/filter/refresh. Runs on

327+ /// both records changes and columns-only changes so newly shown columns get

328+ /// a fitted width rather than the default.

329+ private func recomputeColumnWidths(columns cols: [String], records recs: [LogRecord]) {

330+ widthTask?.cancel()

331+ widthTask = Task.detached(priority: .userInitiated) {

332+ let widths = computeColumnWidths(columns: cols, records: recs)

333+ guard !Task.isCancelled else { return }

334+ await MainActor.run {

335+ var merged = columnWidths

336+ for (col, width) in widths where merged[col] == nil {

337+ merged[col] = width

338+ }

339+ columnWidths = merged

340+ }

341+ }

342+ }

343+

340 private func debouncedRebuildSort() {

344 private func debouncedRebuildSort() {

341 sortTask?.cancel()

345 sortTask?.cancel()

342 sortTask = Task {

346 sortTask = Task {

ParseableViewer/Views/SQLAutoComplete.swift+14−9

@@ -10,18 +10,23 @@ struct SQLCompletionItem: Hashable {

10 case column

11 }

13+ /// The text inserted into the editor when the completion is accepted. For

14+ /// tables this is the quoted identifier (`"name"`) so the resulting SQL is

15+ /// valid even when the stream name contains spaces or other special chars.

13 let text: String

16 let text: String

14 let kind: Kind

17 let kind: Kind

15 let detail: String?

18 let detail: String?

16− /// The raw text to insert (without quoting). For tables this equals the

19+ /// The bare text used for prefix/exact-match comparison against what the

17− /// unquoted stream name so prefix matching works correctly.

20+ /// user typed. For tables this is the unquoted stream name, since the typed

21+ /// prefix never includes the surrounding quotes. This is NOT what gets

22+ /// inserted — see `text`.

18− let insertText: String

23+ let matchText: String

20− init(text: String, kind: Kind, detail: String? = nil, insertText: String? = nil) {

25+ init(text: String, kind: Kind, detail: String? = nil, matchText: String? = nil) {

21 self.text = text

26 self.text = text

22 self.kind = kind

27 self.kind = kind

23 self.detail = detail

28 self.detail = detail

24− self.insertText = insertText ?? text

29+ self.matchText = matchText ?? text

25 }

30 }

27 var kindLabel: String {

32 var kindLabel: String {

@@ -99,7 +104,7 @@ enum SQLCompletionProvider {

99 items.append(SQLCompletionItem(

104 items.append(SQLCompletionItem(

100 text: "\"\(name)\"",

105 text: "\"\(name)\"",

101 kind: .table,

106 kind: .table,

102− insertText: name

107+ matchText: name

103 ))

108 ))

104 }

109 }

105

110

@@ -131,7 +136,7 @@ enum SQLCompletionProvider {

131 items.append(SQLCompletionItem(

136 items.append(SQLCompletionItem(

132 text: "\"\(name)\"",

137 text: "\"\(name)\"",

133 kind: .table,

138 kind: .table,

134− insertText: name

139+ matchText: name

135 ))

140 ))

136 }

141 }

137 for field in schemaFields.sorted(by: { $0.name < $1.name })

142 for field in schemaFields.sorted(by: { $0.name < $1.name })

@@ -141,9 +146,9 @@ enum SQLCompletionProvider {

141 }

146 }

142

147

143 // Don't show the popup when the only match is an exact hit. Compare the

148 // Don't show the popup when the only match is an exact hit. Compare the

144− // insert text (unquoted), not the display text — a table's display text is

149+ // match text (unquoted), not the display text — a table's display text is

145 // wrapped in quotes (`"name"`) and would never match the bare prefix.

150 // wrapped in quotes (`"name"`) and would never match the bare prefix.

146− if items.count == 1 && items[0].insertText.uppercased() == uppercasePrefix {

151+ if items.count == 1 && items[0].matchText.uppercased() == uppercasePrefix {

147 return ([], prefix, range)

152 return ([], prefix, range)

148 }

153 }

149

154