extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2025-06-21 12:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: save unsaved request changes before renaming (#2018)

Browse Source 
* feat: show unsaved changes alert while renaming request

* fix: save unsaved request changes silently instead of showing dialog

* fix: save unsaved request changes before renaming
This commit is contained in:
Rinku Chaudhari 2024-04-10 01:58:30 +05:45 committed by GitHub
parent 65dbf9c8ba
commit 0173d8812d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import * as Yup from 'yup';
import Modal from 'components/Modal'; import Modal from 'components/Modal';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { isItemAFolder } from 'utils/tabs'; import { isItemAFolder } from 'utils/tabs';
import { renameItem } from 'providers/ReduxStore/slices/collections/actions'; import { renameItem, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
const RenameCollectionItem = ({ collection, item, onClose }) => { const RenameCollectionItem = ({ collection, item, onClose }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
@ -21,7 +21,12 @@ const RenameCollectionItem = ({ collection, item, onClose }) => {
.max(50, 'must be 50 characters or less') .max(50, 'must be 50 characters or less')
.required('name is required') .required('name is required')
}), }),
onSubmit: (values) => { onSubmit: async (values) => {
// if there is unsaved changes in the request,
// save them before renaming the request
if (!isFolder && item.draft) {
await dispatch(saveRequest(item.uid, collection.uid, true));
}
dispatch(renameItem(values.name, item.uid, collection.uid)); dispatch(renameItem(values.name, item.uid, collection.uid));
onClose(); onClose();
} }

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

@ -6,9 +6,8 @@ import { useDrag, useDrop } from 'react-dnd';
import { IconChevronRight, IconDots } from '@tabler/icons'; import { IconChevronRight, IconDots } from '@tabler/icons';
import { useSelector, useDispatch } from 'react-redux'; import { useSelector, useDispatch } from 'react-redux';
import { addTab, focusTab } from 'providers/ReduxStore/slices/tabs'; import { addTab, focusTab } from 'providers/ReduxStore/slices/tabs';
import { moveItem, sendRequest } from 'providers/ReduxStore/slices/collections/actions';
import { collectionFolderClicked } from 'providers/ReduxStore/slices/collections'; import { collectionFolderClicked } from 'providers/ReduxStore/slices/collections';
import { moveItem } from 'providers/ReduxStore/slices/collections/actions';
import { sendRequest } from 'providers/ReduxStore/slices/collections/actions';
import Dropdown from 'components/Dropdown'; import Dropdown from 'components/Dropdown';
import NewRequest from 'components/Sidebar/NewRequest'; import NewRequest from 'components/Sidebar/NewRequest';
import NewFolder from 'components/Sidebar/NewFolder'; import NewFolder from 'components/Sidebar/NewFolder';

8
packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
View File

@ -55,7 +55,7 @@ export const renameCollection = (newName, collectionUid) => (dispatch, getState)
}); });
}; };
export const saveRequest = (itemUid, collectionUid) => (dispatch, getState) => { export const saveRequest = (itemUid, collectionUid, saveSilently) => (dispatch, getState) => {
const state = getState(); const state = getState();
const collection = findCollectionByUid(state.collections.collections, collectionUid); const collection = findCollectionByUid(state.collections.collections, collectionUid);
@ -76,7 +76,11 @@ export const saveRequest = (itemUid, collectionUid) => (dispatch, getState) => {
itemSchema itemSchema
.validate(itemToSave) .validate(itemToSave)
.then(() => ipcRenderer.invoke('renderer:save-request', item.pathname, itemToSave)) .then(() => ipcRenderer.invoke('renderer:save-request', item.pathname, itemToSave))
.then(() => toast.success('Request saved successfully')) .then(() => {
if (!saveSilently) {
toast.success('Request saved successfully');
}
})
.then(resolve) .then(resolve)
.catch((err) => { .catch((err) => {
toast.error('Failed to save request!'); toast.error('Failed to save request!');