-
Notifications
You must be signed in to change notification settings - Fork 234
feat: add Premium Geo DB addon to project settings #2981
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
lohanidamodar
wants to merge
8
commits into
main
Choose a base branch
from
feat/project-premium-geo-db-addon
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.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
470b047
feat: add Premium Geo DB addon to project settings
lohanidamodar 5954b75
feat(settings): show price in premium geo DB enable dialog
lohanidamodar 7e73d36
update sdk
lohanidamodar 0e53210
feat(billing): render project addons in breakdown + use server addon …
lohanidamodar 66e615e
Merge remote-tracking branch 'origin/main' into feat/project-premium-…
lohanidamodar afb13fc
Merge remote-tracking branch 'origin/main' into feat/project-premium-…
lohanidamodar 13b0478
chore: bump @appwrite.io/console SDK to 95547fc
lohanidamodar 0cba797
Merge remote-tracking branch 'origin/main' into feat/project-premium-…
lohanidamodar 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
27 changes: 23 additions & 4 deletions
27
src/routes/(console)/project-[region]-[project]/settings/+page.ts
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 |
|---|---|---|
| @@ -1,29 +1,48 @@ | ||
| import { Dependencies, PAGE_LIMIT } from '$lib/constants'; | ||
| import { isCloud } from '$lib/system'; | ||
| import { sdk } from '$lib/stores/sdk'; | ||
| import { Query } from '@appwrite.io/console'; | ||
| import { Addon, Query } from '@appwrite.io/console'; | ||
| import type { PageLoad } from './$types'; | ||
|
|
||
| export const load: PageLoad = async ({ depends, url, params }) => { | ||
| depends(Dependencies.PROJECT_VARIABLES); | ||
| depends(Dependencies.PROJECT_INSTALLATIONS); | ||
| depends(Dependencies.ADDONS); | ||
| const limit = PAGE_LIMIT; | ||
| const offset = Number(url.searchParams.get('offset') ?? 0); | ||
| const variablesOffset = Number(url.searchParams.get('variablesOffset') ?? 0); | ||
| const projectSdk = sdk.forProject(params.region, params.project); | ||
| const [variables, installations] = await Promise.all([ | ||
| const [variables, installations, addons, addonPrice] = await Promise.all([ | ||
| projectSdk.projectApi.listVariables({ | ||
| queries: [Query.limit(limit), Query.offset(variablesOffset)] | ||
| }), | ||
| projectSdk.vcs.listInstallations({ | ||
| queries: [Query.limit(limit), Query.offset(offset)] | ||
| }) | ||
| }), | ||
| isCloud | ||
| ? sdk | ||
| .forConsoleIn(params.region) | ||
| .projects.listAddons({ projectId: params.project }) | ||
| .catch(() => null) | ||
| : Promise.resolve(null), | ||
| isCloud | ||
| ? sdk | ||
| .forConsoleIn(params.region) | ||
| .projects.getAddonPrice({ | ||
| projectId: params.project, | ||
| addon: Addon.Premiumgeodb | ||
| }) | ||
| .catch(() => null) | ||
| : Promise.resolve(null) | ||
| ]); | ||
|
|
||
| return { | ||
| limit, | ||
| offset, | ||
| variablesOffset, | ||
| variables, | ||
| installations | ||
| installations, | ||
| addons, | ||
| addonPrice | ||
| }; | ||
| }; |
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.
nameThe hardcoded
billingAddonNamesmap (addon_baa → 'HIPAA BAA') has been removed in favour ofaddon.name. If the billing-aggregation API response doesn't populatenameon existing BAA resources, BAA will display asaddon_baa overage (1)in the plan summary for current BAA subscribers. Make sure the cloud API (and the new SDK pin) actually includesnameon billing resource objects, or keep a fallback map alongside the API-provided name as a safety net.