Update action links on form submit

Author: akclace

internal/app/action/action.go

@@ -384,7 +384,7 @@ func (a *Action) execAction(w http.ResponseWriter, r *http.Request, isSuggest, i
 	}
 
 	if isSuggest {
-		a.handleSuggestResponse(w, ret)
+		a.handleSuggestResponse(w, qsParams.Encode(), ret)
 		return
 	}
 
@@ -463,6 +463,16 @@ func (a *Action) execAction(w http.ResponseWriter, r *http.Request, isSuggest, i
 		return
 	}
 
+	if len(a.Links) > 1 {
+		linksWithQS := a.getLinksWithQS(qsParams.Encode())
+		input := map[string]any{"links": linksWithQS}
+		err = a.actionTemplate.ExecuteTemplate(w, "dropdown", input)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+	}
+
 	// Render the param error messages, using HTMX OOB
 	errorMsgs := map[string]string{}
 	errorKeys := []string{}
@@ -775,16 +785,7 @@ func (a *Action) getForm(w http.ResponseWriter, r *http.Request) {
 		params = append(params, param)
 	}
 
-	linksWithQS := make([]ActionLink, 0, len(a.Links))
-	for _, link := range a.Links {
-		if link.Path != a.pagePath { // Don't add self link
-			if r.URL.RawQuery != "" {
-				link.Path = link.Path + "?" + r.URL.RawQuery
-			}
-			linksWithQS = append(linksWithQS, link)
-		}
-	}
-
+	linksWithQS := a.getLinksWithQS(r.URL.RawQuery)
 	input := map[string]any{
 		"dev":           a.isDev,
 		"name":          a.name,
@@ -806,7 +807,20 @@ func (a *Action) getForm(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (a *Action) handleSuggestResponse(w http.ResponseWriter, retVal starlark.Value) {
+func (a *Action) getLinksWithQS(qs string) []ActionLink {
+	linksWithQS := make([]ActionLink, 0, len(a.Links))
+	for _, link := range a.Links {
+		if link.Path != a.pagePath { // Don't add self link
+			if qs != "" {
+				link.Path = link.Path + "?" + qs
+			}
+			linksWithQS = append(linksWithQS, link)
+		}
+	}
+	return linksWithQS
+}
+
+func (a *Action) handleSuggestResponse(w http.ResponseWriter, paramQS string, retVal starlark.Value) {
 	ret, err := starlark_type.UnmarshalStarlark(retVal)
 	if err != nil {
 		http.Error(w, fmt.Sprintf("error unmarshalling suggest response: %s", err), http.StatusInternalServerError)
@@ -824,6 +838,16 @@ func (a *Action) handleSuggestResponse(w http.ResponseWriter, retVal starlark.Va
 		return
 	}
 
+	if len(a.Links) > 1 {
+		linksWithQS := a.getLinksWithQS(paramQS)
+		input := map[string]any{"links": linksWithQS}
+		err = a.actionTemplate.ExecuteTemplate(w, "dropdown", input)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+	}
+
 	if retIsString {
 		// No suggestions available
 		return

internal/app/action/form.go.html

@@ -55,13 +55,19 @@
                 <path d="M4 18l16 0" />
               </svg>
             </div>
-            <ul
-              tabindex="0"
-              class="dropdown-content menu bg-base-100 rounded-box z-[1] w-52 p-2 shadow">
-              {{ range .links }}
-                <li><a href="{{ .Path }}">{{ .Name }}</a></li>
-              {{ end }}
-            </ul>
+
+            {{ block "dropdown" . }}
+              <ul
+                id="dropdown-menu"
+                hx-swap-oob="true"
+                hx-swap="outerHTML"
+                tabindex="0"
+                class="dropdown-content menu bg-base-100 rounded-box z-[1] w-52 p-2 shadow">
+                {{ range .links }}
+                  <li><a href="{{ .Path }}">{{ .Name }}</a></li>
+                {{ end }}
+              </ul>
+            {{ end }}
           </div>
         {{ end }}
       </div>

internal/app/tests/appaction_test.go

@@ -871,6 +871,70 @@ app = ace.app("testApp",
 		t.Errorf("actions switcher should not have current action, got %s", body)
 	}
 	testutil.AssertStringContains(t, body, `<li><a href="/test/test1?param1=abc">test1Action</a></li>`)
+
+	values := url.Values{
+		"param1": {"p1val"},
+	}
+	request = httptest.NewRequest("POST", "/test/test1", strings.NewReader(values.Encode()))
+	request.Header.Set("HX-Request", "true")
+	request.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+
+	response = httptest.NewRecorder()
+	a.ServeHTTP(response, request)
+	testutil.AssertEqualsInt(t, "code", 200, response.Code)
+	testutil.AssertStringMatch(t, "response", `
+	<div class="text-lg text-bold">
+            done
+          </div>
+        
+                      <ul
+                        id="dropdown-menu"
+                        hx-swap-oob="true"
+                        hx-swap="outerHTML"
+                        tabindex="0"
+                        class="dropdown-content menu bg-base-100 rounded-box z-[1] w-52 p-2 shadow">
+                        
+                          <li><a href="/test/test2?param1=p1val">test2Action</a></li>
+                        
+                      </ul>
+                    
+          <div
+            id="param_param1_error"
+            hx-swap-oob="true"
+            hx-swap="outerHTML"
+            class="text-error mt-1">
+            
+          </div>
+        
+          <div id="action_result" hx-swap-oob="true" hx-swap="outerHTML">
+            <div class="divider text-lg text-secondary">Report</div>
+            <div class="overflow-x-auto">
+              <table
+                class="table table-auto min-w-full table-zebra text-sm md:text-xl font-mono">
+                <thead>
+                  <tr class="text-primary">
+                    
+                      <th>a</th>
+                    
+                      <th>b</th>
+                    
+                  </tr>
+                </thead>
+                <tbody>
+                  
+                    <tr>
+                      
+                        <td>1</td>
+                      
+                        <td>abc</td>
+                      
+                    </tr>
+                  
+                </tbody>
+              </table>
+            </div>
+          </div>
+	`, response.Body.String())
 }
 
 func TestDisplayTypes(t *testing.T) {