extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2024-11-21 23:43:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: updates (#3158)

Browse Source
This commit is contained in:
lohit 2024-09-21 19:49:50 +05:30 committed by GitHub
parent 6c6693757e
commit fc79436787
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bruno-app/src/components/Environments/EnvironmentSettings/CopyEnvironment/index.js
View File

@ -44,7 +44,7 @@ const CopyEnvironment = ({ collection, environment, onClose }) => {
return (
<Portal>
<Modal size="sm" title={'Copy Environment'} confirmText="Copy" handleConfirm={onSubmit} handleCancel={onClose}>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="name" className="block font-semibold">
New Environment Name

2
packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js
View File

@ -50,7 +50,7 @@ const CreateEnvironment = ({ collection, onClose }) => {
handleConfirm={onSubmit}
handleCancel={onClose}
>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="name" className="block font-semibold">
Environment Name

2
packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js
View File

@ -50,7 +50,7 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
handleConfirm={onSubmit}
handleCancel={onClose}
>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="name" className="block font-semibold">
Environment Name

7
packages/bruno-app/src/components/Modal/index.js
View File

@ -76,13 +76,15 @@ const Modal = ({
const modalRef = useRef(null);
const [isClosing, setIsClosing] = useState(false);
const handleKeydown = ({ keyCode }) => {
const handleKeydown = (event) => {
const { keyCode, shiftKey, ctrlKey, altKey, metaKey } = event;
switch (keyCode) {
case ESC_KEY_CODE: {
if (disableEscapeKey) return;
return closeModal({ type: 'esc' });
}
case ENTER_KEY_CODE: {
if(handleConfirm) {
if (!shiftKey && !ctrlKey && !altKey && !metaKey && handleConfirm) {
return handleConfirm();
}
}
@ -97,7 +99,6 @@ const Modal = ({
};
useEffect(() => {
if (disableEscapeKey) return;
document.addEventListener('keydown', handleKeydown, false);
return () => {
document.removeEventListener('keydown', handleKeydown);

4
packages/bruno-app/src/components/Sidebar/Collections/Collection/CloneCollection/index.js
View File

@ -41,7 +41,7 @@ const CloneCollection = ({ onClose, collection }) => {
)
)
.then(() => {
toast.success('Collection created');
toast.success('Collection created!');
onClose();
})
.catch((e) => toast.error('An error occurred while creating the collection - ' + e));
@ -72,7 +72,7 @@ const CloneCollection = ({ onClose, collection }) => {
return (
<Modal size="sm" title="Clone Collection" confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="collection-name" className="flex items-center font-semibold">
Name

3
packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/CloneCollectionItem/index.js
View File

@ -25,6 +25,7 @@ const CloneCollectionItem = ({ collection, item, onClose }) => {
onSubmit: (values) => {
dispatch(cloneItem(values.name, item.uid, collection.uid))
.then(() => {
toast.success('Request cloned!');
onClose();
})
.catch((err) => {
@ -49,7 +50,7 @@ const CloneCollectionItem = ({ collection, item, onClose }) => {
handleConfirm={onSubmit}
handleCancel={onClose}
>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="name" className="block font-semibold">
{isFolder ? 'Folder' : 'Request'} Name

13
packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/index.js
View File

@ -5,6 +5,7 @@ import Modal from 'components/Modal';
import { useDispatch } from 'react-redux';
import { isItemAFolder } from 'utils/tabs';
import { renameItem, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
import toast from 'react-hot-toast';
const RenameCollectionItem = ({ collection, item, onClose }) => {
const dispatch = useDispatch();
@ -27,8 +28,14 @@ const RenameCollectionItem = ({ collection, item, onClose }) => {
if (!isFolder && item.draft) {
await dispatch(saveRequest(item.uid, collection.uid, true));
}
dispatch(renameItem(values.name, item.uid, collection.uid));
onClose();
dispatch(renameItem(values.name, item.uid, collection.uid))
.then(() => {
toast.success('Request renamed!');
onClose();
})
.catch((err) => {
toast.error(err ? err.message : 'An error occurred while renaming the request');
});
}
});
@ -48,7 +55,7 @@ const RenameCollectionItem = ({ collection, item, onClose }) => {
handleConfirm={onSubmit}
handleCancel={onClose}
>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="name" className="block font-semibold">
{isFolder ? 'Folder' : 'Request'} Name

13
packages/bruno-app/src/components/Sidebar/Collections/Collection/RenameCollection/index.js
View File

@ -21,9 +21,14 @@ const RenameCollection = ({ collection, onClose }) => {
.required('name is required')
}),
onSubmit: (values) => {
dispatch(renameCollection(values.name, collection.uid));
toast.success('Collection renamed!');
onClose();
dispatch(renameCollection(values.name, collection.uid))
.then(() => {
toast.success('Collection renamed!');
onClose();
})
.catch((err) => {
toast.error(err ? err.message : 'An error occurred while renaming the collection');
});
}
});
@ -37,7 +42,7 @@ const RenameCollection = ({ collection, onClose }) => {
return (
<Modal size="sm" title="Rename Collection" confirmText="Rename" handleConfirm={onSubmit} handleCancel={onClose}>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="name" className="block font-semibold">
Name

4
packages/bruno-app/src/components/Sidebar/CreateCollection/index.js
View File

@ -34,7 +34,7 @@ const CreateCollection = ({ onClose }) => {
onSubmit: (values) => {
dispatch(createCollection(values.collectionName, values.collectionFolderName, values.collectionLocation))
.then(() => {
toast.success('Collection created');
toast.success('Collection created!');
onClose();
})
.catch((e) => toast.error('An error occurred while creating the collection - ' + e));
@ -65,7 +65,7 @@ const CreateCollection = ({ onClose }) => {
return (
<Modal size="sm" title="Create Collection" confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="collection-name" className="flex items-center font-semibold">
Name

2
packages/bruno-app/src/components/Sidebar/ImportCollectionLocation/index.js
View File

@ -144,7 +144,7 @@ const ImportCollectionLocation = ({ onClose, handleSubmit, collectionName, trans
return (
<Modal size="sm" title="Import Collection" confirmText="Import" handleConfirm={onSubmit} handleCancel={onClose}>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="collectionName" className="block font-semibold">
Name

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

@ -32,7 +32,10 @@ const NewFolder = ({ collection, item, onClose }) => {
}),
onSubmit: (values) => {
dispatch(newFolder(values.folderName, collection.uid, item ? item.uid : null))
.then(() => onClose())
.then(() => {
toast.success('New folder created!');
onClose()
})
.catch((err) => toast.error(err ? err.message : 'An error occurred while adding the folder'));
}
});
@ -47,7 +50,7 @@ const NewFolder = ({ collection, item, onClose }) => {
return (
<Modal size="sm" title="New Folder" confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="folderName" className="block font-semibold">
Folder Name

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

@ -113,7 +113,10 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
auth: request.auth
})
)
.then(() => onClose())
.then(() => {
toast.success('New request created!');
onClose()
})
.catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request'));
} else {
dispatch(
@ -126,7 +129,10 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
itemUid: item ? item.uid : null
})
)
.then(() => onClose())
.then(() => {
toast.success('New request created!');
onClose()
})
.catch((err) => toast.error(err ? err.message : 'An error occurred while adding the request'));
}
}
@ -162,7 +168,7 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
return (
<StyledWrapper>
<Modal size="md" title="New Request" confirmText="Create" handleConfirm={onSubmit} handleCancel={onClose}>
<form className="bruno-form" onSubmit={formik.handleSubmit}>
<form className="bruno-form" onSubmit={e => e.preventDefault()}>
<div>
<label htmlFor="requestName" className="block font-semibold">
Type