-
-
Notifications
You must be signed in to change notification settings - Fork 4.5k
feat(aci): redirect rules to automations with UI FF #103322
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.
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
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
bdba094
feat(aci): redirect rules to automations with UI FF
ameliahsu 3c9a49b
fix acceptance tests
ameliahsu ce3db38
idk
ameliahsu cb6a734
please?
ameliahsu 17e4996
pass props to children
ameliahsu 7aa7254
Merge branch 'master' into mia/aci/redirect-rules-to-automations
ameliahsu e084f6a
remove redirect for /:projectId rule list view
ameliahsu 143ef0b
Merge branch 'master' into mia/aci/redirect-rules-to-automations
ameliahsu b7b6e7b
Merge branch 'master' into mia/aci/redirect-rules-to-automations
ameliahsu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| import {cloneElement, isValidElement} from 'react'; | ||
|
|
||
| import LoadingIndicator from 'sentry/components/loadingIndicator'; | ||
| import Redirect from 'sentry/components/redirect'; | ||
| import {useApiQuery} from 'sentry/utils/queryClient'; | ||
| import useOrganization from 'sentry/utils/useOrganization'; | ||
| import {useParams} from 'sentry/utils/useParams'; | ||
| import {useUser} from 'sentry/utils/useUser'; | ||
| import { | ||
| makeAutomationDetailsPathname, | ||
| makeAutomationEditPathname, | ||
| } from 'sentry/views/automations/pathnames'; | ||
|
|
||
| interface AlertRuleWorkflow { | ||
| alertRuleId: string | null; | ||
| ruleId: string | null; | ||
| workflowId: string; | ||
| } | ||
|
|
||
| /** | ||
| * Base component for workflow engine redirects that require fetching | ||
| * workflow data from a rule before redirecting. | ||
| */ | ||
| function WorkflowEngineRedirectWithData({ | ||
| children, | ||
| makeRedirectPath, | ||
| ...props | ||
| }: { | ||
| children: React.ReactNode; | ||
| makeRedirectPath: (workflowId: string, orgSlug: string) => string; | ||
| }) { | ||
| const user = useUser(); | ||
| const organization = useOrganization(); | ||
| const params = useParams<{projectId: string; ruleId: string}>(); | ||
| const {ruleId} = params; | ||
|
|
||
| const shouldRedirect = | ||
| !user.isStaff && organization.features.includes('workflow-engine-ui'); | ||
|
|
||
| const {data: alertRuleWorkflow, isPending} = useApiQuery<AlertRuleWorkflow>( | ||
| [ | ||
| `/organizations/${organization.slug}/alert-rule-workflow/`, | ||
| {query: {rule_id: ruleId}}, | ||
| ], | ||
| { | ||
| staleTime: 0, | ||
| enabled: shouldRedirect, | ||
| retry: false, | ||
| } | ||
| ); | ||
|
|
||
| if (shouldRedirect) { | ||
| if (isPending) { | ||
| return <LoadingIndicator />; | ||
| } | ||
| if (alertRuleWorkflow) { | ||
| return ( | ||
| <Redirect | ||
| to={makeRedirectPath(alertRuleWorkflow.workflowId, organization.slug)} | ||
| /> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| // Pass through all props to children | ||
| if (isValidElement(children)) { | ||
| return cloneElement(children, props); | ||
| } | ||
|
|
||
| return children; | ||
| } | ||
|
|
||
| // Data-dependent redirects | ||
|
|
||
| export function WorkflowEngineRedirectToAutomationDetails({ | ||
| children, | ||
| ...props | ||
| }: { | ||
| children: React.ReactNode; | ||
| }) { | ||
| return ( | ||
| <WorkflowEngineRedirectWithData | ||
| makeRedirectPath={(workflowId, orgSlug) => | ||
| makeAutomationDetailsPathname(orgSlug, workflowId) | ||
| } | ||
| {...props} | ||
| > | ||
| {children} | ||
| </WorkflowEngineRedirectWithData> | ||
| ); | ||
| } | ||
|
|
||
| export function WorkflowEngineRedirectToAutomationEdit({ | ||
| children, | ||
| ...props | ||
| }: { | ||
| children: React.ReactNode; | ||
| }) { | ||
| return ( | ||
| <WorkflowEngineRedirectWithData | ||
| makeRedirectPath={(workflowId, orgSlug) => | ||
| makeAutomationEditPathname(orgSlug, workflowId) | ||
| } | ||
| {...props} | ||
| > | ||
| {children} | ||
| </WorkflowEngineRedirectWithData> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: Child routes not rendered without Outlet component
The
WorkflowEngineRedirectWithDatacomponent attempts to render child routes by cloning thechildrenprop, but in React Router v6, nested routes require using the<Outlet />component instead. The current code checksisValidElement(children)which will be false for route configurations, causing it to return the rawchildrenarray which won't render anything. When redirect conditions aren't met (e.g., feature flag disabled or API returns null), the child route components won't be displayed, breaking the normal alert rule pages.