fix: normalize created proxy rule status in console #3023
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
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,70 @@ | ||
| import { ProxyRuleStatus, type Models } from '@appwrite.io/console'; | ||
|
|
||
| export type ProxyRuleStatusValue = | ||
| | 'created' | ||
| | 'verified' | ||
| | 'verifying' | ||
| | 'unverified' | ||
| | ProxyRuleStatus | ||
| | undefined; | ||
|
|
||
| export function isProxyRuleVerified(status: ProxyRuleStatusValue): boolean { | ||
| return status === ProxyRuleStatus.Verified; | ||
| } | ||
|
|
||
| export function normalizeProxyRuleStatus(status: ProxyRuleStatusValue): ProxyRuleStatusValue { | ||
| if (status === ProxyRuleStatus.Created) { | ||
| return ProxyRuleStatus.Unverified; | ||
| } | ||
|
|
||
| return status; | ||
| } | ||
|
|
||
| export function isProxyRuleRetryable(status: ProxyRuleStatusValue): boolean { | ||
| const normalizedStatus = normalizeProxyRuleStatus(status); | ||
|
|
||
| return normalizedStatus === ProxyRuleStatus.Unverified; | ||
| } | ||
|
|
||
| export function isProxyRuleLogsViewable(proxyRule: Models.ProxyRule): boolean { | ||
| return ( | ||
| Boolean(proxyRule.logs?.length) && | ||
| normalizeProxyRuleStatus(proxyRule.status) !== ProxyRuleStatus.Verified | ||
| ); | ||
| } | ||
|
|
||
| export function getProxyRuleUpdatedPrefix(status: ProxyRuleStatusValue): string { | ||
| const normalizedStatus = normalizeProxyRuleStatus(status); | ||
|
|
||
| if (normalizedStatus === ProxyRuleStatus.Verifying) { | ||
| return 'Updated'; | ||
| } | ||
|
|
||
| if (normalizedStatus === ProxyRuleStatus.Unverified) { | ||
| return 'Failed'; | ||
| } | ||
|
|
||
| return ''; | ||
|
Comment on lines
+36
to
+47
Contributor
There was a problem hiding this comment.
The old Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time! |
||
| } | ||
|
|
||
| export function getProxyRuleStatusBadge(status: ProxyRuleStatusValue): { | ||
| content: string; | ||
| type?: 'error'; | ||
| } | null { | ||
| const normalizedStatus = normalizeProxyRuleStatus(status); | ||
|
|
||
| if (normalizedStatus === ProxyRuleStatus.Verifying) { | ||
| return { | ||
| content: 'Generating certificate' | ||
| }; | ||
| } | ||
|
|
||
| if (normalizedStatus === ProxyRuleStatus.Unverified) { | ||
| return { | ||
| content: 'Certificate generation failed', | ||
| type: 'error' | ||
| }; | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
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
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
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.
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.
createdstatusThe old code whitelisted only
'verifying'and'unverified'for log viewing. The newnormalizedStatus !== Verifiedpredicate also includescreated(before normalization) and any unrecognized future statuses. Since the PR intentionally treatscreatedas a failure state equivalent tounverified, this is probably correct — but worth confirming that exposing logs on a freshly-created (never-attempted) rule is the desired UX, in case the API returnscreatedfor brand-new rules that have no meaningful logs yet.