diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ab33a8f37..91c98b81f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -42,6 +42,7 @@ jobs: "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY }}" "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" + "SENTRY_RELEASE=${{ github.event.release.tag_name }}" publish-cloud-stage: runs-on: ubuntu-latest steps: diff --git a/Dockerfile b/Dockerfile index 93f897d2d..a60ea8220 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,12 +24,14 @@ ARG PUBLIC_APPWRITE_ENDPOINT ARG PUBLIC_GROWTH_ENDPOINT ARG PUBLIC_STRIPE_KEY ARG SENTRY_AUTH_TOKEN +ARG SENTRY_RELEASE ENV PUBLIC_APPWRITE_ENDPOINT=$PUBLIC_APPWRITE_ENDPOINT ENV PUBLIC_GROWTH_ENDPOINT=$PUBLIC_GROWTH_ENDPOINT ENV PUBLIC_CONSOLE_MODE=$PUBLIC_CONSOLE_MODE ENV PUBLIC_STRIPE_KEY=$PUBLIC_STRIPE_KEY ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN +ENV SENTRY_RELEASE=$SENTRY_RELEASE ENV NODE_OPTIONS=--max_old_space_size=8192 RUN pnpm run sync && pnpm run build diff --git a/src/lib/commandCenter/panels/ai.svelte b/src/lib/commandCenter/panels/ai.svelte index da09311f7..c4327962d 100644 --- a/src/lib/commandCenter/panels/ai.svelte +++ b/src/lib/commandCenter/panels/ai.svelte @@ -179,7 +179,7 @@ {#if $isLoading || answer}
-
{getInitials($user.name)}
+
{getInitials($user.name || $user.email)}

{previousQuestion}

@@ -229,7 +229,7 @@
- +
{ + // php int max is always larger than js + const exceedsSafeLimit = count >= Number.MAX_SAFE_INTEGER; + return exceedsSafeLimit ? 'Unlimited' : count || 0; + }; @@ -81,7 +88,7 @@ {usage.resource} - {plan.addons.seats.limit || 0} + {getCorrectSeatsCountValue(plan.addons.seats.limit)} {#if !isFree} diff --git a/src/lib/components/modalWrapper.svelte b/src/lib/components/modalWrapper.svelte index 4551ff70f..9a2329b09 100644 --- a/src/lib/components/modalWrapper.svelte +++ b/src/lib/components/modalWrapper.svelte @@ -79,7 +79,9 @@ on:cancel|preventDefault {style}> {#if show} - +
+ +
{/if} diff --git a/src/lib/elements/flag.svelte b/src/lib/elements/flag.svelte index 560df6a5c..efb284cc8 100644 --- a/src/lib/elements/flag.svelte +++ b/src/lib/elements/flag.svelte @@ -12,13 +12,10 @@ export function getFlag(country: string, width: number, height: number, quality: number) { if (!isValueOfStringEnum(Flag, country)) return ''; - let flag = sdk.forConsole.avatars + return sdk.forConsole.avatars .getFlag(country, width * 2, height * 2, quality) - ?.toString(); - flag?.includes('&project=') - ? (flag = flag.replace('&project=', '&mode=admin')) - : flag + '&mode=admin'; - return flag; + ?.toString() + ?.replace('&project=console', '&mode=admin'); } diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index a1db18b62..68db777fb 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -348,7 +348,7 @@ export type Plan = { backupsEnabled: boolean; backupPolicies: number; emailBranding: boolean; - supportsCredit: boolean; + supportsCredits: boolean; }; export type PlanList = { diff --git a/src/lib/wizards/functions/cover.svelte b/src/lib/wizards/functions/cover.svelte index 8675731a9..9875d60b0 100644 --- a/src/lib/wizards/functions/cover.svelte +++ b/src/lib/wizards/functions/cover.svelte @@ -160,9 +160,9 @@
{runtimeDetail.name} - {#if runtimeDetail.name.toLowerCase() === 'deno'} - New - {/if} + + +
diff --git a/src/routes/(console)/account/deleteAccount.svelte b/src/routes/(console)/account/deleteAccount.svelte index 168d289e4..863839c66 100644 --- a/src/routes/(console)/account/deleteAccount.svelte +++ b/src/routes/(console)/account/deleteAccount.svelte @@ -18,10 +18,10 @@ - + - {$user.name} + {$user.name || 'User'} diff --git a/src/routes/(console)/account/updateName.svelte b/src/routes/(console)/account/updateName.svelte index 72c521e6c..06b42fcf9 100644 --- a/src/routes/(console)/account/updateName.svelte +++ b/src/routes/(console)/account/updateName.svelte @@ -12,7 +12,7 @@ let name: string = null; onMount(async () => { - name ??= $user.name; + name ??= $user.name ?? ''; }); async function updateName() { diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte index 621ba3a00..a9a92035e 100644 --- a/src/routes/(console)/create-organization/+page.svelte +++ b/src/routes/(console)/create-organization/+page.svelte @@ -170,7 +170,7 @@ trackEvent(Submit.OrganizationCreate, { plan: tierToPlan(billingPlan)?.name, - budget_cap_enabled: !!billingBudget, + budget_cap_enabled: billingBudget !== null, members_invited: collaborators?.length }); diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index 76607b429..91f9fbfbd 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -28,16 +28,16 @@ import { ID, Region } from '@appwrite.io/console'; import { openImportWizard } from '../project-[project]/settings/migrations/(import)'; import { readOnly } from '$lib/stores/billing'; - import type { RegionList } from '$lib/sdk/billing'; import { onMount } from 'svelte'; import { organization } from '$lib/stores/organization'; import { canWriteProjects } from '$lib/stores/roles'; import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect'; + import { regions as regionsStore } from '$routes/(console)/organization-[organization]/store'; export let data; - let addOrganization = false; let showCreate = false; + let addOrganization = false; const getPlatformInfo = (platform: string) => { let name: string, icon: string; @@ -85,6 +85,7 @@ if (isCloud) wizard.start(Create); else showCreate = true; } + $: $registerCommands([ { label: 'Create project', @@ -120,17 +121,16 @@ } }; - let regions: RegionList; onMount(async () => { if (isCloud) { - regions = await sdk.forConsole.billing.listRegions(); + const regions = await sdk.forConsole.billing.listRegions(); + regionsStore.set(regions); checkPricingRefAndRedirect($page.url.searchParams); } }); function findRegion(project: Models.Project) { - const region = regions.regions.find((region) => region.$id === project.region); - return region; + return $regionsStore?.regions?.find((region) => region.$id === project.region); } @@ -198,7 +198,7 @@ {/if} - {#if isCloud && regions} + {#if isCloud && $regionsStore?.regions} {@const region = findRegion(project)} {region?.name} diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index c370fbf31..2d3772358 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -1,7 +1,6 @@ @@ -107,6 +110,7 @@
diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte index b9c9b5eb3..df6a7e84a 100644 --- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte +++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte @@ -9,13 +9,14 @@ import { organization, currentPlan } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; + import BudgetAlert from './budgetAlert.svelte'; let capActive = false; let budget: number; onMount(() => { budget = $organization?.billingBudget; - capActive = !!$organization?.billingBudget; + capActive = $organization?.billingBudget !== null; }); async function updateBudget() { @@ -44,7 +45,7 @@ } $: if (!capActive) { - budget = 0; + budget = null; } @@ -113,3 +114,5 @@ + + 0} /> diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte index a0e8dae0e..1e08e5190 100644 --- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte @@ -146,7 +146,7 @@ {/if} - {#if currentPlan.supportsCredit && availableCredit > 0} + {#if currentPlan.supportsCredits && availableCredit > 0} import { invalidate } from '$app/navigation'; + import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { Modal } from '$lib/components'; + import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; + import { logout } from '$lib/helpers/logout'; + import { checkForUsageLimit } from '$lib/stores/billing'; import { addNotification } from '$lib/stores/notifications'; + import { organization } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; + import { user } from '$lib/stores/user'; + import { isCloud } from '$lib/system'; import type { Models } from '@appwrite.io/console'; import { createEventDispatcher } from 'svelte'; - import { user } from '$lib/stores/user'; - import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; - import { Dependencies } from '$lib/constants'; - import { checkForUsageLimit } from '$lib/stores/billing'; - import { isCloud } from '$lib/system'; - import { organization } from '$lib/stores/organization'; - import { logout } from '$lib/helpers/logout'; const dispatch = createEventDispatcher(); @@ -36,7 +36,7 @@ showDelete = false; addNotification({ type: 'success', - message: `${selectedMember.userName} was deleted from ${selectedMember.teamName}` + message: `${selectedMember.userName || 'User'} was deleted from ${selectedMember.teamName}` }); trackEvent(Submit.MemberDelete); } catch (error) { diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte index ccf885315..d587d4ea6 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.svelte +++ b/src/routes/(console)/organization-[organization]/members/+page.svelte @@ -122,7 +122,7 @@ size={40} name={member.userName || member.userEmail} /> - {member.userName ? member.userName : 'n/a'} + {member.userName || 'n/a'} {#if member.invited && !member.joined} Pending diff --git a/src/routes/(console)/organization-[organization]/store.ts b/src/routes/(console)/organization-[organization]/store.ts index 28e9e735a..aae6830f4 100644 --- a/src/routes/(console)/organization-[organization]/store.ts +++ b/src/routes/(console)/organization-[organization]/store.ts @@ -1,5 +1,16 @@ import { page } from '$app/stores'; import type { Models } from '@appwrite.io/console'; -import { derived } from 'svelte/store'; +import { derived, writable } from 'svelte/store'; +import type { RegionList } from '$lib/sdk/billing'; +import { sdk } from '$lib/stores/sdk'; + +export const regions = writable(undefined); +export const regionFlagUrls = derived(regions, ($regions) => { + if (!$regions?.regions?.length) return []; + + return $regions?.regions?.map((region) => { + return `${sdk.forConsole.client.config.endpoint}/avatars/flags/${region.flag}?width=80&height=60&quality=100&mode=admin`; + }); +}); export const projects = derived(page, ($page) => $page.data?.projects as Models.ProjectList); diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte index 1759f1287..7ce5d7772 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.svelte @@ -514,7 +514,6 @@ class="link">pricing page.

-

You will not be charged for Phone OTPs before February 10th.

{#if data.organizationUsage.authPhoneTotal}
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte index e1a972e72..87c7b1903 100644 --- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte +++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/totalMembers.svelte @@ -68,7 +68,7 @@ size={32} name={member.userName || member.userEmail} /> - {member.userName ? member.userName : member.userEmail} + {member.userName || member.userEmail}
diff --git a/src/routes/(console)/organization-[organization]/wizard/step1.svelte b/src/routes/(console)/organization-[organization]/wizard/step1.svelte index 331a27fc3..4cf878611 100644 --- a/src/routes/(console)/organization-[organization]/wizard/step1.svelte +++ b/src/routes/(console)/organization-[organization]/wizard/step1.svelte @@ -4,13 +4,22 @@ import { InputText, FormList } from '$lib/elements/forms'; import { WizardStep } from '$lib/layout'; import { sdk } from '$lib/stores/sdk'; - import { createProject, regions } from './store'; + import { createProject } from './store'; + import { regionFlagUrls, regions } from '$routes/(console)/organization-[organization]/store'; let showCustomId = false; - sdk.forConsole.billing.listRegions().then(regions.set); + if (!$regions?.regions) { + sdk.forConsole.billing.listRegions().then(regions.set); + } + + {#each $regionFlagUrls as image} + + {/each} + + Details diff --git a/src/routes/(console)/organization-[organization]/wizard/step2.svelte b/src/routes/(console)/organization-[organization]/wizard/step2.svelte index 37841d20b..1ac76706e 100644 --- a/src/routes/(console)/organization-[organization]/wizard/step2.svelte +++ b/src/routes/(console)/organization-[organization]/wizard/step2.svelte @@ -4,11 +4,12 @@ import { WizardStep } from '$lib/layout'; import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - import { createProject, regions } from './store'; + import { createProject } from './store'; import type { Region } from '$lib/sdk/billing'; import { addNotification } from '$lib/stores/notifications'; import type { Models } from '@appwrite.io/console'; import { page } from '$app/stores'; + import { regions } from '$routes/(console)/organization-[organization]/store'; let prefs: Models.Preferences; diff --git a/src/routes/(console)/organization-[organization]/wizard/store.ts b/src/routes/(console)/organization-[organization]/wizard/store.ts index 779754239..d79bd1ded 100644 --- a/src/routes/(console)/organization-[organization]/wizard/store.ts +++ b/src/routes/(console)/organization-[organization]/wizard/store.ts @@ -1,4 +1,3 @@ -import type { RegionList } from '$lib/sdk/billing'; import { writable } from 'svelte/store'; export const createProject = writable<{ @@ -10,5 +9,3 @@ export const createProject = writable<{ name: null, region: 'fra' }); - -export const regions = writable(undefined); diff --git a/src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte b/src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte index adce57f4a..acfb1661d 100644 --- a/src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte +++ b/src/routes/(console)/project-[project]/auth/user-[user]/deleteAllSessions.svelte @@ -1,7 +1,7 @@