Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update front-end to treat fields with default values as required #3694

Merged
merged 10 commits into from
Jun 29, 2023
Merged

Update front-end to treat fields with default values as required #3694

Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3e99c7a
Update front-end to treat fields with default values as required
galvana Jun 28, 2023
1dc562f
Merge branch 'main' into 961-make-default-fields-required
galvana Jun 28, 2023
37ce161
Fixing lint error
galvana Jun 28, 2023
33fd46c
Merge branch 'main' into 961-make-default-fields-required
galvana Jun 28, 2023
019cc5a
Merge branch 'main' into 961-make-default-fields-required
galvana Jun 28, 2023
d1f0b70
Merge branch 'main' into 961-make-default-fields-required
galvana Jun 28, 2023
8c9f765
Moving required check into a function
galvana Jun 29, 2023
1518a38
Merge branch 'main' into 961-make-default-fields-required
galvana Jun 29, 2023
3df7d43
Fixing lint issue
galvana Jun 29, 2023
dd6169a
Updating changelog
galvana Jun 29, 2023
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
15 changes: 13 additions & 2 deletions ...src/features/datastore-connections/system_portal_config/forms/ConnectorParametersForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@ const ConnectorParametersForm: React.FC<ConnectorParametersFormProps> = ({
name={key}
key={key}
validate={
secretsSchema?.required?.includes(key) || item.type === "integer"
secretsSchema?.required?.includes(key) ||
Object.prototype.hasOwnProperty.call(
galvana marked this conversation as resolved.
Show resolved Hide resolved
secretsSchema?.properties[key],
"default"
) ||
item.type === "integer"
? (value: string) =>
validateField(item.title, value, item.allOf?.[0].$ref)
: false
Expand All @@ -151,7 +156,13 @@ const ConnectorParametersForm: React.FC<ConnectorParametersFormProps> = ({
{({ field, form }: { field: FieldInputProps<string>; form: any }) => (
<FormControl
display="flex"
isRequired={secretsSchema?.required?.includes(key)}
isRequired={
secretsSchema?.required?.includes(key) ||
Object.prototype.hasOwnProperty.call(
secretsSchema?.properties[key],
"default"
)
}
isInvalid={form.errors[key] && form.touched[key]}
>
{getFormLabel(key, item.title)}
Expand Down