-
Notifications
You must be signed in to change notification settings - Fork 235
feat(sidebar): use new favorite connection modal in sidebar COMPASS-5277 #2713
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Anemy
merged 7 commits into
main
from
COMPASS-5277-use-new-favorite-connection-modal-in-sidebar
Jan 27, 2022
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c78f03a
Show new save connection edit modal from connect-form in sidebar
Anemy 066c10e
enable saving with new favorite modal from sidebar
Anemy ca7c7d4
update tests, remove old connection model code
Anemy 5edcb54
use same action handling pattern as before
Anemy 8a7f175
merge main
Anemy 209b8f3
Use favorite icon from compass-components
Anemy 0a57584
remove border so focus ring works nice
Anemy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
packages/compass-sidebar/src/components/favorite-button/favorite-button.jsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { | ||
| FavoriteIcon, | ||
| mergeProps, | ||
| useFocusRing | ||
| } from '@mongodb-js/compass-components'; | ||
|
|
||
| import styles from './favorite-button.module.less'; | ||
|
|
||
| const FavoriteButton = ({ | ||
| favoriteOptions, | ||
| toggleIsFavoriteModalVisible | ||
| }) => { | ||
| const isFavorite = !!favoriteOptions; | ||
| const hex = favoriteOptions?.color; | ||
| const style = { | ||
| backgroundColor: hex || '#243642', | ||
| color: isFavorite ? '#ffffff' : '#88989a' | ||
| }; | ||
|
|
||
| const focusRingProps = useFocusRing(); | ||
| const buttonProps = mergeProps({ | ||
| type: 'button', | ||
| 'aria-label': 'Edit saved connection', | ||
| title: 'Edit saved connection', | ||
| onClick: () => toggleIsFavoriteModalVisible(), | ||
| className: styles['favorite-button-text'], | ||
| style | ||
| }, focusRingProps); | ||
|
|
||
| return ( | ||
| <div className={styles['favorite-button']}> | ||
| <button | ||
| {...buttonProps} | ||
| > | ||
| <FavoriteIcon | ||
| darkMode | ||
| isFavorite={isFavorite} | ||
| favoriteColor="#ffffff" | ||
| showCircle={false} | ||
| size={18} | ||
| /> | ||
| FAVORITE | ||
| </button> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| FavoriteButton.displayName = 'FavoriteButton'; | ||
| FavoriteButton.propTypes = { | ||
| // Can be undefined. See ConnectionFavoriteOptions of ConnectionInfo. | ||
| favoriteOptions: PropTypes.object, | ||
| toggleIsFavoriteModalVisible: PropTypes.func.isRequired | ||
| }; | ||
|
|
||
| export default FavoriteButton; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
packages/compass-sidebar/src/components/favorite-button/favorite-button.spec.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import React from 'react'; | ||
| import { mount } from 'enzyme'; | ||
| import FavoriteButton from './favorite-button'; | ||
|
|
||
| import styles from './favorite-button.module.less'; | ||
|
|
||
| describe('FavoriteButton [Component]', () => { | ||
| context('when it is a new connection', () => { | ||
| let component; | ||
|
|
||
| beforeEach(() => { | ||
| component = mount( | ||
| <FavoriteButton | ||
| toggleIsFavoriteModalVisible={()=>{}} | ||
| favoriteOptions={undefined} | ||
| /> | ||
| ); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| component = null; | ||
| }); | ||
|
|
||
| it('displays the the default button without star filled in', () => { | ||
| expect(component.find(`.${styles['favorite-button']}`)).to.be.present(); | ||
| expect(component.find(`.${styles['favorite-button-text']}`)).to.be.present(); | ||
| let starStyle = component.find('#favoriteIconStar').get(0).props; | ||
| expect(starStyle).to.have.property('fill', 'none'); | ||
| }); | ||
| }); | ||
|
|
||
| context('when it is a saved with no color', () => { | ||
| let component; | ||
|
|
||
| beforeEach(() => { | ||
| component = mount( | ||
| <FavoriteButton | ||
| toggleIsFavoriteModalVisible={()=>{}} | ||
| favoriteOptions={{ | ||
| name: '123', | ||
| color: undefined | ||
| }} | ||
| /> | ||
| ); | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| component = null; | ||
| }); | ||
|
|
||
| it('displays the the filled in star', () => { | ||
| expect(component.find(`.${styles['favorite-button']}`)).to.be.present(); | ||
| expect(component.find(`.${styles['favorite-button-text']}`)).to.be.present(); | ||
|
|
||
| let starStyle = component.find('#favoriteIconStar').get(0).props; | ||
| expect(starStyle).to.have.property('fill', '#ffffff'); | ||
| }); | ||
| }); | ||
| }); |
2 changes: 2 additions & 0 deletions
2
packages/compass-sidebar/src/components/favorite-button/index.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| import FavoriteButton from './favorite-button'; | ||
| export default FavoriteButton; |
2 changes: 0 additions & 2 deletions
2
packages/compass-sidebar/src/components/is-favorite-pill/index.js
This file was deleted.
Oops, something went wrong.
55 changes: 0 additions & 55 deletions
55
packages/compass-sidebar/src/components/is-favorite-pill/is-favorite-pill.jsx
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.