Feat baa #2898
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 |
|---|---|---|
|
|
@@ -7,21 +7,30 @@ import { isCloud } from '$lib/system'; | |
| export const load: PageLoad = async ({ depends, params, parent }) => { | ||
| const { countryList, locale } = await parent(); | ||
| depends(Dependencies.ORGANIZATION); | ||
| depends(Dependencies.ADDONS); | ||
|
|
||
| const [projects, invoices, addons] = await Promise.all([ | ||
| sdk.forConsole.projects.list({ | ||
| queries: [Query.equal('teamId', params.organization), Query.select(['$id', 'name'])] | ||
| }), | ||
| isCloud | ||
| ? sdk.forConsole.organizations.listInvoices({ | ||
| organizationId: params.organization | ||
| }) | ||
| : undefined, | ||
| isCloud | ||
| ? sdk.forConsole.organizations | ||
| .listAddons({ | ||
| organizationId: params.organization | ||
| }) | ||
| .catch(() => null) | ||
| : null | ||
| ]); | ||
|
|
||
| return { | ||
| projects, | ||
| invoices, | ||
| addons, | ||
| countryList, | ||
| locale | ||
| }; | ||
|
|
||
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.
Avoid reporting success when addon lookup fails.
If
listAddonsfails (network/5xx/auth), the code setsaddonId = nulland then shows “BAA addon has been enabled” in the fallback branch. That can hide real failures and mislead users.Proposed fix
onMount(async () => { name = $organization.name; if (page.url.searchParams.get('type') === 'validate-addon') { let addonId = page.url.searchParams.get('addonId'); + let lookupFailed = false; // Fall back to listing addons if addonId is missing or invalid if (!addonId || addonId === 'undefined') { try { const addons = await sdk.forConsole.organizations.listAddons({ organizationId: $organization.$id }); const pending = addons.addons.find( (a) => a.key === 'baa' && a.status === 'pending' ); addonId = pending?.$id ?? null; - } catch { - addonId = null; + } catch (e) { + lookupFailed = true; + addNotification({ + message: e?.message ?? 'Unable to verify BAA addon status. Please retry.', + type: 'error' + }); } } + + if (lookupFailed) { + const settingsUrl = resolve('/(console)/organization-[organization]/settings', { + organization: $organization.$id + }); + await goto(settingsUrl, { replaceState: true }); + return; + } if (addonId) { // existing logic...Also applies to: 80-89
🤖 Prompt for AI Agents