Commit `fe2832564a`

fe2832564a7c2963abe2c7ce86124c825f36cf76

parent: 563215175a

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-14 07:17 UTC

Saved queries: the dashboard follows; Edit; a query may start with dashes

A save, pin, unpin or removal reloads the dashboard underneath, which
showed the old pinned queries until pulled. Edit fills the sheet with a
saved query to replace, which is how one whose text no longer parses is
fixed. The query goes after "--", so one starting with dashes is not
read as a flag, and a closed sheet takes its error with it.

Ref #30

Layout: unified · split

gitbay/Discovery/SavedQuery.swift +12 −2

     /// `query save <name> <query> [--force]`. The query goes as one word;
     /// the server reads it the same as many. Returns whether it saved.
     func save(name: String, query: String, replace: Bool) async -> Bool {
-        var argv = ["query", "save", name.trimmingCharacters(in: .whitespaces),
+        // Flags, then "--": a query may start with dashes, and the server's
-                    query.trimmingCharacters(in: .whitespacesAndNewlines)]
+        // parser would read it as a flag.
+        var argv = ["query", "save"]
         if replace { argv.append("--force") }
+        argv += ["--", name.trimmingCharacters(in: .whitespaces),
+                 query.trimmingCharacters(in: .whitespacesAndNewlines)]
         return await perform(argv)
     }
         await perform(["query", "remove", query.name])
     }
+    /// A closed sheet takes its error with it.
+    func clearError() {
+        actionError = nil
+    }
     @discardableResult
     private func perform(_ argv: [String]) async -> Bool {
         working = true
             return false
         }
         await load()
+        // The dashboard underneath shows pinned queries.
+        NotificationCenter.default.post(name: .gitbaySavedQueriesChanged, object: nil)
         return true
     }
 }

gitbay/Views/Dashboard/DashboardView.swift +3

         }
         .task { await model.load() }
         .refreshable { await model.load() }
+        .onReceive(NotificationCenter.default.publisher(for: .gitbaySavedQueriesChanged)) { _ in
+            Task { await model.load() }
+        }
         .onChange(of: model.state.value?.unread) { _, count in
             if let count { unread = count }
         }

gitbay/Views/Discovery/SavedQueriesView.swift +24 −5

     @State private var model: SavedQueriesViewModel
     @State private var composing = false
+    /// The query the sheet edits; nil saves a new one.
+    @State private var editing: SavedQuery?
     @State private var removing: SavedQuery?
     init(client: GitbayClient) {
                     .tint(Color.gbAccent)
                 }
                 .contextMenu {
+                    Button {
+                        editing = query
+                        composing = true
+                    } label: {
+                        Label("Edit", systemImage: "pencil")
+                    }
                     Button {
                         Task { await model.setPinned(query, !query.pinned) }
                     } label: {
         .toolbar {
             ToolbarItem(placement: .topBarTrailing) {
                 Button {
+                    editing = nil
                     composing = true
                 } label: {
                     Image(systemName: "plus")
             Button("Remove", role: .destructive) { Task { await model.remove(query) } }
             Button("Cancel", role: .cancel) {}
         }
-        .sheet(isPresented: $composing) {
+        .sheet(isPresented: $composing, onDismiss: { model.clearError() }) {
-            SaveQuerySheet(model: model) { composing = false }
+            SaveQuerySheet(model: model, editing: editing) { composing = false }
         }
         .task { await model.load() }
         .refreshable { await model.load() }
     let model: SavedQueriesViewModel
     let onSaved: () -> Void
-    @State private var name = ""
+    @State private var name: String
-    @State private var query = ""
+    @State private var query: String
-    @State private var replace = false
+    @State private var replace: Bool
     @State private var sent = false
     @Environment(\.dismiss) private var dismiss
+    /// `editing` fills the sheet with a saved query to change, replacing it
+    /// under the same name: how one whose text no longer parses is fixed.
+    init(model: SavedQueriesViewModel, editing: SavedQuery?, onSaved: @escaping () -> Void) {
+        self.model = model
+        self.onSaved = onSaved
+        _name = State(initialValue: editing?.name ?? "")
+        _query = State(initialValue: editing?.query ?? "")
+        _replace = State(initialValue: editing != nil)
+    }
     var body: some View {
         NavigationStack {
             Form {

gitbay/Views/Shared/ChangeNotices.swift added +11

@@ -0,0 +1,11 @@
	1	import Foundation
	2
	3	/// Writes on one screen that change what another, already on the stack
	4	/// underneath, is showing. The one-shot `.task` loads of those screens do
	5	/// not run again on a pop, so they listen for these instead.
	6	extension Notification.Name {
	7	/// A repository was deleted, moved or renamed; `object` is its old path.
	8	static let gitbayRepositoryChanged = Notification.Name("gitbayRepositoryChanged")
	9	/// A saved query was saved, pinned, unpinned or removed.
	10	static let gitbaySavedQueriesChanged = Notification.Name("gitbaySavedQueriesChanged")
	11	}

gitbayTests/SavedQueryTests.swift +2 −2

	@@ -56,7 +56,7 @@ struct SavedQueriesViewModelTests {
56	let saved = await model.save(name: " review ", query: #" is:mr label:"needs review" "#, replace: false)	56	let saved = await model.save(name: " review ", query: #" is:mr label:"needs review" "#, replace: false)
57		57
58	#expect(saved)	58	#expect(saved)
59	#expect(try posted(stub) == [["query", "save", "review", #"is:mr label:"needs review""#]])	59	#expect(try posted(stub) == [["query", "save", "--", "review", #"is:mr label:"needs review""#]])
60	}	60	}
61		61
62	@Test func replacingAddsForce() async throws {	62	@Test func replacingAddsForce() async throws {
	@@ -66,7 +66,7 @@ struct SavedQueriesViewModelTests {
66		66
67	_ = await model.save(name: "bugs", query: "is:issue label:bug is:open", replace: true)	67	_ = await model.save(name: "bugs", query: "is:issue label:bug is:open", replace: true)
68		68
69	#expect(try posted(stub) == [["query", "save", "bugs", "is:issue label:bug is:open", "--force"]])	69	#expect(try posted(stub) == [["query", "save", "--force", "--", "bugs", "is:issue label:bug is:open"]])
70	}	70	}
71		71
72	@Test func aRefusedSaveKeepsTheSheetAndSaysWhy() async throws {	72	@Test func aRefusedSaveKeepsTheSheetAndSaysWhy() async throws {

Commit fe2832564a

Commit `fe2832564a`