Skip to content

fix(segments): warn before discarding an unsaved feature-specific seg… #7840

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

Open
narendraio wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −4
Open

fix(segments): warn before discarding an unsaved feature-specific seg… #7840

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
21 changes: 17 additions & 4 deletions frontend/web/components/modals/CreateSegment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ const CreateSegment: FC<CreateSegmentType> = ({
const [valueChanged, setValueChanged] = useState(false)
const [metadataValueChanged, setMetadataValueChanged] = useState(false)
const onClosing = useCallback(() => {
return new Promise((resolve) => {
return new Promise<boolean>((resolve) => {
if (valueChanged) {
openConfirm({
body: 'Closing this will discard your unsaved changes.',
Expand All @@ -306,6 +306,19 @@ const CreateSegment: FC<CreateSegmentType> = ({
}
})
}, [valueChanged])
// The condensed/inline drawer (e.g. creating a feature-specific segment) is
// closed via the `onCancel` prop, which bypasses the modal's intercept-close
// handler above. Guard it so unsaved changes prompt the same confirmation (#5368).
const handleCancel = useCallback(() => {
if (!onCancel) {
return
}
onClosing().then((shouldClose) => {
if (shouldClose) {
onCancel()
}
})
}, [onCancel, onClosing])
const onCreateChangeRequest = async (changeRequestData: {
approvals: []
description: string
Expand Down Expand Up @@ -569,7 +582,7 @@ const CreateSegment: FC<CreateSegmentType> = ({
isSaving={isSaving}
isValid={isValid}
isLimitReached={isLimitReached}
onCancel={onCancel}
onCancel={handleCancel}
topLevelRuleType={topLevelRuleType}
setTopLevelRuleType={setTopLevelRuleType}
/>
Expand Down Expand Up @@ -646,7 +659,7 @@ const CreateSegment: FC<CreateSegmentType> = ({
isSaving={isSaving}
isValid={isValid}
isLimitReached={isLimitReached}
onCancel={onCancel}
onCancel={handleCancel}
topLevelRuleType={topLevelRuleType}
setTopLevelRuleType={setTopLevelRuleType}
/>
Expand Down Expand Up @@ -685,7 +698,7 @@ const CreateSegment: FC<CreateSegmentType> = ({
isSaving={isSaving}
isValid={isValid}
isLimitReached={isLimitReached}
onCancel={onCancel}
onCancel={handleCancel}
topLevelRuleType={topLevelRuleType}
setTopLevelRuleType={setTopLevelRuleType}
/>
Expand Down
Loading