holm/bruno
1
0
Fork 0
forked from extern/bruno
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Nikhil569/bruno into main

Browse Source
This commit is contained in:
Nikhil569 2023-10-11 02:58:05 +05:30
commit 9e8488d417
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/bruno-app/src/components/Sidebar/NewFolder/index.js
View File

@ -16,6 +16,7 @@ const NewFolder = ({ collection, item, onClose }) => {
}, },
validationSchema: Yup.object({ validationSchema: Yup.object({
folderName: Yup.string() folderName: Yup.string()
.trim()
.min(1, 'must be at least 1 character') .min(1, 'must be at least 1 character')
.required('name is required') .required('name is required')
.test({ .test({
@ -32,7 +33,7 @@ const NewFolder = ({ collection, item, onClose }) => {
onSubmit: (values) => { onSubmit: (values) => {
dispatch(newFolder(values.folderName, collection.uid, item ? item.uid : null)) dispatch(newFolder(values.folderName, collection.uid, item ? item.uid : null))
.then(() => onClose()) .then(() => onClose())
.catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request')); .catch((err) => toast.error(err ? err.message : 'An error occurred while adding the folder'));
} }
}); });

3
packages/bruno-app/src/components/Sidebar/NewRequest/index.js
View File

@ -25,13 +25,14 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
}, },
validationSchema: Yup.object({ validationSchema: Yup.object({
requestName: Yup.string() requestName: Yup.string()
.trim()
.min(1, 'must be at least 1 character') .min(1, 'must be at least 1 character')
.required('name is required') .required('name is required')
.test({ .test({
name: 'requestName', name: 'requestName',
message: `The request names - collection and folder is reserved in bruno`, message: `The request names - collection and folder is reserved in bruno`,
test: (value) => { test: (value) => {
const trimmedValue = value.trim().toLowerCase(); const trimmedValue = value ? value.trim().toLowerCase() : '';
return !['collection', 'folder'].includes(trimmedValue); return !['collection', 'folder'].includes(trimmedValue);
} }
}) })