feat(connection-form): up to three buttons: save, connect, save & connect COMPASS-8360 #6341
Conversation
lerouxb
changed the title
| } | ||
| } | ||
| onSaveAndConnectClicked={ | ||
| disableEditingConnectedConnection |
There was a problem hiding this comment.
I changed all these to not include the button callback prop if it shouldn't show up. That makes the logic easier and less error prone because you don't have to check both the boolean AND the button to know which buttons to include inside the form and to know which one to call.
disableEditingConnectedConnection is then only used when a button isn't directly involved like when showing the banner.
|
|
||
| onCancel?: () => void; | ||
|
|
||
| // If onSaveClicked is specified, a Save button will show up. It will be the |
There was a problem hiding this comment.
The comments are probably redundant now that the logic has been simplified and all buttons do what they say. But maybe they can guard against that regressing.
| const onSubmitForm = useCallback( | ||
| (intendedAction?: 'connect' | 'save-and-connect') => { | ||
| const updatedConnectionOptions = cloneDeep(connectionOptions); | ||
| // TODO: this method throws on malformed connection strings instead of |
There was a problem hiding this comment.
Again: This is an old comment.
| showCSFLE: true, | ||
| showProxySettings: true, | ||
| saveAndConnectLabel: 'Connect', | ||
| saveAndConnectLabel: 'Save & Connect', |
There was a problem hiding this comment.
This is basically the magic that means this PR shouldn't break vscode. The callback was already onSaveAndConnectClicked and my understanding is that vscode already works this way where clicking the primary button in the edit form when editing a non-connected connection will just update everything and connect.
There was a problem hiding this comment.
just fyi, VSCode provides it's own settings, it isn't using this hook. in case that's what you meant by this comment, not sure if I got it right. https://github.com/mongodb-js/vscode/blob/bfa57d4ce7b057fadb9fcec95327826f5d0dbb6b/src/views/webview-app/connection-form.tsx#L103
There was a problem hiding this comment.
That's what I meant - it uses the setting too. The setting is arguably redundant now, though: both apps set it to the same.
packages/compass-sidebar/src/components/multiple-connections/sidebar.tsx
Outdated
Show resolved
Hide resolved
lerouxb
force-pushed
the
save-and-connect
branch
from
4e1fd28 to
c374ecf
Compare
3 participants
This follows on from #6336
new connection
editing a disconnected connection
editing a connected connection
All the buttons do what they say.
The Save&Connect button's label already comes from a setting, so vscode should be unaffected.
Which buttons show up is now entirely determined by which of the three optional callbacks are specified. The onSubmit handler follows the same logic. Save & Connect is the default and Connect is there for the use case where people don't want their credentials to be saved with the connection.