Skip to content

Update topics modal text #847

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 22, 2024
Merged

Update topics modal text #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc92fbc
feat(messaging): update topics modal text
stnguyen90 Feb 22, 2024
4b14119
fix(messaging): fix font size and color in topics modal
stnguyen90 Feb 22, 2024
4cd9fdc
feat(messaging): only show topics that have related subscribers
stnguyen90 Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/routes/console/project-[project]/messaging/actions.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
</DropList>

<TopicsModal
{providerType}
bind:show={showTopics}
bind:topicsById={$topicsById}
on:update={(e) => {
Expand Down
23 changes: 17 additions & 6 deletions src/routes/console/project-[project]/messaging/topicsModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, Models.Topic>;
export let title = 'Select topics';
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -83,8 +92,8 @@

<Modal {title} bind:show onSubmit={submit} on:close={reset} headerDivider={false} size="big">
<p class="text">
Select existing topics you want to send this message to its subscribers. The message will be
sent only to <ProviderType type={$providerType} noIcon /> targets.
Select existing topics you want to send this message to its targets. The message will be
sent only to <ProviderType type={providerType} noIcon /> targets.
</p>
<InputSearch
autofocus
Expand All @@ -106,10 +115,12 @@
<svelte:fragment slot="description">
<span class="title">
<span class="u-line-height-1-5">
<span class="body-text-2 u-bold" data-private>
<span class="body-text-1 u-bold" data-private>
{topic.name}
</span>
<span class="collapsible-button-optional">
<span
class="collapsible-button-optional"
style="--p-toggle-optional-color: var(--color-neutral-50);">
({getTotal(topic)} subscribers)
</span>
</span></span>
Expand Down