Skip to content

fix(sso): keep an exit affordance in edit mode when clean#5247

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

Merged
waleedlatif1 merged 1 commit into from
Jun 27, 2026
Merged

fix(sso): keep an exit affordance in edit mode when clean #5247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions apps/sim/ee/sso/components/sso-settings.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { getErrorMessage } from '@sim/utils/errors'
import { Check, ChevronDown, Clipboard, Eye, EyeOff } from 'lucide-react'
import {
Button,
Chip,
ChipCombobox,
ChipInput,
ChipSelect,
Expand DownExpand Up@@ -535,15 +536,22 @@ export function SSO() {

<SettingsPanel
actions={
<SaveDiscardActions
dirty={hasChanges}
saving={configureSSOMutation.isPending}
saveDisabled={hasAnyErrors(errors) || !isFormValid()}
saveLabel={isEditing ? 'Update' : 'Save'}
savingLabel={isEditing ? 'Updating...' : 'Saving...'}
onSave={() => void handleSubmit()}
onDiscard={handleDiscard}
/>
<>
{isEditing && !hasChanges && (
<Chip onClick={handleDiscard} disabled={configureSSOMutation.isPending}>
Cancel
</Chip>
)}
<SaveDiscardActions
dirty={hasChanges}
saving={configureSSOMutation.isPending}
saveDisabled={hasAnyErrors(errors) || !isFormValid()}
saveLabel={isEditing ? 'Update' : 'Save'}
savingLabel={isEditing ? 'Updating...' : 'Saving...'}
onSave={() => void handleSubmit()}
onDiscard={handleDiscard}
/>
</>
}
>
<div className='flex flex-col gap-4.5'>
Expand Down
Loading