-
Notifications
You must be signed in to change notification settings - Fork 2
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
fix: Add override policy to env #295
Merged
Merged
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
4e9bc82
init
adityachoudhari26 29d7034
more stuff
adityachoudhari26 1c93d9b
better migration
adityachoudhari26 8fb724d
more cleanup
adityachoudhari26 10fbec7
wrap migration in transaction
adityachoudhari26 e251883
update
adityachoudhari26 9269d6c
lint
adityachoudhari26 b3defcd
remove comment
adityachoudhari26 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
There are no files selected for viewing
This file contains 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 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
78 changes: 78 additions & 0 deletions
78
...p/[workspaceSlug]/(app)/_components/environment-drawer/policy-override/UpdateOverride.tsx
This file contains 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,78 @@ | ||
| import type { RouterOutputs } from "@ctrlplane/api"; | ||
| import type * as SCHEMA from "@ctrlplane/db/schema"; | ||
|
|
||
| import { ApprovalAndGovernance } from "../../policy-form-components/ApprovalAndGovernance"; | ||
| import { DeploymentControl } from "../../policy-form-components/DeploymentControl"; | ||
| import { ReleaseChannels } from "../../policy-form-components/ReleaseChannels"; | ||
| import { ReleaseManagement } from "../../policy-form-components/ReleaseManagement"; | ||
| import { RolloutAndTiming } from "../../policy-form-components/RolloutAndTiming"; | ||
| import { EnvironmentDrawerTab } from "../tabs"; | ||
| import { useUpdateOverridePolicy } from "./useOverridePolicy"; | ||
|
|
||
| type Deployment = SCHEMA.Deployment & { | ||
| releaseChannels: SCHEMA.ReleaseChannel[]; | ||
| }; | ||
|
|
||
| type Policy = NonNullable< | ||
| NonNullable<RouterOutputs["environment"]["byId"]>["policy"] | ||
| >; | ||
|
|
||
| type UpdateOverridePolicyProps = { | ||
| environment: SCHEMA.Environment; | ||
| environmentPolicy: Policy; | ||
| activeTab: EnvironmentDrawerTab; | ||
| deployments: Deployment[]; | ||
| }; | ||
|
|
||
| export const UpdateOverridePolicy: React.FC<UpdateOverridePolicyProps> = ({ | ||
| environment, | ||
| environmentPolicy, | ||
| activeTab, | ||
| deployments, | ||
| }) => { | ||
| const { onUpdate, isUpdating } = useUpdateOverridePolicy( | ||
| environment, | ||
| environmentPolicy, | ||
| ); | ||
|
|
||
| return ( | ||
| <> | ||
| {activeTab === EnvironmentDrawerTab.Approval && ( | ||
| <ApprovalAndGovernance | ||
| environmentPolicy={environmentPolicy} | ||
| onUpdate={onUpdate} | ||
| isLoading={isUpdating} | ||
| /> | ||
| )} | ||
| {activeTab === EnvironmentDrawerTab.Concurrency && ( | ||
| <DeploymentControl | ||
| environmentPolicy={environmentPolicy} | ||
| onUpdate={onUpdate} | ||
| isLoading={isUpdating} | ||
| /> | ||
| )} | ||
| {activeTab === EnvironmentDrawerTab.Management && ( | ||
| <ReleaseManagement | ||
| environmentPolicy={environmentPolicy} | ||
| onUpdate={onUpdate} | ||
| isLoading={isUpdating} | ||
| /> | ||
| )} | ||
| {activeTab === EnvironmentDrawerTab.ReleaseChannels && ( | ||
| <ReleaseChannels | ||
| environmentPolicy={environmentPolicy} | ||
| onUpdate={onUpdate} | ||
| isLoading={isUpdating} | ||
| deployments={deployments} | ||
| /> | ||
| )} | ||
| {activeTab === EnvironmentDrawerTab.Rollout && ( | ||
| <RolloutAndTiming | ||
| environmentPolicy={environmentPolicy} | ||
| onUpdate={onUpdate} | ||
| isLoading={isUpdating} | ||
| /> | ||
| )} | ||
| </> | ||
| ); | ||
| }; |
42 changes: 42 additions & 0 deletions
42
...[workspaceSlug]/(app)/_components/environment-drawer/policy-override/useOverridePolicy.ts
This file contains 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,42 @@ | ||
| import type * as SCHEMA from "@ctrlplane/db/schema"; | ||
|
|
||
| import { api } from "~/trpc/react"; | ||
|
|
||
| const useInvalidateQueries = ( | ||
| environmentId: string, | ||
| systemId: string, | ||
| policyId?: string, | ||
| ) => { | ||
| const utils = api.useUtils(); | ||
| const invalidateQueries = () => { | ||
| utils.environment.policy.byId.invalidate(policyId); | ||
| utils.environment.policy.bySystemId.invalidate(systemId); | ||
| utils.environment.byId.invalidate(environmentId); | ||
| }; | ||
| return invalidateQueries; | ||
| }; | ||
|
|
||
| export const useUpdateOverridePolicy = ( | ||
| environment: SCHEMA.Environment, | ||
| policy: SCHEMA.EnvironmentPolicy, | ||
| ) => { | ||
| const updatePolicy = api.environment.policy.update.useMutation(); | ||
| const invalidateQueries = useInvalidateQueries( | ||
| environment.id, | ||
| environment.systemId, | ||
| policy.id, | ||
| ); | ||
|
|
||
| const onUpdate = (data: SCHEMA.UpdateEnvironmentPolicy) => | ||
| updatePolicy | ||
| .mutateAsync({ | ||
| id: policy.id, | ||
| data, | ||
| }) | ||
| .then(invalidateQueries); | ||
|
|
||
| return { | ||
| onUpdate, | ||
| isUpdating: updatePolicy.isPending, | ||
| }; | ||
| }; |
9 changes: 9 additions & 0 deletions
9
apps/webservice/src/app/[workspaceSlug]/(app)/_components/environment-drawer/tabs.ts
This file contains 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,9 @@ | ||
| export enum EnvironmentDrawerTab { | ||
| Overview = "overview", | ||
| Resources = "resources", | ||
| Approval = "approval", | ||
| Concurrency = "concurrency", | ||
| Management = "management", | ||
| ReleaseChannels = "release-channels", | ||
| Rollout = "rollout", | ||
| } |
Oops, something went wrong.
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.
🛠️ Refactor suggestion
Add error boundary for policy override component.
Consider wrapping the UpdateOverridePolicy component with an error boundary to handle potential rendering errors gracefully.