switchboard/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Releases 9 Wiki Activity

Fix workflow entry token resolution and fieldset submit guard

Browse Source 
RenderWorkflow() was passing the route param (instance ID) as the
entry token to the template JS. The advance API needs the actual
entry token from the instance. Now resolves from inst.EntryToken
and checks the ?token= query param from the landing page redirect.

Also fix submitForm() early-return guard that blocked progressive
forms using fieldsets (checked FORM_TPL.fields but not .fieldsets).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Jeffrey Smith
2026-04-02 22:21:38 +00:00
parent eeb9f895b4
commit 110f128661
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/pages/pages.go
View File

@@ -673,18 +673,27 @@ type WorkflowLandingPageData struct {
func (e *Engine) RenderWorkflow() gin.HandlerFunc {
return func(c *gin.Context) {
ctx := c.Request.Context()
entryToken := c.Param("id")
routeID := c.Param("id")
sessionID := c.GetString("session_id")
sessionName := "Visitor"
instanceName, _, _ := e.loadBranding()
// Try to load instance by entry token, then by ID
// Try to load instance — the route param may be an instance ID
// or an entry token. Also check the ?token= query param.
var inst *models.WorkflowInstance
if e.stores.Workflows != nil {
inst, _ = e.stores.Workflows.GetInstanceByToken(ctx, entryToken)
// First try: query param token (from landing page redirect)
if qToken := c.Query("token"); qToken != "" {
inst, _ = e.stores.Workflows.GetInstanceByToken(ctx, qToken)
}
// Second try: route param as entry token
if inst == nil {
inst, _ = e.stores.Workflows.GetInstance(ctx, entryToken)
inst, _ = e.stores.Workflows.GetInstanceByToken(ctx, routeID)
}
// Third try: route param as instance ID
if inst == nil {
inst, _ = e.stores.Workflows.GetInstance(ctx, routeID)
}
}
@@ -730,6 +739,12 @@ func (e *Engine) RenderWorkflow() gin.HandlerFunc {
}
}
// Resolve the actual entry token from the instance (used by JS API calls)
entryToken := ""
if inst.EntryToken != nil {
entryToken = *inst.EntryToken
}
e.Render(c, "workflow.html", PageData{
Surface: "workflow",
InstanceName: instanceName,

2
server/pages/templates/workflow.html
View File

@@ -398,7 +398,7 @@
}
window.submitForm = async function() {
if (!FORM_TPL || !FORM_TPL.fields) return;
if (!FORM_TPL || (!FORM_TPL.fields && !FORM_TPL.fieldsets)) return;
var btn = document.getElementById('formSubmitBtn');
if (btn) btn.disabled = true;