use y=false to trigger confirmation

Author: tayloraswift

Sources/UnidocServer/Requests/Unidoc.Router.swift

@@ -21,6 +21,8 @@ extension Unidoc
         private
         var stem:ArraySlice<String>
         private
+        let path:URI.Path
+        private
         let query:URI.Query
 
         private
@@ -30,13 +32,15 @@ extension Unidoc
             origin:IP.Origin,
             host:String?,
             stem:ArraySlice<String>,
+            path:URI.Path,
             query:URI.Query)
         {
             self.headers = headers
             self.authorization = authorization
             self.origin = origin
             self.host = host
             self.stem = stem
+            self.path = path
             self.query = query
         }
     }
@@ -51,6 +55,7 @@ extension Unidoc.Router
             origin: request.origin.ip,
             host: request.host,
             stem: request.path,
+            path: request.uri.path,
             query: request.uri.query ?? [:])
     }
 }
@@ -500,20 +505,20 @@ extension Unidoc.Router
     }
 
     private mutating
-    func link(form query:URI.Query) -> Unidoc.AnyOperation?
+    func link(form queryPayload:URI.Query) -> Unidoc.AnyOperation?
     {
         guard
         let route:Unidoc.LinkerRoute = self.descend(),
-        let form:Unidoc.LinkerForm = .init(from: query)
+        let form:Unidoc.LinkerForm = .init(from: queryPayload)
         else
         {
             return nil
         }
 
-        if  let path:URI.Path = form.next
+        for case ("y", "false") in self.query.parameters
         {
             let page:Unidoc.ReallyPage
-            let uri:URI = .init(path: path, query: query)
+            let uri:URI = .init(path: self.path, query: queryPayload)
 
             switch route
             {
@@ -524,19 +529,17 @@ extension Unidoc.Router
 
             return .syncHTML(page)
         }
-        else
-        {
-            let action:Unidoc.LinkerAction
 
-            switch route
-            {
-            case .uplink:   action = .uplinkRefresh
-            case .unlink:   action = .unlink
-            case .delete:   action = .delete
-            }
+        let action:Unidoc.LinkerAction
 
-            return .unordered(Unidoc.LinkerOperation.init(action: action, form: form))
+        switch route
+        {
+        case .uplink:   action = .uplinkRefresh
+        case .unlink:   action = .unlink
+        case .delete:   action = .delete
         }
+
+        return .unordered(Unidoc.LinkerOperation.init(action: action, form: form))
     }
 
     private mutating

Sources/UnidocUI/Endpoints/Tags/Unidoc.LinkerForm.swift

@@ -9,15 +9,12 @@ extension Unidoc
         let edition:Edition
         public
         let back:String
-        public
-        let next:URI.Path?
 
         @inlinable public
-        init(edition:Edition, back:String, next:URI.Path? = nil)
+        init(edition:Edition, back:String)
         {
             self.edition = edition
             self.back = back
-            self.next = next
         }
     }
 }
@@ -26,7 +23,6 @@ extension Unidoc.LinkerForm
     static var package:String { "package" }
     static var version:String { "version" }
     static var back:String { "back" }
-    static var next:String { "next" }
 
     public
     init?(parameters:borrowing [String: String])
@@ -42,8 +38,6 @@ extension Unidoc.LinkerForm
             return nil
         }
 
-        self.init(edition: .init(package: package, version: version),
-            back: back,
-            next: parameters[Self.next].map(URI.Path.init(_:)) ?? nil)
+        self.init(edition: .init(package: package, version: version), back: back)
     }
 }

Sources/UnidocUI/Endpoints/Tags/Unidoc.LinkerTool.swift

@@ -39,16 +39,6 @@ extension Unidoc.LinkerTool:HTML.OutputStreamable
             $0.value = self.form.back
         }
 
-        if  let next:URI.Path = self.form.next
-        {
-            form[.input]
-            {
-                $0.type = "hidden"
-                $0.name = Unidoc.LinkerForm.next
-                $0.value = "\(next)"
-            }
-        }
-
         form[.button] { $0.type = "submit"; $0.class = "text" } = self.name
     }
 }

Sources/UnidocUI/Endpoints/Tags/Unidoc.RefsTable.Row.Graph.swift

@@ -130,15 +130,14 @@ extension Unidoc.RefsTable.Row.Graph:HTML.OutputStreamable
                 {
                     $0[.li]
                     {
-                        let action:URI = Unidoc.ServerRoot.link / "\(route)"
-                        let next:URI.Path?
+                        var action:URI = Unidoc.ServerRoot.link / "\(route)"
 
                         switch route
                         {
                         //  Uplink does not require confirmation.
-                        case .uplink:   next = nil
-                        case .unlink:   next = action.path
-                        case .delete:   next = action.path
+                        case .uplink:   break
+                        case .unlink:   action["y"] = "false"
+                        case .delete:   action["y"] = "false"
                         }
 
                         $0[.form]
@@ -148,8 +147,7 @@ extension Unidoc.RefsTable.Row.Graph:HTML.OutputStreamable
                             $0.method = "post"
                         } = Unidoc.LinkerTool.init(
                             form: .init(edition: graph.id,
-                                back: "\(Unidoc.RefsEndpoint[self.symbol.package])",
-                                next: next),
+                                back: "\(Unidoc.RefsEndpoint[self.symbol.package])"),
                             name: label)
                     }
                 }