-
-
-
+ {#if providers[$providerType].providers[$provider].needAHand}
+ {@const needAHand = providers[$providerType].providers[$provider].needAHand}
+
+
+
+
+
+
+
+
+
How to enable
+ {#if $providerType == MessagingProviderType.Push}notifications{:else}{/if} service?
+
+
+
+ {#each needAHand as p}
+
+ {@html p}
+
+ {/each}
+
+
+
- Read the full guide in the documentation
-
-
-
+ {/if}
-
-
-
-
-
- Invite a team member to complete this step
-
-
+
+
+
+
+
+
+
+
+
+ Read the full guide in the documentation
+
+
+
+
+
+ ($newMemberModal = true)}>
+
+
+
+
+
+
+ Invite a team member to complete this step
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
index 27219e4e0..08d6fd58a 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
@@ -146,4 +146,18 @@
{/if}
-
+
+
+
+ Add subscribers to this topic by selecting the targets for directing messages. Learn more about subscribers.
+
+
+
diff --git a/src/routes/console/project-[project]/messaging/topicsModal.svelte b/src/routes/console/project-[project]/messaging/topicsModal.svelte
index 5de61bada..95a03b79c 100644
--- a/src/routes/console/project-[project]/messaging/topicsModal.svelte
+++ b/src/routes/console/project-[project]/messaging/topicsModal.svelte
@@ -3,11 +3,12 @@
import { Button, FormList, InputCheckbox, InputSearch } from '$lib/elements/forms';
import { Table, TableBody, TableCell, TableRow } from '$lib/elements/table';
import { sdk } from '$lib/stores/sdk';
- import { Query, type Models } from '@appwrite.io/console';
+ import { Query, type Models, MessagingProviderType } from '@appwrite.io/console';
import { createEventDispatcher } from 'svelte';
- import { providerType, getTotal } from './wizard/store';
+ import { getTotal } from './wizard/store';
import ProviderType from './providerType.svelte';
+ export let providerType: MessagingProviderType;
export let show: boolean;
export let topicsById: Record
;
export let title = 'Select topics';
@@ -35,6 +36,14 @@
if (!show) return;
const queries = [Query.limit(5), Query.offset(offset)];
+ if (providerType === MessagingProviderType.Email) {
+ queries.push(Query.greaterThan('emailTotal', 0));
+ } else if (providerType === MessagingProviderType.Sms) {
+ queries.push(Query.greaterThan('smsTotal', 0));
+ } else if (providerType === MessagingProviderType.Push) {
+ queries.push(Query.greaterThan('pushTotal', 0));
+ }
+
const response = await sdk.forProject.messaging.listTopics(queries, search || undefined);
totalResults = response.total;
@@ -83,8 +92,8 @@
- Select existing topics you want to send this message to its subscribers. The message will be
- sent only to targets.
+ Select existing topics you want to send this message to its targets. The message will be
+ sent only to targets.
-
+
{topic.name}
-
+
({getTotal(topic)} subscribers)
diff --git a/src/routes/console/project-[project]/messaging/userTargetsModal.svelte b/src/routes/console/project-[project]/messaging/userTargetsModal.svelte
index c78ddf434..7552144aa 100644
--- a/src/routes/console/project-[project]/messaging/userTargetsModal.svelte
+++ b/src/routes/console/project-[project]/messaging/userTargetsModal.svelte
@@ -12,10 +12,10 @@
import { createEventDispatcher } from 'svelte';
import ProviderType from './providerType.svelte';
+ export let title: string;
export let show: boolean;
export let targetsById: Record;
export let providerType: MessagingProviderType = null;
- export let title = 'Select subscribers';
const dispatch = createEventDispatcher();
@@ -118,82 +118,82 @@
-
-
- Add subscribers to this topic by selecting the targets for directing messages. Learn more about subscribers.
-
+
+
{#if Object.keys(userResultsById).length > 0}
-
- {#each Object.entries(userResultsById) as [userId, user] (userId)}
- {@const selectedCount = user.targets.filter(
- (target) => selected[target.$id]
- ).length}
-
-
- 0 &&
- user.targets.every((target) => targetsById[target.$id])}
- checked={selectedCount > 0 && selectedCount === user.targets.length}
- on:change={(event) => onUserSelection(event, userId)} />
-
-
-
-
- {#if user.name}
- {user.name}
- {:else if user.email}
- {user.email}
- {:else if user.phone}
- {user.phone}
- {:else}
- {userId}
- {/if}
+
+
+ {#each Object.entries(userResultsById) as [userId, user] (userId)}
+ {@const selectedCount = user.targets.filter(
+ (target) => selected[target.$id]
+ ).length}
+
+
+ 0 &&
+ user.targets.every((target) => targetsById[target.$id])}
+ checked={selectedCount > 0 && selectedCount === user.targets.length}
+ on:change={(event) => onUserSelection(event, userId)} />
+
+
+
+
+ {#if user.name}
+ {user.name}
+ {:else if user.email}
+ {user.email}
+ {:else if user.phone}
+ {user.phone}
+ {:else}
+ {userId}
+ {/if}
+
-
-
-
- ({selectedCount} targets)
-
-
- {#each user.targets as target}
-
-
onTargetSelection(event, target)}>
-
-
-
- {#if target.providerType !== MessagingProviderType.Push}
- {target.identifier}
- {:else}
-
- {target.name}
- {/if}
-
-
-
-
- {/each}
-
-
- {/each}
-
-
+
+
+ ({selectedCount}/{user.targets.length} targets)
+
+
+ {#each user.targets as target}
+
+
onTargetSelection(event, target)}>
+
+
+
+ {#if target.providerType !== MessagingProviderType.Push}
+ {target.identifier}
+ {:else}
+ {target.name}
+ {/if}
+
+
+
+
+ {/each}
+
+
+ {/each}
+
+
+
Total results: {totalResults}
diff --git a/src/routes/console/project-[project]/messaging/wizard/step2.svelte b/src/routes/console/project-[project]/messaging/wizard/step2.svelte
index 80e62c4fc..b7ebda677 100644
--- a/src/routes/console/project-[project]/messaging/wizard/step2.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/step2.svelte
@@ -49,7 +49,6 @@
Targets
-
Select targets to whom this message should be directed.
@@ -102,7 +101,7 @@
type="button"
aria-label="delete"
on:click={() => removeTopic(topicId)}>
-
+
@@ -125,7 +124,7 @@
type="button"
aria-label="delete"
on:click={() => removeTarget(targetId)}>
-
+
diff --git a/src/routes/console/project-[project]/overview/keys/checkbox.svelte b/src/routes/console/project-[project]/overview/keys/checkbox.svelte
index cad6cd09c..4e4553957 100644
--- a/src/routes/console/project-[project]/overview/keys/checkbox.svelte
+++ b/src/routes/console/project-[project]/overview/keys/checkbox.svelte
@@ -1,11 +1,19 @@
-
diff --git a/src/routes/console/project-[project]/settings/migrations/details.svelte b/src/routes/console/project-[project]/settings/migrations/details.svelte
index e21942d15..b34a617e6 100644
--- a/src/routes/console/project-[project]/settings/migrations/details.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/details.svelte
@@ -12,7 +12,7 @@
$: details = migrations.find((migration) => migration.$id === migrationId);
- $: show = !!details;
+ $: show = !!details && migrationId !== null;
type StatusCounters = {
[resource in 'Database' | 'Collection' | 'Function' | 'Users']?: StatusCounter;