Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

feat(flags): delete config version 2 flags from the flag pages (#109445)

Andersbfb233d5777d
diff --git a/frontend/snapshots.yml b/frontend/snapshots.yml
index 5d490fb84cda..04f4863b2107 100644
--- a/frontend/snapshots.yml
+++ b/frontend/snapshots.yml
@@ -10770,6 +10770,10 @@ snapshots:
hash: v1.k794b7964.3795bb1f396527c180bfcef4de823b5064fc13a2ed44cd4ef60abe7cb88002bb.bDHlqsOUbRivTPIRkkukSBdGNT9qfo4LPtuL5GSKvyI
scenes-app-feature-flags--deleted-feature-flag--light:
hash: v1.k794b7964.0e7e762946624e513cd91315999f4eec08f741351e5305537f752ca23f73d043.iZUHrQEikVJFEDf5HnL6ffOYuQZJr5lCturFKuLetiI
+ scenes-app-feature-flags--deleted-rules-v-2-feature-flag--dark:
+ hash: v1.k794b7964.e04929cae93f23935399e4e54e7fb0658112b83c9cad626a5f1cf09368bffd85.U2yqL_Ggv_CSSzRo6F8M_i0yGtkWpJ-Cr29Th2SftIQ
+ scenes-app-feature-flags--deleted-rules-v-2-feature-flag--light:
+ hash: v1.k794b7964.bed8de01c0601540fc620e1f235885cddb48ebb25238ea2b449a942ab3631ae4.78Gc8NQcOx8K0JKzCHLBowQs5R9hLwUDf-Y4CgZegSI
scenes-app-feature-flags--edit-encrypted-remote-config-feature-flag--dark:
hash: v1.k794b7964.e1d5ac9782c87c254a9fe2d841d305abd0c643b082e72c4a1985b4da47ab9c01.va_xLeHZCGS8-LnghJ5Ovp6raP-y9RrviqDYhOX33fo
scenes-app-feature-flags--edit-encrypted-remote-config-feature-flag--light:
diff --git a/frontend/src/lib/utils/deleteWithUndo.test.tsx b/frontend/src/lib/utils/deleteWithUndo.test.tsx
new file mode 100644
index 000000000000..17398e1ef0f6
--- /dev/null
+++ b/frontend/src/lib/utils/deleteWithUndo.test.tsx
@@ -0,0 +1,67 @@
+import { lemonToast } from '@posthog/lemon-ui'
+
+import api from 'lib/api'
+
+import { deleteWithUndo } from './deleteWithUndo'
+
+describe('deleteWithUndo', () => {
+ let updateSpy: jest.SpyInstance
+
+ beforeEach(() => {
+ updateSpy = jest.spyOn(api, 'update').mockResolvedValue({})
+ })
+
+ afterEach(() => {
+ jest.restoreAllMocks()
+ })
+
+ it('sends the whole object with deleted by default', async () => {
+ await deleteWithUndo({ endpoint: 'projects/1/dashboards', object: { id: 7, name: 'Weekly metrics' } })
+
+ expect(updateSpy).toHaveBeenCalledWith('api/projects/1/dashboards/7', {
+ id: 7,
+ name: 'Weekly metrics',
+ deleted: true,
+ })
+ })
+
+ it('sends the payload in place of the object, and the undo does the same', async () => {
+ const infoSpy = jest.spyOn(lemonToast, 'info')
+
+ await deleteWithUndo({
+ endpoint: 'projects/1/feature_flags',
+ object: { id: 7, name: 'checkout-redesign' },
+ payload: { version: 3 },
+ })
+ expect(updateSpy).toHaveBeenLastCalledWith('api/projects/1/feature_flags/7', { version: 3, deleted: true })
+
+ const undoButton = infoSpy.mock.calls[0][1]?.button
+ expect(undoButton?.label).toBe('Undo')
+ await undoButton?.action()
+ expect(updateSpy).toHaveBeenLastCalledWith('api/projects/1/feature_flags/7', { version: 3, deleted: false })
+ })
+
+ it('offers no undo when the item is not undoable', async () => {
+ const infoSpy = jest.spyOn(lemonToast, 'info')
+
+ await deleteWithUndo({ endpoint: 'projects/1/feature_flags', object: { id: 7 }, undoable: false })
+
+ expect(infoSpy.mock.calls[0][1]?.button).toBeUndefined()
+ })
+
+ it.each([
+ [true, 0],
+ [false, 1],
+ ])('toasts unless handleError handles the error, then runs onError (handled: %s)', async (handled, toasts) => {
+ const errorSpy = jest.spyOn(lemonToast, 'error')
+ updateSpy.mockRejectedValue({ status: 409, detail: 'Changed elsewhere' })
+ const handleError = jest.fn(() => handled)
+ const onError = jest.fn()
+
+ await deleteWithUndo({ endpoint: 'projects/1/feature_flags', object: { id: 7 }, handleError, onError })
+
+ expect(handleError).toHaveBeenCalledWith({ status: 409, detail: 'Changed elsewhere' })
+ expect(errorSpy).toHaveBeenCalledTimes(toasts)
+ expect(onError).toHaveBeenCalledWith(false, { id: 7 })
+ })
+})
diff --git a/frontend/src/lib/utils/deleteWithUndo.tsx b/frontend/src/lib/utils/deleteWithUndo.tsx
index e6f6ee9d6ea3..44e34ac46da0 100644
--- a/frontend/src/lib/utils/deleteWithUndo.tsx
+++ b/frontend/src/lib/utils/deleteWithUndo.tsx
@@ -16,6 +16,11 @@ export async function deleteWithUndo<T extends Record<string, any>>({
idField?: keyof T
/** The name the toast shows. It defaults to `object.name`, which the request body also sends. */
label?: string
+ /** The request body besides `deleted`. Defaults to the whole `object`. */
+ payload?: Record<string, any>
+ undoable?: boolean
+ /** Runs before the error toast. Return true when it handled the error, which skips the toast. */
+ handleError?: (error: any) => boolean
callback?: (undo: boolean, object: T) => void
/** Runs when the request fails, so a caller that removed the object from its state before the
* request can put it back. */
@@ -24,7 +29,7 @@ export async function deleteWithUndo<T extends Record<string, any>>({
try {
// nosemgrep: prefer-codegen-api -- Legacy raw API call with a hand-written URL and an unchecked response type. No generated function covers this endpoint yet. Find out why the generated client skips it (no schema, no product tag, or excluded from the spec) and fix that first.
await api.update(`api/${props.endpoint}/${props.object[props.idField || 'id']}`, {
- ...props.object,
+ ...(props.payload ?? props.object),
deleted: !undo,
})
props.callback?.(undo, props.object)
@@ -35,18 +40,21 @@ export async function deleteWithUndo<T extends Record<string, any>>({
</>,
{
toastId: `delete-item-${props.object.id}-${undo}`,
- button: undo
- ? undefined
- : {
- label: 'Undo',
- action: () => deleteWithUndo({ undo: true, ...props }),
- },
+ button:
+ undo || props.undoable === false
+ ? undefined
+ : {
+ label: 'Undo',
+ action: () => deleteWithUndo({ undo: true, ...props }),
+ },
}
)
} catch (error: any) {
- // Show error toast with the error message from the API
- const errorMessage = error.detail || error.message || 'Failed to delete'
- lemonToast.error(errorMessage)
+ if (!props.handleError?.(error)) {
+ // Show error toast with the error message from the API
+ const errorMessage = error.detail || error.message || 'Failed to delete'
+ lemonToast.error(errorMessage)
+ }
props.onError?.(undo, props.object)
}
}
diff --git a/frontend/src/scenes/feature-flags/FeatureFlag.tsx b/frontend/src/scenes/feature-flags/FeatureFlag.tsx
index 135715b6c203..30de9387097e 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlag.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlag.tsx
@@ -80,7 +80,9 @@ import {
import {
ARCHIVE_UNAVAILABLE_DISABLED_REASON,
+ RESTORE_UNAVAILABLE_DISABLED_REASON,
canArchiveFeatureFlag,
+ canRestoreFeatureFlag,
featureFlagConfigFormatLabel,
isRulesV2EditableConfig,
} from 'products/feature_flags/frontend/featureFlagConfigFormat'
@@ -151,6 +153,8 @@ export function FeatureFlag({ id }: FeatureFlagLogicProps): JSX.Element {
editorKind,
} = useValues(featureFlagLogic)
const isV1Config = configFormat === 'v1'
+ const canRestore = canRestoreFeatureFlag(featureFlag.filters)
+ const restoreUnavailable = !!featureFlag.deleted && !canRestore
const { featureFlags } = useValues(enabledFeaturesLogic)
const {
deleteFeatureFlag,
@@ -471,7 +475,7 @@ export function FeatureFlag({ id }: FeatureFlagLogicProps): JSX.Element {
)}
</AccessControlAction>
)}
- {isV1Config && (
+ {configFormat !== 'unsupported' && (
<AccessControlAction
resourceType={AccessControlResourceType.FeatureFlag}
minAccessLevel={AccessControlLevel.Editor}
@@ -496,6 +500,7 @@ export function FeatureFlag({ id }: FeatureFlagLogicProps): JSX.Element {
...(disabledReason ? { [disabledReason]: true } : {}),
"You have only 'View' access for this feature flag. To make changes, please contact the flag's creator.":
!featureFlag.can_edit,
+ [RESTORE_UNAVAILABLE_DISABLED_REASON]: restoreUnavailable,
'Restoring…': featureFlagRestoreLoading,
}}
>
@@ -516,7 +521,7 @@ export function FeatureFlag({ id }: FeatureFlagLogicProps): JSX.Element {
<LemonBanner
type="error"
action={
- featureFlag.can_edit && isV1Config
+ featureFlag.can_edit && canRestore
? {
children: 'Restore',
onClick: () => restoreFeatureFlag(featureFlag),
@@ -527,8 +532,8 @@ export function FeatureFlag({ id }: FeatureFlagLogicProps): JSX.Element {
}
>
This feature flag is deleted. It's hidden from the flag list and can't be evaluated.{' '}
- {!isV1Config
- ? 'Restoring is not available for this flag yet.'
+ {!canRestore
+ ? RESTORE_UNAVAILABLE_DISABLED_REASON
: featureFlag.can_edit
? 'Restore it to use it again.'
: 'Ask someone with edit access to restore it.'}
@@ -598,7 +603,7 @@ export function FeatureFlag({ id }: FeatureFlagLogicProps): JSX.Element {
</SceneMenuBarSubMenu>
<SceneMenuBarSeparator />
<SceneMenuBarFileItems dataAttrKey={RESOURCE_TYPE} />
- {isV1Config && (
+ {configFormat !== 'unsupported' && (
<>
<SceneMenuBarSeparator />
<AccessControlAction
@@ -608,7 +613,16 @@ export function FeatureFlag({ id }: FeatureFlagLogicProps): JSX.Element {
{({ disabledReason }) => (
<SceneMenuBarItem
variant="destructive"
- disabled={!!disabledReason || featureFlagRestoreLoading}
+ disabled={
+ !!disabledReason ||
+ featureFlagRestoreLoading ||
+ restoreUnavailable
+ }
+ tooltip={
+ restoreUnavailable
+ ? RESTORE_UNAVAILABLE_DISABLED_REASON
+ : undefined
+ }
data-attr={
featureFlag.deleted
? `${RESOURCE_TYPE}-menubar-restore`
diff --git a/frontend/src/scenes/feature-flags/FeatureFlags.stories.tsx b/frontend/src/scenes/feature-flags/FeatureFlags.stories.tsx
index 8bec53968b2d..d26e4cd4829c 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlags.stories.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlags.stories.tsx
@@ -261,6 +261,28 @@ export const DeletedFeatureFlag: Story = {
},
}
+// The banner has no Restore button, because the server refuses to restore a flag in another config version.
+export const DeletedRulesV2FeatureFlag: Story = {
+ parameters: {
+ pageUrl: urls.featureFlag(RULES_V2_FLAG_ID),
+ },
+ decorators: [
+ mswDecorator({
+ get: {
+ [`/api/projects/:team_id/feature_flags/${RULES_V2_FLAG_ID}/`]: () => [
+ 200,
+ {
+ ...featureFlags.results.find((r) => r.id === RULES_V2_FLAG_ID),
+ deleted: true,
+ active: false,
+ can_edit: true,
+ },
+ ],
+ },
+ }),
+ ],
+}
+
export const FeatureFlagNotFound: Story = {
parameters: {
pageUrl: urls.featureFlag(1111111111111),
diff --git a/frontend/src/scenes/feature-flags/FeatureFlags.tsx b/frontend/src/scenes/feature-flags/FeatureFlags.tsx
index 7d4094a02c19..2f2ef065bd22 100644
--- a/frontend/src/scenes/feature-flags/FeatureFlags.tsx
+++ b/frontend/src/scenes/feature-flags/FeatureFlags.tsx
@@ -63,6 +63,7 @@ import {
canArchiveFeatureFlag,
featureFlagConfigFormat,
featureFlagConfigFormatLabel,
+ featureFlagDeleteOptions,
isRulesV2FeatureFlagConfig,
isV1FeatureFlagConfig,
rulesV2CreateDisabledReason,
@@ -323,7 +324,7 @@ function FeatureFlagRowActions({ featureFlag }: { featureFlag: FeatureFlagType }
</AccessControlAction>
)}
- {featureFlag.id && isV1Config && (
+ {featureFlag.id && configFormat !== 'unsupported' && (
<AccessControlAction
resourceType={AccessControlResourceType.FeatureFlag}
minAccessLevel={AccessControlLevel.Editor}
@@ -337,6 +338,7 @@ function FeatureFlagRowActions({ featureFlag }: { featureFlag: FeatureFlagType }
endpoint: `projects/${currentProjectId}/feature_flags`,
object: { id: featureFlag.id },
label: featureFlag.key,
+ ...featureFlagDeleteOptions(featureFlag, loadFeatureFlags),
callback: () => loadFeatureFlags(),
}).catch((e) => {
lemonToast.error(`Failed to delete feature flag: ${e.detail}`)
diff --git a/frontend/src/scenes/feature-flags/featureFlagDeleteDialog.test.ts b/frontend/src/scenes/feature-flags/featureFlagDeleteDialog.test.ts
index 982d74bf21fa..31f377c7940a 100644
--- a/frontend/src/scenes/feature-flags/featureFlagDeleteDialog.test.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagDeleteDialog.test.ts
@@ -1,6 +1,8 @@
-import { FeatureFlagType } from '~/types'
+import { LemonDialog } from '@posthog/lemon-ui'
-import { getFeatureFlagDeleteBlockers } from './featureFlagDeleteDialog'
+import { FeatureFlagConfig, FeatureFlagType } from '~/types'
+
+import { getFeatureFlagDeleteBlockers, openFeatureFlagDeleteDialog } from './featureFlagDeleteDialog'
const base: Partial<FeatureFlagType> = {
key: 'my-flag',
@@ -73,3 +75,24 @@ describe('getFeatureFlagDeleteBlockers', () => {
])
})
})
+
+describe('openFeatureFlagDeleteDialog', () => {
+ afterEach(() => {
+ jest.restoreAllMocks()
+ })
+
+ it.each([
+ ['a v1 flag', { groups: [] }, 'Are you sure you want to delete "my-flag"?'],
+ [
+ 'a rules v2 flag',
+ { version: 2 },
+ 'Are you sure you want to delete "my-flag"? Deleting turns the flag off, and it can\'t be restored yet.',
+ ],
+ ])('warns that the delete is final for a flag that cannot be restored: %s', (_, filters, description) => {
+ const open = jest.spyOn(LemonDialog, 'open').mockImplementation(() => undefined)
+
+ openFeatureFlagDeleteDialog({ ...base, filters: filters as FeatureFlagConfig }, jest.fn())
+
+ expect(open).toHaveBeenCalledWith(expect.objectContaining({ description }))
+ })
+})
diff --git a/frontend/src/scenes/feature-flags/featureFlagDeleteDialog.tsx b/frontend/src/scenes/feature-flags/featureFlagDeleteDialog.tsx
index 05a8a15de2a2..d8d8f58d3426 100644
--- a/frontend/src/scenes/feature-flags/featureFlagDeleteDialog.tsx
+++ b/frontend/src/scenes/feature-flags/featureFlagDeleteDialog.tsx
@@ -5,6 +5,8 @@ import { urls } from 'scenes/urls'
import { FeatureFlagType } from '~/types'
+import { canRestoreFeatureFlag } from 'products/feature_flags/frontend/featureFlagConfigFormat'
+
import { DependentFlag } from './featureFlagLogic'
interface FeatureFlagDeleteBlocker {
@@ -95,7 +97,9 @@ export function openFeatureFlagDeleteDialog(
LemonDialog.open({
title: 'Delete feature flag?',
- description: `Are you sure you want to delete "${featureFlag.key}"?`,
+ description: canRestoreFeatureFlag(featureFlag.filters)
+ ? `Are you sure you want to delete "${featureFlag.key}"?`
+ : `Are you sure you want to delete "${featureFlag.key}"? Deleting turns the flag off, and it can't be restored yet.`,
primaryButton: {
children: 'Delete',
status: 'danger',
diff --git a/frontend/src/scenes/feature-flags/featureFlagLogic.test.ts b/frontend/src/scenes/feature-flags/featureFlagLogic.test.ts
index cfbd05ab68a5..16260a348188 100644
--- a/frontend/src/scenes/feature-flags/featureFlagLogic.test.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagLogic.test.ts
@@ -3527,12 +3527,13 @@ describe('featureFlagLogic', () => {
.toFinishAllListeners()
// A `name` in the body overwrites the flag's description.
- expect(updateSpy.mock.calls[0][1]).toEqual({ id: MOCK_FEATURE_FLAG.id, deleted: true })
+ expect(updateSpy.mock.calls[0][1]).toEqual({ deleted: true })
const [message, options] = toastSpy.mock.calls[0]
expect(render(message as JSX.Element).container.textContent).toBe(
`${MOCK_FEATURE_FLAG.key} has been deleted`
)
+ expect(options?.button?.label).toBe('Undo')
await expectLogic(logic, async () => {
await options?.button?.action()
}).toNotHaveDispatchedActions(['deleteFlag'])
@@ -4771,6 +4772,68 @@ describe('a flag in config version 2', () => {
expect(logic.values.rowVersionToken).toEqual({ version: 5 })
})
+ it.each([
+ ['deleting', () => logic.actions.deleteFeatureFlag(V2_FLAG), { deleted: true, version: 3 }],
+ [
+ 'restoring',
+ () => logic.actions.restoreFeatureFlag({ ...V2_FLAG, deleted: true }),
+ { deleted: false, version: 3 },
+ ],
+ ])('sends only deleted and the row version when %s', async (_, act, body) => {
+ const update = jest.spyOn(api, 'update').mockResolvedValue({ ...V2_FLAG, ...body, version: 4 })
+
+ await expectLogic(logic, act).toFinishAllListeners()
+
+ expect(update).toHaveBeenCalledWith(`api/projects/${MOCK_DEFAULT_PROJECT.id}/feature_flags/7`, body)
+ })
+
+ it('deletes with the row version an inline save returned after the delete dialog opened', async () => {
+ const update = jest
+ .spyOn(api, 'update')
+ .mockImplementation(async (_url, payload) => ({ ...V2_FLAG, ...(payload as object), version: 4 }))
+ // The dialog's confirm passes the flag it was opened with, at version 3.
+ const flagWhenDialogOpened = logic.values.featureFlag
+
+ logic.actions.saveTagsInline(['checkout'])
+ await expectLogic(logic).toFinishAllListeners()
+ await expectLogic(logic, () => logic.actions.deleteFeatureFlag(flagWhenDialogOpened)).toFinishAllListeners()
+
+ expect(update).toHaveBeenLastCalledWith(`api/projects/${MOCK_DEFAULT_PROJECT.id}/feature_flags/7`, {
+ deleted: true,
+ version: 4,
+ })
+ })
+
+ it('offers no undo after a delete, because the server refuses to restore this flag', async () => {
+ jest.spyOn(api, 'update').mockResolvedValue({ ...V2_FLAG, deleted: true, version: 4 })
+ // deleteWithUndo toasts through @posthog/lemon-ui, which the LemonToast module mock does not replace.
+ const info = jest.spyOn(sharedLemonToast, 'info')
+
+ await expectLogic(logic, () => logic.actions.deleteFeatureFlag(V2_FLAG)).toFinishAllListeners()
+
+ expect(info).toHaveBeenCalledTimes(1)
+ expect(info.mock.calls[0][1]?.button).toBeUndefined()
+ })
+
+ it('reloads the flag when a delete hits a stale row version', async () => {
+ useMocks({
+ get: {
+ [`/api/projects/${MOCK_DEFAULT_PROJECT.id}/feature_flags/7/`]: () => [200, { ...V2_FLAG, version: 5 }],
+ },
+ })
+ jest.spyOn(api, 'update').mockRejectedValue({ status: 409, detail: 'This feature flag has changed.' })
+ const genericError = jest.spyOn(sharedLemonToast, 'error')
+
+ logic.actions.deleteFeatureFlag(V2_FLAG)
+ await expectLogic(logic)
+ .toDispatchActions(['refreshFeatureFlag', 'refreshFeatureFlagSuccess'])
+ .toFinishAllListeners()
+
+ expect(logic.values.rowVersionToken).toEqual({ version: 5 })
+ expect(lemonToast.error).toHaveBeenCalledWith('This feature flag has changed.')
+ expect(genericError).not.toHaveBeenCalled()
+ })
+
it.each([
['tags', () => logic.actions.saveTagsInline(['checkout'])],
['description', () => logic.actions.saveDescriptionInline('Checkout redesign')],
diff --git a/frontend/src/scenes/feature-flags/featureFlagLogic.ts b/frontend/src/scenes/feature-flags/featureFlagLogic.ts
index 53669149ebf9..9812688bf78b 100644
--- a/frontend/src/scenes/feature-flags/featureFlagLogic.ts
+++ b/frontend/src/scenes/feature-flags/featureFlagLogic.ts
@@ -92,11 +92,11 @@ import {
import { NEW_EARLY_ACCESS_FEATURE } from 'products/early_access_features/frontend/earlyAccessFeatureLogic'
import {
FeatureFlagConfigFormat,
- STALE_ROW_VERSION_RELOADED_MESSAGE,
featureFlagConfigFormat,
+ featureFlagDeleteOptions,
isRulesV2EditableConfig,
- isStaleRowVersionError,
isV1FeatureFlagConfig,
+ reloadIfStaleRowVersion,
rowVersionToken,
} from 'products/feature_flags/frontend/featureFlagConfigFormat'
import { TEMPLATE_NAMES } from 'products/feature_flags/frontend/featureFlagTemplateConstants'
@@ -875,16 +875,6 @@ export const getRecordingFilterForFlagVariant = (
}
}
-// The conflicting write may have replaced the whole document, so a stale row version reloads the flag.
-function reloadIfStaleRowVersion(token: { version?: number }, error: any, reload: () => void): boolean {
- if (!isStaleRowVersionError(token, error)) {
- return false
- }
- lemonToast.error(error?.detail || STALE_ROW_VERSION_RELOADED_MESSAGE)
- reload()
- return true
-}
-
// A v2 write must carry the row version the previous write returned, so inline saves go out one at a time.
function queueInlineSave<T>(cache: Record<string, any>, send: () => Promise<T>): Promise<T> {
const request = (cache.inlineSaveQueue ?? Promise.resolve()).catch(() => null).then(send)
@@ -3507,7 +3497,7 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
// nosemgrep: prefer-codegen-api -- The generated partial update request type has no `deleted` field.
const restoredFlag = await api.update(
`api/projects/${values.currentProjectId}/feature_flags/${featureFlag.id}`,
- { deleted: false }
+ { deleted: false, ...rowVersionToken(featureFlag) }
)
// Restore gives the flag a new tree entry. A delete from another tab or the API leaves the old entry in this tab's tree.
deleteFromTree('feature_flag', String(featureFlag.id))
@@ -4466,6 +4456,8 @@ export const featureFlagLogic = kea<featureFlagLogicType>([
endpoint: `projects/${values.currentProjectId}/feature_flags`,
object: { id: featureFlag.id },
label: featureFlag.key,
+ // Read the row version now: an inline save may have moved it on since the dialog opened.
+ ...featureFlagDeleteOptions(values.featureFlag, actions.refreshFeatureFlag),
callback: (undo) => {
if (undo) {
refreshTreeItem('feature_flag', String(featureFlag.id))
diff --git a/products/feature_flags/frontend/featureFlagConfigFormat.test.ts b/products/feature_flags/frontend/featureFlagConfigFormat.test.ts
index 5e518318f531..41f7b945f468 100644
--- a/products/feature_flags/frontend/featureFlagConfigFormat.test.ts
+++ b/products/feature_flags/frontend/featureFlagConfigFormat.test.ts
@@ -1,6 +1,14 @@
+import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
+
import { FeatureFlagConfig } from '~/types'
-import { featureFlagConfigFormat, featureFlagConfigFormatLabel, rowVersionToken } from './featureFlagConfigFormat'
+import {
+ canRestoreFeatureFlag,
+ featureFlagConfigFormat,
+ featureFlagConfigFormatLabel,
+ featureFlagDeleteOptions,
+ rowVersionToken,
+} from './featureFlagConfigFormat'
describe('featureFlagConfigFormat', () => {
it.each([
@@ -24,4 +32,48 @@ describe('featureFlagConfigFormat', () => {
])('sends the row version only for a row outside v1: %s', (_, flag, expected) => {
expect(rowVersionToken(flag)).toEqual(expected)
})
+
+ it.each([
+ [undefined, true],
+ [{ groups: [] }, true],
+ [{ version: 2 }, false],
+ [{ version: 3 }, false],
+ ])('allows restoring %j: %s', (filters, expected) => {
+ expect(canRestoreFeatureFlag(filters as FeatureFlagConfig | undefined)).toBe(expected)
+ })
+})
+
+describe('featureFlagDeleteOptions', () => {
+ const stale = { status: 409, detail: 'This feature flag has changed.' }
+
+ beforeEach(() => {
+ jest.spyOn(lemonToast, 'error').mockImplementation(() => 'toast-id')
+ })
+
+ afterEach(() => {
+ jest.restoreAllMocks()
+ })
+
+ it('sends no row version for a v1 flag, offers Undo and leaves a 409 to the error toast', () => {
+ const reload = jest.fn()
+ const options = featureFlagDeleteOptions({ filters: { groups: [] }, version: 4 }, reload)
+
+ expect(options.payload).toEqual({})
+ expect(options.undoable).toBe(true)
+ expect(options.handleError(stale)).toBe(false)
+ expect(reload).not.toHaveBeenCalled()
+ })
+
+ it('sends the row version for a v2 flag, offers no Undo and reloads on a stale row version', () => {
+ const reload = jest.fn()
+ const options = featureFlagDeleteOptions({ filters: { version: 2 } as FeatureFlagConfig, version: 4 }, reload)
+
+ expect(options.payload).toEqual({ version: 4 })
+ expect(options.undoable).toBe(false)
+ expect(options.handleError({ status: 400, detail: 'Bad request' })).toBe(false)
+ expect(reload).not.toHaveBeenCalled()
+ expect(options.handleError(stale)).toBe(true)
+ expect(reload).toHaveBeenCalledTimes(1)
+ expect(lemonToast.error).toHaveBeenCalledWith('This feature flag has changed.')
+ })
})
diff --git a/products/feature_flags/frontend/featureFlagConfigFormat.ts b/products/feature_flags/frontend/featureFlagConfigFormat.ts
index 6c5dd84b8c57..b17add38e358 100644
--- a/products/feature_flags/frontend/featureFlagConfigFormat.ts
+++ b/products/feature_flags/frontend/featureFlagConfigFormat.ts
@@ -1,5 +1,6 @@
import { isApprovalRequiredError } from 'lib/api-error'
import { FEATURE_FLAGS } from 'lib/constants'
+import { lemonToast } from 'lib/lemon-ui/LemonToast/LemonToast'
import type { FeatureFlagsSet } from 'lib/logic/featureFlagLogic'
import { FeatureFlagConfig, FeatureFlagFilters, FeatureFlagRulesV2Config, TeamPublicType, TeamType } from '~/types'
@@ -9,6 +10,7 @@ export type FeatureFlagConfigFormat = 'v1' | 'v2' | 'unsupported'
export const UNSUPPORTED_CONFIG_DISABLED_REASON =
'This flag is stored in a configuration version this page cannot change.'
export const ARCHIVE_UNAVAILABLE_DISABLED_REASON = 'Archiving is not available for this flag yet.'
+export const RESTORE_UNAVAILABLE_DISABLED_REASON = 'Restoring is not available for this flag yet.'
export const STALE_ROW_VERSION_RELOADED_MESSAGE = 'This flag changed elsewhere and has been reloaded.'
/** Mirrors the server's detector: no `version` or `1` is v1, `2` is v2, anything else is unsupported here. */
@@ -36,6 +38,11 @@ export function canArchiveFeatureFlag(filters: FeatureFlagConfig | null | undefi
return featureFlagConfigFormat(filters) === 'v1'
}
+/** The server refuses `deleted: false` on every config version but v1. */
+export function canRestoreFeatureFlag(filters: FeatureFlagConfig | null | undefined): boolean {
+ return featureFlagConfigFormat(filters) === 'v1'
+}
+
/**
* A write to a row in another config version must carry the row version. For a v1 row this returns
* `{}`, so the write sends no version and the server applies it without a version check.
@@ -52,6 +59,32 @@ export function isStaleRowVersionError(token: { version?: number }, error: any):
return token.version !== undefined && error?.status === 409 && !isApprovalRequiredError(error)
}
+// The conflicting write may have replaced the whole document, so a stale row version reloads the flag.
+export function reloadIfStaleRowVersion(token: { version?: number }, error: any, reload: () => void): boolean {
+ if (!isStaleRowVersionError(token, error)) {
+ return false
+ }
+ lemonToast.error(error?.detail || STALE_ROW_VERSION_RELOADED_MESSAGE)
+ reload()
+ return true
+}
+
+/**
+ * The `deleteWithUndo` options for a flag. A row in another config version refuses `id`, so the body is `deleted`
+ * and the row version only, and there is no Undo for a flag the server will not restore.
+ */
+export function featureFlagDeleteOptions(
+ flag: { filters?: FeatureFlagConfig | null; version?: number | null },
+ reload: () => void
+): { payload: { version?: number }; undoable: boolean; handleError: (error: any) => boolean } {
+ const versioned = rowVersionToken(flag)
+ return {
+ payload: versioned,
+ undoable: canRestoreFeatureFlag(flag.filters),
+ handleError: (error) => reloadIfStaleRowVersion(versioned, error, reload),
+ }
+}
+
export function featureFlagConfigFormatLabel(filters: FeatureFlagConfig | null | undefined): string {
const version = filters?.version
switch (featureFlagConfigFormat(filters)) {