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
5 changes: 4 additions & 1 deletion packages/client/src/components/app/forms/InnerForm.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import { derived, get, writable } from "svelte/store"
import { createValidatorFromConstraints } from "./validation"
import { Helpers } from "@budibase/bbui"
import { loadTranslationsByGroup } from "@budibase/frontend-core"
import {
type DataFetchDatasource,
type FieldSchema,
Expand Down Expand Up @@ -56,6 +57,7 @@

const component = getContext("component")
const { styleable, Provider, ActionTypes } = getContext("sdk")
const validationLabels = loadTranslationsByGroup("validation")

let fields: Writable<FieldInfo>[] = []
const formState = writable({
Expand Down Expand Up @@ -216,7 +218,8 @@
schemaConstraints,
validationRules,
field,
definition
definition,
validationLabels.required
)

// Sanitise the default value to ensure it doesn't contain invalid data
Expand Down
5 changes: 3 additions & 2 deletions packages/client/src/components/app/forms/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export const createValidatorFromConstraints = (
schemaConstraints: FieldConstraints | null | undefined,
customRules: UIFieldValidationRule[],
field: string,
definition: Table | undefined
definition: Table | undefined,
requiredError?: string
) => {
let rules: UIFieldValidationRule[] = []

Expand All @@ -33,7 +34,7 @@ export const createValidatorFromConstraints = (
? FieldType.ARRAY
: FieldType.STRING,
constraint: "required",
error: "Required",
error: requiredError || "Required",
})
}

Expand Down
4 changes: 4 additions & 0 deletions packages/shared-core/src/translations/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { recaptchaTranslations } from "./recaptcha"
import { portalTranslations } from "./portal"
import { loginTranslations } from "./login"
import { forgotPasswordTranslations } from "./forgotPassword"
import { validationTranslations } from "./validation"
import type {
TranslationCategory,
TranslationDefinition,
Expand All @@ -22,6 +23,7 @@ export {
portalTranslations,
loginTranslations,
forgotPasswordTranslations,
validationTranslations,
}

const translationModules = [
Expand All @@ -33,6 +35,7 @@ const translationModules = [
portalTranslations,
loginTranslations,
forgotPasswordTranslations,
validationTranslations,
]

export const TRANSLATION_CATEGORY_LABELS: Record<TranslationCategory, string> =
Expand All @@ -45,6 +48,7 @@ export const TRANSLATION_CATEGORY_LABELS: Record<TranslationCategory, string> =
portal: "Portal",
login: "Login",
forgotPassword: "Forgot password",
validation: "Validation",
}

// Central export of all translation definitions across modules.
Expand Down
1 change: 1 addition & 0 deletions packages/shared-core/src/translations/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export type TranslationCategory =
| "portal"
| "login"
| "forgotPassword"
| "validation"

export interface TranslationDefinitionInput {
key: string
Expand Down
11 changes: 11 additions & 0 deletions packages/shared-core/src/translations/validation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { createTranslationDefinitions } from "./types"

const category = "validation"

export const validationTranslations = createTranslationDefinitions(category, [
{
key: "required",
name: "Required field error",
defaultValue: "Required",
},
])
Loading