Repository navigation
feat(paseo-omp): tag OMP accounts with plan and organization badges #632
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
Open
taemire
wants to merge
5
commits into
omercnet:main
Choose a base branch
from
taemire:feat/paseo-omp-account-tags
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+474
−14
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5210c1b
feat(paseo-omp): tag quota accounts with plan and organization
55dc2aa
fix(paseo-omp): show account badges beside the account name
5ed6564
test(paseo-omp): expose accessibility labels from the react-native te…
54d0578
feat(paseo-omp): tag OMP account logins with plan and organization
b5c6b0a
fix(paseo-omp): take account tags from one report and look plan label…
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 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
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,44 @@ | ||
| const PLAN_LABELS: Record<string, string> = { | ||
| free: "Free", | ||
| go: "Go", | ||
| plus: "Plus", | ||
| pro: "Pro", | ||
| prolite: "Pro Lite", | ||
| max: "Max", | ||
| team: "Team", | ||
| business: "Business", | ||
| self_serve_business_prolite: "Business", | ||
| self_serve_business_usage_based: "Business", | ||
| enterprise: "Enterprise", | ||
| enterprise_cbp_automation: "Enterprise", | ||
| enterprise_cbp_usage_based: "Enterprise", | ||
| edu: "Edu", | ||
| }; | ||
|
|
||
| /** | ||
| * Plan and organization badges for one login, e.g. ["Business", "Example Team"] or ["Personal"]. | ||
| * `plan` is the raw plan OMP's usage report names (Codex `planType`, Copilot `plan`). | ||
| */ | ||
| export function accountTags(input: { | ||
| plan: string | null; | ||
| organization: string | null; | ||
| email: string | null; | ||
| }): string[] { | ||
| const { plan, organization, email } = input; | ||
| const tags: string[] = []; | ||
| if (plan) { | ||
| // An own-property lookup: a plan named like an Object member ("constructor") is still a plan. | ||
| const key = plan.toLowerCase(); | ||
| tags.push( | ||
| Object.hasOwn(PLAN_LABELS, key) | ||
| ? PLAN_LABELS[key] | ||
| : plan.charAt(0).toUpperCase() + plan.slice(1), | ||
| ); | ||
| } | ||
| // Codex reports its plan as the organization name too; that is not an organization. | ||
| if (organization && organization.toLowerCase() !== plan?.toLowerCase()) { | ||
| // Anthropic names a personal account's default organization after its email. | ||
| tags.push(email && organization === `${email}'s Organization` ? "Personal" : organization); | ||
| } | ||
| return [...new Set(tags)]; | ||
| } |
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.
Trim
planTypebefore selecting the fallback.If cached metadata contains
planType: " "andplan: "business",??selects the whitespace value. Trimming then producesnull, so the validBusinessbadge is lost.Select the first nonempty trimmed value. Add this case to the cache-reader test.
Proposed fix
Committable suggestion