Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions synkronus-cli/pkg/validation/bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,23 @@ func isBuiltInRenderer(rendererType string) bool {
return false
}

// knownFormats lists the formats Formplayer renders natively, so they don't need an extension renderer
var knownFormats = []string{
"date", "date-time", "time", "adate", "html",
"photo", "qrcode", "signature", "select_file", "audio", "gps", "video",
"likert", "duration", "sub-observation",
}

// isKnownFormat checks if a format is rendered natively by Formplayer
func isKnownFormat(format string) bool {
for _, known := range knownFormats {
if known == format {
return true
}
}
return false
}

// checkSchemaRendererReferences recursively checks for renderer references in the schema
// This includes format-based renderers (used by custom question types)
func checkSchemaRendererReferences(data interface{}, availableRenderers map[string]bool, extensionRenderers map[string]bool) error {
Expand All @@ -329,16 +346,7 @@ func checkSchemaRendererReferences(data interface{}, availableRenderers map[stri
if format, ok := v["format"].(string); ok {
// Format-based renderers must be in extension renderers or built-in
if !extensionRenderers[format] && !isBuiltInRenderer(format) {
// Check if it's a known format
knownFormats := []string{"date", "date-time", "time", "photo", "qrcode", "signature", "select_file", "audio", "gps", "video", "adate", "html"}
isKnownFormat := false
for _, known := range knownFormats {
if format == known {
isKnownFormat = true
break
}
}
if !isKnownFormat {
if !isKnownFormat(format) {
return fmt.Errorf("schema property references renderer with format '%s' but no extension renderer is defined for this format", format)
}
}
Expand Down Expand Up @@ -571,16 +579,7 @@ func checkUISchemaRendererReferences(data interface{}, availableRenderers map[st
if format, ok := v["format"].(string); ok {
// Format-based renderers must be in extension renderers or built-in
if !extensionRenderers[format] && !isBuiltInRenderer(format) {
// Check if it's a known format (date, date-time, time are built-in)
knownFormats := []string{"date", "date-time", "time", "photo", "qrcode", "signature", "select_file", "audio", "gps", "video", "adate", "html"}
isKnownFormat := false
for _, known := range knownFormats {
if format == known {
isKnownFormat = true
break
}
}
if !isKnownFormat {
if !isKnownFormat(format) {
return fmt.Errorf("UI schema references renderer with format '%s' but no extension renderer is defined for this format", format)
}
}
Expand Down
23 changes: 23 additions & 0 deletions synkronus-cli/pkg/validation/bundle_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,29 @@ func TestValidateBundle(t *testing.T) {
},
wantErr: false,
},
{
name: "built-in likert, duration and sub-observation formats",
files: map[string]string{
"app/index.html": "<html></html>",
"forms/survey/schema.json": `{"type": "object", "properties": {
"satisfaction": {"type": "integer", "format": "likert", "oneOf": [{"const": 1, "title": "Low"}, {"const": 5, "title": "High"}]},
"time_spent": {"type": "string", "format": "duration"},
"members": {"type": "array", "format": "sub-observation"}
}}`,
"forms/survey/ui.json": `{"type": "VerticalLayout", "elements": [{"type": "Control", "scope": "#/properties/satisfaction", "options": {"format": "likert"}}]}`,
},
wantErr: false,
},
{
name: "unknown format without extension renderer",
files: map[string]string{
"app/index.html": "<html></html>",
"forms/user/schema.json": `{"type": "object", "properties": {"x": {"type": "string", "format": "not-a-real-format"}}}`,
"forms/user/ui.json": "{}",
},
wantErr: true,
errMsg: "no extension renderer is defined for this format",
},
}

for _, tt := range tests {
Expand Down
Loading