Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: failed to establish a connection with the upstream server #263

Merged
merged 6 commits into from
Oct 22, 2024
+116 −35
Merged

fix: failed to establish a connection with the upstream server #263

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ccdd28
refactor: extract file upload input component
cristianoventura Oct 21, 2024
cf8d72f
feat: upload certificate path
cristianoventura Oct 21, 2024
ed017f4
feat: ssl_verify_upstream_trusted_ca param
cristianoventura Oct 21, 2024
5b91ccf
feat: allow p12 and cer extensions
cristianoventura Oct 21, 2024
e7876e3
fix: rename dialog
cristianoventura Oct 21, 2024
f6a94a9
fix: dont reset settings on close
cristianoventura Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/components/Settings/SettingsDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ export const SettingsDialog = ({ open, onOpenChange }: SettingsDialogProps) => {
}
}

const handleCancelClick = () => {
reset(settings)
}

return (
<Dialog.Root open={open} onOpenChange={onOpenChange}>
<Dialog.Content
Expand All @@ -72,9 +68,7 @@ export const SettingsDialog = ({ open, onOpenChange }: SettingsDialogProps) => {

<Flex gap="3" justify="end">
<Dialog.Close>
<Button variant="outline" onClick={handleCancelClick}>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I encountered a bug, after following the happy path by checking the settings again it was presented as regular while the file on disk did indeed still include the correct proxy config. (A restart fixed it but we might want to look into it)

@Llandy3d there was a leftover logic from when Settings was still a page and the form state needed to be reset. This should fix the issue.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It did 🥳

Cancel
</Button>
<Button variant="outline">Cancel</Button>
</Dialog.Close>
<Dialog.Close>
<ButtonWithTooltip
Expand Down