Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 45 additions & 1 deletion static/app/views/automations/components/automationFormData.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import {uuid4} from '@sentry/core';

import type {FieldValue} from 'sentry/components/forms/model';
import {t} from 'sentry/locale';
import {ActionType, type Action} from 'sentry/types/workflowEngine/actions';
import type {Automation, NewAutomation} from 'sentry/types/workflowEngine/automations';
import type {DataCondition} from 'sentry/types/workflowEngine/dataConditions';
import type {
DataCondition,
DataConditionGroup,
Subfilter,
} from 'sentry/types/workflowEngine/dataConditions';
import {actionNodesMap} from 'sentry/views/automations/components/actionNodes';
import type {AutomationBuilderState} from 'sentry/views/automations/components/automationBuilderContext';
import {dataConditionNodesMap} from 'sentry/views/automations/components/dataConditionNodes';
Expand Down Expand Up @@ -148,3 +154,41 @@ export function validateActions({actions}: {actions: Action[]}): Record<string,
}
return errors;
}

/**
* Subfilter IDs are stripped on form submission, so they need to be re-assigned
* when loading the edit form for the remove/update logic to work correctly.
*/
export function assignSubfilterIds(
actionFilters: DataConditionGroup[]
): DataConditionGroup[] {
return actionFilters.map(assignConditionGroupSubfilterIds);
}

function assignConditionGroupSubfilterIds(group: DataConditionGroup): DataConditionGroup {
return {
...group,
conditions: group.conditions.map(assignConditionSubfilterIds),
};
}

function assignConditionSubfilterIds(condition: DataCondition): DataCondition {
const filters = condition.comparison?.filters;
if (!filters) {
return condition;
}
return {
...condition,
comparison: {
...condition.comparison,
filters: filters.map(assignSubfilterId),
},
};
}

function assignSubfilterId(filter: Subfilter): Subfilter {
return {
...filter,
id: filter.id ?? uuid4(),
};
}
3 changes: 2 additions & 1 deletion static/app/views/automations/edit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {AutomationFeedbackButton} from 'sentry/views/automations/components/auto
import AutomationForm from 'sentry/views/automations/components/automationForm';
import type {AutomationFormData} from 'sentry/views/automations/components/automationFormData';
import {
assignSubfilterIds,
getAutomationFormData,
getNewAutomationData,
validateAutomationBuilderState,
Expand Down Expand Up @@ -117,7 +118,7 @@ function AutomationEditForm({automation}: {automation: Automation}) {
logicType: DataConditionGroupLogicType.ANY_SHORT_CIRCUIT,
conditions: [],
},
actionFilters: automation.actionFilters,
actionFilters: assignSubfilterIds(automation.actionFilters),
};
}, [automation]);

Expand Down
Loading