diff --git a/packages/bruno-app/src/components/SaveTransientRequest/Container/StyledWrapper.js b/packages/bruno-app/src/components/SaveTransientRequest/Container/StyledWrapper.js new file mode 100644 index 000000000..f90802cdc --- /dev/null +++ b/packages/bruno-app/src/components/SaveTransientRequest/Container/StyledWrapper.js @@ -0,0 +1,21 @@ +import styled from 'styled-components'; + +const StyledWrapper = styled.div` + padding-top: 0.5rem; + padding-bottom: 0.5rem; + padding-left: 0.75rem; + padding-right: 0.75rem; + background: ${({ theme }) => theme.background.crust}; + border: 1px solid ${({ theme }) => theme.border.border0}; + border-radius: ${({ theme }) => theme.border.radius.sm}; + + .request-name { + color: ${({ theme }) => theme.text}; + } + + .collection-name{ + color: ${({ theme }) => theme.colors.text.subtext1}; + } +`; + +export default StyledWrapper; diff --git a/packages/bruno-app/src/components/SaveTransientRequest/Container.js b/packages/bruno-app/src/components/SaveTransientRequest/Container/index.js similarity index 89% rename from packages/bruno-app/src/components/SaveTransientRequest/Container.js rename to packages/bruno-app/src/components/SaveTransientRequest/Container/index.js index 27943acd7..01fe1fe1a 100644 --- a/packages/bruno-app/src/components/SaveTransientRequest/Container.js +++ b/packages/bruno-app/src/components/SaveTransientRequest/Container/index.js @@ -7,7 +7,8 @@ import { closeTabs } from 'providers/ReduxStore/slices/collections/actions'; import toast from 'react-hot-toast'; import Modal from 'components/Modal'; import Button from 'ui/Button'; -import SaveTransientRequest from './index'; +import SaveTransientRequest from 'components/SaveTransientRequest'; +import StyledWrapper from './StyledWrapper'; const SaveTransientRequestContainer = () => { const dispatch = useDispatch(); @@ -86,13 +87,13 @@ const SaveTransientRequestContainer = () => { {modals.map((modal) => { const { item, collection } = modal; return ( -
- {item.name} - + {item.name} + {collection.name}
@@ -105,13 +106,13 @@ const SaveTransientRequestContainer = () => { > Save -
+ ); })} -
+
diff --git a/packages/bruno-app/src/components/SaveTransientRequest/index.js b/packages/bruno-app/src/components/SaveTransientRequest/index.js index 6e637b6f3..0a7dfa706 100644 --- a/packages/bruno-app/src/components/SaveTransientRequest/index.js +++ b/packages/bruno-app/src/components/SaveTransientRequest/index.js @@ -358,6 +358,8 @@ const SaveTransientRequest = ({ item: itemProp, collection: collectionProp, isOp return null; } + const showNewFolderFooterButton = !showNewFolderInput && !isSelectingCollection && (filteredFolders.length > 0 && !searchText.trim()); + return ( - Save + Create
@@ -736,7 +738,20 @@ const SaveTransientRequest = ({ item: itemProp, collection: collectionProp, isOp ) : (
- {searchText.trim() ? 'No folders found' : 'No folders available'} +
+ + {searchText.trim() ? 'No folders found' : 'No folders available' } + + +
)}
@@ -747,7 +762,7 @@ const SaveTransientRequest = ({ item: itemProp, collection: collectionProp, isOp
- {!showNewFolderInput && !isSelectingCollection && ( + {showNewFolderFooterButton && (