From 3d710ce3a3a76e987fc97575194223596128d653 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 5 Mar 2024 18:21:36 +0100 Subject: [PATCH 01/23] fix: setting page missing on selfhosted, heading trim and alignment --- src/lib/components/drop.svelte | 6 ++- src/lib/components/heading.svelte | 6 ++- .../organization-[organization]/header.svelte | 41 ++++++++++++------- .../settings/+page.ts | 14 +++++-- .../settings/deleteOrganizationModal.svelte | 4 +- 5 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/lib/components/drop.svelte b/src/lib/components/drop.svelte index d6c899df2..42d46324d 100644 --- a/src/lib/components/drop.svelte +++ b/src/lib/components/drop.svelte @@ -100,7 +100,11 @@ -
+
diff --git a/src/lib/components/heading.svelte b/src/lib/components/heading.svelte index 440693da1..cfb52ea77 100644 --- a/src/lib/components/heading.svelte +++ b/src/lib/components/heading.svelte @@ -10,6 +10,10 @@ export { classes as class }; - + diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte index 23c2d23d8..b42a09643 100644 --- a/src/routes/console/organization-[organization]/header.svelte +++ b/src/routes/console/organization-[organization]/header.svelte @@ -2,7 +2,15 @@ import { base } from '$app/paths'; import { page } from '$app/stores'; import { tooltip } from '$lib/actions/tooltip'; - import { AvatarGroup, DropList, DropListItem, DropListLink, Tab, Tabs } from '$lib/components'; + import { + AvatarGroup, + DropList, + DropListItem, + DropListLink, + Heading, + Tab, + Tabs + } from '$lib/components'; import { BillingPlan } from '$lib/constants'; import { Pill } from '$lib/elements'; import { Button } from '$lib/elements/forms'; @@ -41,6 +49,13 @@ $: avatars = $members.memberships?.map((m) => m.userName) ?? []; $: organizationId = $page.params.organization; $: path = `/console/organization-${organizationId}`; + $: permanentTabSettings = [ + { + href: `${path}/settings`, + event: 'settings', + title: 'Settings' + } + ]; $: permanentTabs = [ { href: path, @@ -55,13 +70,7 @@ hasChildren: true } ]; - $: permanentTabSettings = [ - { - href: `${path}/settings`, - event: 'settings', - title: 'Settings' - } - ]; + $: tabs = isCloud ? [ ...permanentTabs, @@ -78,19 +87,21 @@ }, ...permanentTabSettings ] - : permanentTabs; + : [...permanentTabs, ...permanentTabSettings]; {#if $organization?.$id} - + {#each $organizationList.teams as org} diff --git a/src/routes/console/organization-[organization]/settings/+page.ts b/src/routes/console/organization-[organization]/settings/+page.ts index f4db3678f..e97b456ee 100644 --- a/src/routes/console/organization-[organization]/settings/+page.ts +++ b/src/routes/console/organization-[organization]/settings/+page.ts @@ -2,12 +2,18 @@ import type { PageLoad } from './$types'; import { Dependencies } from '$lib/constants'; import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; +import { isCloud } from '$lib/system'; export const load: PageLoad = async ({ depends, parent }) => { const { organization } = await parent(); depends(Dependencies.ORGANIZATION); - return { - projects: await sdk.forConsole.projects.list([Query.equal('teamId', organization.$id)]), - invoices: await sdk.forConsole.billing.listInvoices(organization.$id) - }; + + const projects = await sdk.forConsole.projects.list([Query.equal('teamId', organization.$id)]); + + if (isCloud) { + return { + projects, + invoices: await sdk.forConsole.billing.listInvoices(organization.$id) + }; + } else return { projects }; }; diff --git a/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte index b017bff83..824c50ddd 100644 --- a/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte +++ b/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte @@ -51,7 +51,9 @@ } } - $: upcomingInvoice = invoices.invoices.find((i) => i.status === 'upcoming' && i.amount > 0); + $: upcomingInvoice = isCloud + ? invoices.invoices.find((i) => i.status === 'upcoming' && i.amount > 0) + : null; Date: Sun, 10 Mar 2024 18:21:45 +0100 Subject: [PATCH 02/23] chore remove unrequired change --- .../settings/deleteOrganizationModal.svelte | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte index 824c50ddd..b017bff83 100644 --- a/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte +++ b/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte @@ -51,9 +51,7 @@ } } - $: upcomingInvoice = isCloud - ? invoices.invoices.find((i) => i.status === 'upcoming' && i.amount > 0) - : null; + $: upcomingInvoice = invoices.invoices.find((i) => i.status === 'upcoming' && i.amount > 0); Date: Mon, 11 Mar 2024 14:40:19 +0100 Subject: [PATCH 03/23] feat: messaging confirmation modal --- .../project-[project]/messaging/create.svelte | 4 +- .../messaging/wizard/step3.svelte | 52 ++++++++++++++----- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/create.svelte b/src/routes/console/project-[project]/messaging/create.svelte index 7cf554d2a..8d137a0fc 100644 --- a/src/routes/console/project-[project]/messaging/create.svelte +++ b/src/routes/console/project-[project]/messaging/create.svelte @@ -148,6 +148,8 @@ } ] }); + + $wizard.finalAction = create; - + diff --git a/src/routes/console/project-[project]/messaging/wizard/step3.svelte b/src/routes/console/project-[project]/messaging/wizard/step3.svelte index 47b9c2b2e..f240a4041 100644 --- a/src/routes/console/project-[project]/messaging/wizard/step3.svelte +++ b/src/routes/console/project-[project]/messaging/wizard/step3.svelte @@ -5,6 +5,9 @@ import { MessagingProviderType } from '@appwrite.io/console'; import { messageParams, providerType } from './store'; import { isSameDay, toLocaleDateISO, toLocaleTimeISO } from '$lib/helpers/date'; + import { wizard } from '$lib/stores/wizard'; + import { Modal } from '$lib/components'; + import { topicsById } from '../store'; let when: 'now' | 'later' = 'now'; let now = new Date(); @@ -13,6 +16,21 @@ let time: string; let dateTime: Date; let docsUrl = `https://appwrite.io/docs/products/messaging`; + let showConfimation = false; + + let totalTargets = $messageParams[$providerType].targets?.length ?? 0; + + const topics = $messageParams[$providerType].topics; + + for (const topic of topics) { + if ($providerType == MessagingProviderType.Push) { + totalTargets += $topicsById[topic].pushTotal; + } else if ($providerType == MessagingProviderType.Email) { + totalTargets += $topicsById[topic].emailTotal; + } else if ($providerType == MessagingProviderType.Sms) { + totalTargets += $topicsById[topic].smsTotal; + } + } switch ($providerType) { case MessagingProviderType.Email: @@ -40,6 +58,18 @@ timeZoneName: 'longGeneric' }; + async function askForConfirmation() { + $wizard.interceptorNotificationEnabled = false; + showConfimation = true; + throw 'Show confirmation'; + } + + async function submit() { + $wizard.interceptorNotificationEnabled = true; + await $wizard.finalAction(); + showConfimation = false; + } + $: if (when === 'now') { date = time = ''; } @@ -56,7 +86,7 @@ } - + Schedule Schedule the time you want to deliver this message. Learn more in our
{/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte index 776a5a795..dfece1274 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte @@ -107,9 +107,11 @@
To change the selection edit the relationship settings. - - Delete document from {$collection.name} - +
    + + Delete document from {$collection.name} + +
{/if} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index a6c334900..26fda2784 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -301,9 +301,11 @@
To change the selection edit the relationship settings. - - Delete document from {$collection.name} - +
    + + Delete document from {$collection.name} + +
{:else}

This action is irreversible.

From cf82b17fc70ba672840eb328ce0e4589439af90c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 13 Mar 2024 11:57:00 +0100 Subject: [PATCH 09/23] fix: add payment from account page --- src/routes/console/account/payments/paymentModal.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/routes/console/account/payments/paymentModal.svelte b/src/routes/console/account/payments/paymentModal.svelte index abe6767fe..ddf83bc27 100644 --- a/src/routes/console/account/payments/paymentModal.svelte +++ b/src/routes/console/account/payments/paymentModal.svelte @@ -6,6 +6,7 @@ import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; + import { base } from '$app/paths'; export let show = false; @@ -20,7 +21,7 @@ async function handleSubmit() { try { - const card = await submitStripeCard(name); + const card = await submitStripeCard(name, '/account/payments'); invalidate(Dependencies.PAYMENT_METHODS); dispatch('submit', card); show = false; From 31a4ff88d5a9b2f2edf9da46f3f82f2737eafbd7 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 13 Mar 2024 11:58:34 +0100 Subject: [PATCH 10/23] revert: base import --- src/routes/console/account/payments/paymentModal.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/console/account/payments/paymentModal.svelte b/src/routes/console/account/payments/paymentModal.svelte index ddf83bc27..dfd8b3caf 100644 --- a/src/routes/console/account/payments/paymentModal.svelte +++ b/src/routes/console/account/payments/paymentModal.svelte @@ -6,7 +6,6 @@ import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; - import { base } from '$app/paths'; export let show = false; From 920ec185b23cfef3cc846d53a0265bf2611d2a03 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 13 Mar 2024 18:44:50 +0100 Subject: [PATCH 11/23] fix: confirm payments --- src/lib/stores/stripe.ts | 16 ++++++++++------ src/routes/console/account/payments/+page.svelte | 13 +++++++++++++ .../console/account/payments/paymentModal.svelte | 3 ++- .../billing/replaceCard.svelte | 2 +- .../billing/retryPaymentModal.svelte | 2 +- .../billing/wizard/paymentDetails.svelte | 3 ++- .../paymentDetails.svelte | 3 ++- 7 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/lib/stores/stripe.ts b/src/lib/stores/stripe.ts index 959b46ffc..93b4576ae 100644 --- a/src/lib/stores/stripe.ts +++ b/src/lib/stores/stripe.ts @@ -51,7 +51,7 @@ export async function unmountPaymentElement() { elements = null; } -export async function submitStripeCard(name: string, urlRoute?: string) { +export async function submitStripeCard(name: string, organizationId?: string) { try { // If a payment method was created during initialization, use it, otherwise create a new one if (!paymentMethod) { @@ -62,16 +62,20 @@ export async function submitStripeCard(name: string, urlRoute?: string) { // // Element needs to be submitted before confirming the setup intent elements.submit(); - const baseUrl = 'https://cloud.appwrite.io/console/'; + const baseUrl = 'https://cloud.appwrite.io/console'; + const accountUrl = `${baseUrl}/account/payments?clientSecret=${clientSecret}`; + const orgUrl = `${baseUrl}/organization-${organizationId}/billing?clientSecret=${clientSecret}`; + + const returnUrl = new URL(organizationId ? orgUrl : accountUrl); + + returnUrl.searchParams.append('clientSecret', clientSecret); + returnUrl.searchParams.append('paymentMethodId', paymentMethod.$id); const { setupIntent, error } = await get(stripe).confirmSetup({ elements, clientSecret, confirmParams: { - return_url: `${baseUrl}${ - urlRoute ?? - `organization-${get(organization).$id}/billing?clientSecret=${clientSecret}` - }`, + return_url: returnUrl.toString(), payment_method_data: { billing_details: { name diff --git a/src/routes/console/account/payments/+page.svelte b/src/routes/console/account/payments/+page.svelte index 8cca7e6f8..f4a654ac8 100644 --- a/src/routes/console/account/payments/+page.svelte +++ b/src/routes/console/account/payments/+page.svelte @@ -3,8 +3,21 @@ import { Container } from '$lib/layout'; import PaymentMethods from './paymentMethods.svelte'; import BillingAddress from './billingAddress.svelte'; + import { onMount } from 'svelte'; + import { page } from '$app/stores'; + import { confirmPayment } from '$lib/stores/stripe'; + import { user } from '$lib/stores/user'; let showPayment = false; + user; + + onMount(async () => { + if ($page.url.searchParams.has('clientSecret')) { + const clientSecret = $page.url.searchParams.get('clientSecret'); + const paymentMethodId = $page.url.searchParams.get('paymentMethodId'); + await confirmPayment('', clientSecret, paymentMethodId); + } + }); diff --git a/src/routes/console/account/payments/paymentModal.svelte b/src/routes/console/account/payments/paymentModal.svelte index dfd8b3caf..2ac93e0b2 100644 --- a/src/routes/console/account/payments/paymentModal.svelte +++ b/src/routes/console/account/payments/paymentModal.svelte @@ -6,6 +6,7 @@ import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { addNotification } from '$lib/stores/notifications'; + import { page } from '$app/stores'; export let show = false; @@ -20,7 +21,7 @@ async function handleSubmit() { try { - const card = await submitStripeCard(name, '/account/payments'); + const card = await submitStripeCard(name, $page?.params?.organization ?? null); invalidate(Dependencies.PAYMENT_METHODS); dispatch('submit', card); show = false; diff --git a/src/routes/console/organization-[organization]/billing/replaceCard.svelte b/src/routes/console/organization-[organization]/billing/replaceCard.svelte index e25348990..639964119 100644 --- a/src/routes/console/organization-[organization]/billing/replaceCard.svelte +++ b/src/routes/console/organization-[organization]/billing/replaceCard.svelte @@ -33,7 +33,7 @@ async function handleSubmit() { try { if (!selectedPaymentMethodId) { - const method = await submitStripeCard(name); + const method = await submitStripeCard(name, $organization.$id); selectedPaymentMethodId = method.$id; } isBackup diff --git a/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte b/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte index 828782773..e0f034029 100644 --- a/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte +++ b/src/routes/console/organization-[organization]/billing/retryPaymentModal.svelte @@ -39,7 +39,7 @@ try { if (paymentMethodId === null) { try { - const method = await submitStripeCard(name); + const method = await submitStripeCard(name, $organization.$id); const card = await sdk.forConsole.billing.getPaymentMethod(method.$id); if (card?.last4) { paymentMethodId = card.$id; diff --git a/src/routes/console/organization-[organization]/billing/wizard/paymentDetails.svelte b/src/routes/console/organization-[organization]/billing/wizard/paymentDetails.svelte index b4f54264d..f9d34c28e 100644 --- a/src/routes/console/organization-[organization]/billing/wizard/paymentDetails.svelte +++ b/src/routes/console/organization-[organization]/billing/wizard/paymentDetails.svelte @@ -9,6 +9,7 @@ import { sdk } from '$lib/stores/sdk'; import { PaymentBoxes } from '$lib/components/billing'; import { addCreditWizardStore } from '../store'; + import { organization } from '$lib/stores/organization'; let methods: PaymentList; let name: string; @@ -21,7 +22,7 @@ async function handleSubmit() { try { - const method = await submitStripeCard(name); + const method = await submitStripeCard(name, $organization.$id); $addCreditWizardStore.paymentMethodId = method.$id; invalidate(Dependencies.PAYMENT_METHODS); } catch (e) { diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte index b82943719..f03feecca 100644 --- a/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte +++ b/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte @@ -13,6 +13,7 @@ import { symmetricDifference } from '$lib/helpers/array'; import { showUsageRatesModal } from '$lib/stores/billing'; import { PaymentBoxes } from '$lib/components/billing'; + import { page } from '$app/stores'; let methods: PaymentList; let filteredMethods: PaymentMethodData[]; @@ -48,7 +49,7 @@ } } else { try { - await submitStripeCard(name); + await submitStripeCard(name, $page?.params?.organization ?? null); const latestMethods = await sdk.forConsole.billing.listPaymentMethods(); const paymentMethod = symmetricDifference( methods.paymentMethods, From 1fe27cf03cd9e6e1fcbc815f63405c010aa576e0 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 13 Mar 2024 18:45:13 +0100 Subject: [PATCH 12/23] fix: 500 errors! --- src/hooks.client.ts | 13 +++++++++++++ src/routes/+error.svelte | 2 +- src/routes/console/+error.svelte | 8 +++++--- src/routes/console/project-[project]/+error.svelte | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/hooks.client.ts diff --git a/src/hooks.client.ts b/src/hooks.client.ts new file mode 100644 index 000000000..2345ffb2c --- /dev/null +++ b/src/hooks.client.ts @@ -0,0 +1,13 @@ +import { AppwriteException } from '@appwrite.io/console'; +import type { HandleClientError } from '@sveltejs/kit'; + +export const handleError: HandleClientError = async ({ error, message, status }) => { + if (error instanceof AppwriteException && error.code === 0) { + status = undefined; + message = error.message; + } + return { + message, + status + }; +}; diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 4e9d8e540..8b914f299 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -6,7 +6,7 @@ - {$page.status} + {$page.error.status || 'Invalid Argument'} {$page.error.message} diff --git a/src/routes/console/+error.svelte b/src/routes/console/+error.svelte index 9a50e9be7..408a5afaa 100644 --- a/src/routes/console/+error.svelte +++ b/src/routes/console/+error.svelte @@ -6,7 +6,9 @@ - {$page.status} - {$page.error.message} - +
+ {$page.error.status || 'Invalid Argument'} + {$page.error.message} + +
diff --git a/src/routes/console/project-[project]/+error.svelte b/src/routes/console/project-[project]/+error.svelte index 243be6e42..be0053176 100644 --- a/src/routes/console/project-[project]/+error.svelte +++ b/src/routes/console/project-[project]/+error.svelte @@ -5,6 +5,6 @@ - {$page.status} + {$page.error.status || 'Invalid Argument'}

{$page.error.message}

From 355a8628ca264c93ce3126542f352720200928cd Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 13 Mar 2024 18:47:38 +0100 Subject: [PATCH 13/23] fix: remove unused code --- src/routes/console/account/payments/+page.svelte | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/routes/console/account/payments/+page.svelte b/src/routes/console/account/payments/+page.svelte index f4a654ac8..1e00b42eb 100644 --- a/src/routes/console/account/payments/+page.svelte +++ b/src/routes/console/account/payments/+page.svelte @@ -6,10 +6,8 @@ import { onMount } from 'svelte'; import { page } from '$app/stores'; import { confirmPayment } from '$lib/stores/stripe'; - import { user } from '$lib/stores/user'; let showPayment = false; - user; onMount(async () => { if ($page.url.searchParams.has('clientSecret')) { From 8185fab2572d1a24343799c426c2521072aad203 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Thu, 14 Mar 2024 21:03:07 +0000 Subject: [PATCH 14/23] chore: fix-upgrade-wizard-flow --- .../paymentDetails.svelte | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte b/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte index f03feecca..99116f394 100644 --- a/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte +++ b/src/routes/console/wizard/cloudOrganizationChangeTier/paymentDetails.svelte @@ -10,7 +10,6 @@ import { Dependencies } from '$lib/constants'; import { initializeStripe, isStripeInitialized, submitStripeCard } from '$lib/stores/stripe'; import { organization } from '$lib/stores/organization'; - import { symmetricDifference } from '$lib/helpers/array'; import { showUsageRatesModal } from '$lib/stores/billing'; import { PaymentBoxes } from '$lib/components/billing'; import { page } from '$app/stores'; @@ -49,15 +48,10 @@ } } else { try { - await submitStripeCard(name, $page?.params?.organization ?? null); - const latestMethods = await sdk.forConsole.billing.listPaymentMethods(); - const paymentMethod = symmetricDifference( - methods.paymentMethods, - latestMethods.paymentMethods - )[0] as PaymentMethodData; - const card = await sdk.forConsole.billing.getPaymentMethod(paymentMethod.$id); + const method = await submitStripeCard(name, $page?.params?.organization ?? null); + const card = await sdk.forConsole.billing.getPaymentMethod(method.$id); if (card?.last4) { - $changeOrganizationTier.paymentMethodId = paymentMethod.$id; + $changeOrganizationTier.paymentMethodId = method.$id; } else { throw new Error( 'The payment method you selected is not valid. Please select a different one.' From 3f26897e81b0fadb6e4f956254a07d4cceccdd27 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Fri, 15 Mar 2024 09:55:12 -0700 Subject: [PATCH 15/23] Replace MSG91 sender number with template ID In MSG91, the sender number is configured in the template ID and the provider accepts the template ID as a parm instead of a from phone number. --- .../messaging/providers/create.svelte | 2 +- .../providers/provider-[provider]/+page.svelte | 2 +- .../provider-[provider]/updateSettings.svelte | 4 ++-- .../messaging/providers/store.ts | 16 ++++++++++------ .../messaging/providers/wizard/provider.svelte | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/providers/create.svelte b/src/routes/console/project-[project]/messaging/providers/create.svelte index 60da9ed89..fef14c640 100644 --- a/src/routes/console/project-[project]/messaging/providers/create.svelte +++ b/src/routes/console/project-[project]/messaging/providers/create.svelte @@ -33,7 +33,7 @@ response = await sdk.forProject.messaging.createMsg91Provider( providerId, $providerParams[$provider].name, - $providerParams[$provider].from, + $providerParams[$provider].templateId, $providerParams[$provider].senderId, $providerParams[$provider].authKey, $providerParams[$provider].enabled diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte index de7ed82d8..4a6c74331 100644 --- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte +++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte @@ -38,7 +38,7 @@ providerId: $providerData.$id, name: $providerData.name, enabled: $providerData.enabled, - from: $providerData.options['from'], + templateId: $providerData.credentials['templateId'], senderId: $providerData.credentials['senderId'], authKey: $providerData.credentials['authKey'] }; diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte index 6555e751f..756737028 100644 --- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte +++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte @@ -92,9 +92,9 @@ providerId, undefined, undefined, + formValues['templateId'], formValues['senderId'], - formValues['authKey'], - formValues['from'] + formValues['authKey'] ); break; case Providers.Telesign: diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts index fd597b9e2..a9c23655f 100644 --- a/src/routes/console/project-[project]/messaging/providers/store.ts +++ b/src/routes/console/project-[project]/messaging/providers/store.ts @@ -465,14 +465,18 @@ export const providers: ProvidersMap = { placeholder: 'Enter sender ID', popover: [ 'How to create a Sender ID?', - 'Head to MSG91 dashboard -> SMS -> Sender ID -> Create sender ID.' + 'Head to MSG91 dashboard -> SMS -> Sender ID -> Create Sender ID.' ] }, { - label: 'Sender number', - name: 'from', - type: 'phone', - placeholder: 'Enter phone' + label: 'Template ID', + name: 'templateId', + type: 'text', + placeholder: 'Enter template ID', + popover: [ + 'How to create a Template ID?', + 'Head to MSG91 dashboard -> SMS -> Templates -> Create Template.' + ] } ] }, @@ -590,7 +594,7 @@ export type TwilioProviderParams = ProviderParams & { }; export type Msg91ProviderParams = ProviderParams & { - from: string; + templateId: string; senderId: string; authKey: string; }; diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte b/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte index e56bf339d..06840afca 100644 --- a/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte +++ b/src/routes/console/project-[project]/messaging/providers/wizard/provider.svelte @@ -29,7 +29,7 @@ providerId: id, name: name, enabled: true, - from: '', + templateId: '', senderId: '', authKey: '' }; From 17ace25ee074b1e2ec8ca8c5354d1756836f420f Mon Sep 17 00:00:00 2001 From: Elad Shechter Date: Tue, 19 Mar 2024 14:05:06 +0800 Subject: [PATCH 16/23] drop style wrong layer - fix z-index --- src/lib/components/drop.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/drop.svelte b/src/lib/components/drop.svelte index 3e5fc91fe..280334b9f 100644 --- a/src/lib/components/drop.svelte +++ b/src/lib/components/drop.svelte @@ -119,7 +119,7 @@ bind:this={tooltip} class:u-width-full-line={fullWidth} style:--arrow-size={`${arrowSize}px`} - style:z-index="10"> + style:z-index="1">
Date: Tue, 19 Mar 2024 11:20:37 +0200 Subject: [PATCH 17/23] fix: state waterfall --- src/routes/+layout.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 14cb350c0..84fdba79b 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -13,9 +13,10 @@ export const ssr = false; export const load: LayoutLoad = async ({ depends, url }) => { depends(Dependencies.ACCOUNT); - redirectTo.set(url.searchParams.get('forceRedirect') || null); - - url.searchParams.delete('forceRedirect'); + if (url.searchParams.has('forceRedirect')) { + redirectTo.set(url.searchParams.get('forceRedirect') || null); + url.searchParams.delete('forceRedirect'); + } try { const account = await sdk.forConsole.account.get<{ organization?: string }>(); From 636fa27e2f5a9ff7fbdc21cf8aaef42f8e2c6341 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 19 Mar 2024 10:53:12 +0100 Subject: [PATCH 18/23] fix: billings checks on load --- src/lib/stores/billing.ts | 1 + src/routes/console/+layout.svelte | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts index b2f00db39..c213a7147 100644 --- a/src/lib/stores/billing.ts +++ b/src/lib/stores/billing.ts @@ -279,6 +279,7 @@ export const paymentMissingMandate = writable(null); export async function checkForMandate(org: Organization) { const paymentId = org.paymentMethodId ?? org.backupPaymentMethodId; + if (!paymentId) return; const paymentMethod = await sdk.forConsole.billing.getPaymentMethod(paymentId); if (paymentMethod.mandateId === null && paymentMethod.country === 'in') { headerAlert.add({ diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index b12da8a70..6e59612b4 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -1,6 +1,6 @@