toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix interactive dialog number handling (#8431)

Browse source
This commit is contained in:
Daniel Espino García 2024-12-19 09:45:03 +01:00 committed by GitHub
parent d75cbcde7f
commit 32453b320c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/screens/interactive_dialog/dialog_element.tsx
View file

@ -70,7 +70,8 @@ function DialogElement({
const testID = `InteractiveDialogElement.${name}`;
const handleChange = useCallback((newValue: string | boolean | string[]) => {
if (type === 'text' && subtype === 'number') {
onChange(name, parseInt(newValue as string, 10));
const number = parseInt(newValue as string, 10);
onChange(name, isNaN(number) ? '' : number);
return;
}
onChange(name, newValue);

10
app/screens/interactive_dialog/index.tsx
View file

@ -140,10 +140,16 @@ function InteractiveDialog({
const handleSubmit = useCallback(async () => {
const newErrors: Errors = {};
const submission = {...values};
let hasErrors = false;
if (elements) {
elements.forEach((elem) => {
const newError = checkDialogElementForError(elem, secureGetFromRecord(values, elem.name));
// Delete empty number fields before submissions
if (elem.type === 'text' && elem.subtype === 'number' && secureGetFromRecord(submission, elem.name) === '') {
delete submission[elem.name];
}
const newError = checkDialogElementForError(elem, secureGetFromRecord(submission, elem.name));
if (newError) {
newErrors[elem.name] = intl.formatMessage({id: newError.id, defaultMessage: newError.defaultMessage}, newError.values);
hasErrors = true;
@ -161,7 +167,7 @@ function InteractiveDialog({
url,
callback_id: callbackId,
state,
submission: values,
submission,
} as DialogSubmission;
setSubmitting(true);

15
app/utils/integrations.ts
View file

@ -10,16 +10,21 @@ type DialogError = {
};
export function checkDialogElementForError(elem: DialogElement, value: any): DialogError | undefined | null {
if (!value && !elem.optional) {
return {
id: 'interactive_dialog.error.required',
defaultMessage: 'This field is required.',
};
const fieldRequiredError = {
id: 'interactive_dialog.error.required',
defaultMessage: 'This field is required.',
};
if (typeof value === 'undefined' && !elem.optional) {
return fieldRequiredError;
}
const type = elem.type;
if (type === 'text' || type === 'textarea') {
if (value === '' && !elem.optional) {
return fieldRequiredError;
}
if (value && value.length < elem.min_length) {
return {
id: 'interactive_dialog.error.too_short',