From c7d58df47eeeddd7420bfe6c1324f003794619db Mon Sep 17 00:00:00 2001 From: Adithya Vardhan <64399555+im-adithya@users.noreply.github.com> Date: Wed, 27 Jan 2021 13:39:58 +0530 Subject: [PATCH 1/6] Update UserAvatarEditor.js --- client/components/avatar/UserAvatarEditor.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/components/avatar/UserAvatarEditor.js b/client/components/avatar/UserAvatarEditor.js index 1519215d6e4e2..ecae3e8a63284 100644 --- a/client/components/avatar/UserAvatarEditor.js +++ b/client/components/avatar/UserAvatarEditor.js @@ -1,4 +1,6 @@ import React, { useState, useCallback } from 'react'; +import { Meteor } from 'meteor/meteor'; +import toastr from 'toastr'; import { Box, Button, Icon, TextInput, Margins, Avatar } from '@rocket.chat/fuselage'; import { useTranslation } from '../../contexts/TranslationContext'; @@ -40,6 +42,10 @@ export function UserAvatarEditor({ currentUsername, username, setAvatarObj, sugg const [clickUpload] = useFileInput(setUploadedPreview); const clickUrl = () => { + if (avatarFromUrl == ''){ + toastr.error('Please Enter a URL'); + throw new Meteor.Error(); + } setNewAvatarSource(avatarFromUrl); setAvatarObj({ avatarUrl: avatarFromUrl }); }; From 21c3511e6b329016ac36d714d0b44179f7a6c272 Mon Sep 17 00:00:00 2001 From: Adithya Vardhan <64399555+im-adithya@users.noreply.github.com> Date: Wed, 27 Jan 2021 13:41:53 +0530 Subject: [PATCH 2/6] Update UserAvatarEditor.js --- client/components/avatar/UserAvatarEditor.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/client/components/avatar/UserAvatarEditor.js b/client/components/avatar/UserAvatarEditor.js index ecae3e8a63284..1519215d6e4e2 100644 --- a/client/components/avatar/UserAvatarEditor.js +++ b/client/components/avatar/UserAvatarEditor.js @@ -1,6 +1,4 @@ import React, { useState, useCallback } from 'react'; -import { Meteor } from 'meteor/meteor'; -import toastr from 'toastr'; import { Box, Button, Icon, TextInput, Margins, Avatar } from '@rocket.chat/fuselage'; import { useTranslation } from '../../contexts/TranslationContext'; @@ -42,10 +40,6 @@ export function UserAvatarEditor({ currentUsername, username, setAvatarObj, sugg const [clickUpload] = useFileInput(setUploadedPreview); const clickUrl = () => { - if (avatarFromUrl == ''){ - toastr.error('Please Enter a URL'); - throw new Meteor.Error(); - } setNewAvatarSource(avatarFromUrl); setAvatarObj({ avatarUrl: avatarFromUrl }); }; From b4e4a66986ccc0bd9d4f9436b9861d8018de61b2 Mon Sep 17 00:00:00 2001 From: Adithya Vardhan <64399555+im-adithya@users.noreply.github.com> Date: Wed, 27 Jan 2021 13:47:23 +0530 Subject: [PATCH 3/6] Update UserAvatarEditor.js --- client/components/avatar/UserAvatarEditor.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/components/avatar/UserAvatarEditor.js b/client/components/avatar/UserAvatarEditor.js index 1519215d6e4e2..ecae3e8a63284 100644 --- a/client/components/avatar/UserAvatarEditor.js +++ b/client/components/avatar/UserAvatarEditor.js @@ -1,4 +1,6 @@ import React, { useState, useCallback } from 'react'; +import { Meteor } from 'meteor/meteor'; +import toastr from 'toastr'; import { Box, Button, Icon, TextInput, Margins, Avatar } from '@rocket.chat/fuselage'; import { useTranslation } from '../../contexts/TranslationContext'; @@ -40,6 +42,10 @@ export function UserAvatarEditor({ currentUsername, username, setAvatarObj, sugg const [clickUpload] = useFileInput(setUploadedPreview); const clickUrl = () => { + if (avatarFromUrl == ''){ + toastr.error('Please Enter a URL'); + throw new Meteor.Error(); + } setNewAvatarSource(avatarFromUrl); setAvatarObj({ avatarUrl: avatarFromUrl }); }; From c7ca103a42c3f72fd5e19d8b97b95f4f5f9825da Mon Sep 17 00:00:00 2001 From: Adithya Vardhan <64399555+im-adithya@users.noreply.github.com> Date: Wed, 27 Jan 2021 14:23:17 +0530 Subject: [PATCH 4/6] Update UserAvatarEditor.js --- client/components/avatar/UserAvatarEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/avatar/UserAvatarEditor.js b/client/components/avatar/UserAvatarEditor.js index ecae3e8a63284..770627baa34db 100644 --- a/client/components/avatar/UserAvatarEditor.js +++ b/client/components/avatar/UserAvatarEditor.js @@ -42,7 +42,7 @@ export function UserAvatarEditor({ currentUsername, username, setAvatarObj, sugg const [clickUpload] = useFileInput(setUploadedPreview); const clickUrl = () => { - if (avatarFromUrl == ''){ + if (avatarFromUrl === '') { toastr.error('Please Enter a URL'); throw new Meteor.Error(); } From 612004511f8f2b187615ff02938bccff22d103c8 Mon Sep 17 00:00:00 2001 From: Adithya Vardhan <64399555+im-adithya@users.noreply.github.com> Date: Fri, 12 Feb 2021 10:02:09 +0530 Subject: [PATCH 5/6] Update UserAvatarEditor.js --- client/components/avatar/UserAvatarEditor.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/client/components/avatar/UserAvatarEditor.js b/client/components/avatar/UserAvatarEditor.js index 770627baa34db..d1fb49681d137 100644 --- a/client/components/avatar/UserAvatarEditor.js +++ b/client/components/avatar/UserAvatarEditor.js @@ -1,6 +1,4 @@ import React, { useState, useCallback } from 'react'; -import { Meteor } from 'meteor/meteor'; -import toastr from 'toastr'; import { Box, Button, Icon, TextInput, Margins, Avatar } from '@rocket.chat/fuselage'; import { useTranslation } from '../../contexts/TranslationContext'; @@ -43,8 +41,7 @@ export function UserAvatarEditor({ currentUsername, username, setAvatarObj, sugg const clickUrl = () => { if (avatarFromUrl === '') { - toastr.error('Please Enter a URL'); - throw new Meteor.Error(); + return; } setNewAvatarSource(avatarFromUrl); setAvatarObj({ avatarUrl: avatarFromUrl }); From 2e3c0beaf7047852a2ca555c9b8be4fa216395b2 Mon Sep 17 00:00:00 2001 From: dougfabris Date: Thu, 25 Feb 2021 17:11:55 -0300 Subject: [PATCH 6/6] add url field validation --- client/components/avatar/UserAvatarEditor.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/components/avatar/UserAvatarEditor.js b/client/components/avatar/UserAvatarEditor.js index d1fb49681d137..f9e1f3248d89d 100644 --- a/client/components/avatar/UserAvatarEditor.js +++ b/client/components/avatar/UserAvatarEditor.js @@ -31,6 +31,7 @@ export function UserAvatarEditor({ currentUsername, username, setAvatarObj, sugg const t = useTranslation(); const [avatarFromUrl, setAvatarFromUrl] = useState(''); const [newAvatarSource, setNewAvatarSource] = useState(); + const [urlEmpty, setUrlEmpty] = useState(true); const setUploadedPreview = useCallback(async (file, avatarObj) => { setAvatarObj(avatarObj); @@ -54,6 +55,7 @@ export function UserAvatarEditor({ currentUsername, username, setAvatarObj, sugg const url = newAvatarSource; const handleAvatarFromUrlChange = (event) => { + event.currentTarget.value !== '' ? setUrlEmpty(false) : setUrlEmpty(true); setAvatarFromUrl(event.currentTarget.value); }; @@ -68,7 +70,7 @@ export function UserAvatarEditor({ currentUsername, username, setAvatarObj, sugg - + {suggestions && }