diff --git a/package-lock.json b/package-lock.json index cc1b8bf54..63f88cb48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2165,97 +2165,97 @@ ] }, "node_modules/@sentry-internal/feedback": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-7.102.1.tgz", - "integrity": "sha512-vY4hpLLMNLjICtWiizc7KeGbWOTUMGrF7C+9dPCztZww3CLgzWy9A7DvPj5hodRiYzpdRnAMl8yQnMFbYXh7bA==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-7.102.0.tgz", + "integrity": "sha512-GxHdzbOF4tg6TtyQzFqb/8c/p07n68qZC5KYwzs7AuW5ey0IPmdC58pOh3Kk52JA0P69/RZy39+r1p1Swr6C+Q==", "dependencies": { - "@sentry/core": "7.102.1", - "@sentry/types": "7.102.1", - "@sentry/utils": "7.102.1" + "@sentry/core": "7.102.0", + "@sentry/types": "7.102.0", + "@sentry/utils": "7.102.0" }, "engines": { "node": ">=12" } }, "node_modules/@sentry-internal/replay-canvas": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-7.102.1.tgz", - "integrity": "sha512-GUX4RWI10uRjdjeyvCLtAAhWRVqnAnG6+yNxWfqUQ3qMA7B7XxG43KT2UhSnulmErNzODQ6hA68rGPwwYeRIww==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-7.102.0.tgz", + "integrity": "sha512-rgNO4PdFv0AYflBsCNbSIwpQuOOJQTqyu8i8U0PupjveNjkm0CUJhber/ZOcaGmbyjdvwikGwgWY2O0Oj0USCA==", "dependencies": { - "@sentry/core": "7.102.1", - "@sentry/replay": "7.102.1", - "@sentry/types": "7.102.1", - "@sentry/utils": "7.102.1" + "@sentry/core": "7.102.0", + "@sentry/replay": "7.102.0", + "@sentry/types": "7.102.0", + "@sentry/utils": "7.102.0" }, "engines": { "node": ">=12" } }, "node_modules/@sentry-internal/tracing": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.102.1.tgz", - "integrity": "sha512-RkFlFyAC0fQOvBbBqnq0CLmFW5m3JJz9pKbZd5vXPraWAlniKSb1bC/4DF9SlNx0FN1LWG+IU3ISdpzwwTeAGg==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.102.0.tgz", + "integrity": "sha512-BlE33HWL1IzkGa0W+pwTiyu01MUIfYf+WnO9UC8qkDW3jxVvg2zhoSjXSxikT+KPCOgoZpQHspaTzwjnI1LCvw==", "dependencies": { - "@sentry/core": "7.102.1", - "@sentry/types": "7.102.1", - "@sentry/utils": "7.102.1" + "@sentry/core": "7.102.0", + "@sentry/types": "7.102.0", + "@sentry/utils": "7.102.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/browser": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.102.1.tgz", - "integrity": "sha512-7BOfPBiM7Kp6q/iy0JIbsBTxIASV+zWXByqqjuEMWGj3X2u4oRIfm3gv4erPU/l+CORQUVQZLSPGoIoM1gbB/A==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.102.0.tgz", + "integrity": "sha512-hIggcMnojIbWhbmlRfkykHmy6n7pjug0AHfF19HRUQxAx9KJfMH5YdWvohov0Hb9fS+jdvqgE+/4AWbEeXQrHw==", "dependencies": { - "@sentry-internal/feedback": "7.102.1", - "@sentry-internal/replay-canvas": "7.102.1", - "@sentry-internal/tracing": "7.102.1", - "@sentry/core": "7.102.1", - "@sentry/replay": "7.102.1", - "@sentry/types": "7.102.1", - "@sentry/utils": "7.102.1" + "@sentry-internal/feedback": "7.102.0", + "@sentry-internal/replay-canvas": "7.102.0", + "@sentry-internal/tracing": "7.102.0", + "@sentry/core": "7.102.0", + "@sentry/replay": "7.102.0", + "@sentry/types": "7.102.0", + "@sentry/utils": "7.102.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/core": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.102.1.tgz", - "integrity": "sha512-QjY+LSP3du3J/C8x/FfEbRxgZgsWd0jfTJ4P7s9f219I1csK4OeBMC3UA1HwEa0pY/9OF6H/egW2CjOcMM5Pdg==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.102.0.tgz", + "integrity": "sha512-GO9eLOSBK1waW4AD0wDXAreaNqXFQ1MPQZrkKcN+GJYEFhJK1+u+MSV7vO5Fs/rIfaTZIZ2jtEkxSSAOucE8EQ==", "dependencies": { - "@sentry/types": "7.102.1", - "@sentry/utils": "7.102.1" + "@sentry/types": "7.102.0", + "@sentry/utils": "7.102.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/replay": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.102.1.tgz", - "integrity": "sha512-HR/j9dGIvbrId8fh8mQlODx7JrhRmawEd9e9P3laPtogWCg/5TI+XPb2VGSaXOX9VWtb/6Z2UjHsaGjgg6YcuA==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry/replay/-/replay-7.102.0.tgz", + "integrity": "sha512-sUIBN4ZY0J5/dQS3KOe5VLykm856KZkTrhV8kmBEylzQhw1BBc8i2ehTILy5ZYh9Ra8uXPTAmtwpvYf/dRDfAg==", "dependencies": { - "@sentry-internal/tracing": "7.102.1", - "@sentry/core": "7.102.1", - "@sentry/types": "7.102.1", - "@sentry/utils": "7.102.1" + "@sentry-internal/tracing": "7.102.0", + "@sentry/core": "7.102.0", + "@sentry/types": "7.102.0", + "@sentry/utils": "7.102.0" }, "engines": { "node": ">=12" } }, "node_modules/@sentry/svelte": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry/svelte/-/svelte-7.102.1.tgz", - "integrity": "sha512-oXl+28ccsYwGr8DLhK8hfyB4DPJhpBVfqSCC9SOa4aSH5yqaXoCbXPm6yTkFtFY8o3w54OZbXhEAq7qd7Go3iQ==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry/svelte/-/svelte-7.102.0.tgz", + "integrity": "sha512-XWfWbYYIS245x8CeabAgV32W3imaPtpQJy+k+NRbPcoNlANuaJlwXz4ysQia+moB0n7qUMuPAeqJa7WG8Wnfhw==", "dependencies": { - "@sentry/browser": "7.102.1", - "@sentry/core": "7.102.1", - "@sentry/types": "7.102.1", - "@sentry/utils": "7.102.1", + "@sentry/browser": "7.102.0", + "@sentry/core": "7.102.0", + "@sentry/types": "7.102.0", + "@sentry/utils": "7.102.0", "magic-string": "^0.30.0" }, "engines": { @@ -2266,30 +2266,30 @@ } }, "node_modules/@sentry/tracing": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.102.1.tgz", - "integrity": "sha512-9VQEox0R7ouhhUVHtBwlGlXG5beDCM/Uo0BY+G0M1H03aFJsLAwnxPNeWnK3WvPejxf94EgdimKMjDjv9l2Sbg==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.102.0.tgz", + "integrity": "sha512-2ZLgJw43qY7FjRHnnPGp4rOlPpsrcDGcFlnPIVJgfV14b4bfin1kMMeVgHc9O1S+DTfrkakcPnPnOg1qK1qltg==", "dependencies": { - "@sentry-internal/tracing": "7.102.1" + "@sentry-internal/tracing": "7.102.0" }, "engines": { "node": ">=8" } }, "node_modules/@sentry/types": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.102.1.tgz", - "integrity": "sha512-htKorf3t/D0XYtM7foTcmG+rM47rDP6XdbvCcX5gBCuCYlzpM1vqCt2rl3FLktZC6TaIpFRJw1TLfx6m+x5jdA==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.102.0.tgz", + "integrity": "sha512-FPfFBP0x3LkPARw1/6cWySLq1djIo8ao3Qo2KNBeE9CHdq8bsS1a8zzjJLuWG4Ww+wieLP8/lY3WTgrCz4jowg==", "engines": { "node": ">=8" } }, "node_modules/@sentry/utils": { - "version": "7.102.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.102.1.tgz", - "integrity": "sha512-+8WcFjHVV/HROXSAwMuUzveElBFC43EiTG7SNEBNgOUeQzQVTmbUZXyTVgLrUmtoWqvnIxCacoLxtZo1o67kdg==", + "version": "7.102.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.102.0.tgz", + "integrity": "sha512-cp5KCRe0slOVMwG4iP2Z4UajQkjryRTiFskZ5H7Q3X9R5voM8+DAhiDcIW88GL9NxqyUrAJOjmKdeLK2vM+bdA==", "dependencies": { - "@sentry/types": "7.102.1" + "@sentry/types": "7.102.0" }, "engines": { "node": ">=8" @@ -2663,9 +2663,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.11.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.20.tgz", - "integrity": "sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==", + "version": "20.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz", + "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -3758,9 +3758,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001589", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz", - "integrity": "sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==", + "version": "1.0.30001588", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001588.tgz", + "integrity": "sha512-+hVY9jE44uKLkH0SrUTqxjxqNTOWHsbnQDIKjwkZ3lNTzUUVdBLBGXtj/q5Mp5u98r3droaZAewQuEDzjQdZlQ==", "dev": true, "funding": [ { @@ -4351,9 +4351,9 @@ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" }, "node_modules/electron-to-chromium": { - "version": "1.4.680", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.680.tgz", - "integrity": "sha512-4nToZ5jlPO14W82NkF32wyjhYqQByVaDmLy4J2/tYcAbJfgO2TKJC780Az1V13gzq4l73CJ0yuyalpXvxXXD9A==", + "version": "1.4.677", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.677.tgz", + "integrity": "sha512-erDa3CaDzwJOpyvfKhOiJjBVNnMM0qxHq47RheVVwsSQrgBA9ZSGV9kdaOfZDPXcHzhG7lBxhj6A7KvfLJBd6Q==", "dev": true, "peer": true }, @@ -8732,9 +8732,9 @@ } }, "node_modules/svelte": { - "version": "4.2.12", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.12.tgz", - "integrity": "sha512-d8+wsh5TfPwqVzbm4/HCXC783/KPHV60NvwitJnyTA5lWn1elhXMNWhXGCJ7PwPa8qFUnyJNIyuIRt2mT0WMug==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.11.tgz", + "integrity": "sha512-YIQk3J4X89wOLhjsqIW8tqY3JHPuBdtdOIkASP2PZeAMcSW9RsIjQzMesCrxOF3gdWYC0mKknlKF7OqmLM+Zqg==", "dependencies": { "@ampproject/remapping": "^2.2.1", "@jridgewell/sourcemap-codec": "^1.4.15", diff --git a/src/lib/components/trim.svelte b/src/lib/components/trim.svelte index 2d56222c3..27da7d77f 100644 --- a/src/lib/components/trim.svelte +++ b/src/lib/components/trim.svelte @@ -16,16 +16,13 @@ - - {#if showTooltip} - - - - {:else} - - {/if} + + diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 6c4bc26e0..14c49c6e4 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -64,6 +64,11 @@ export const scopes: { description: string; category: string; }[] = [ + { + scope: 'sessions.write', + description: "Access to create, update and delete your project's sessions", + category: 'Auth' + }, { scope: 'users.read', description: "Access to read your project's users", @@ -74,21 +79,6 @@ export const scopes: { description: "Access to create, update, and delete your project's users", category: 'Auth' }, - { - scope: 'sessions.write', - description: "Access to create, update and delete your project's sessions", - category: 'Auth' - }, - { - scope: 'accounts.read', - description: 'Access to read your active account', - category: 'Auth' - }, - { - scope: 'accounts.write', - description: 'Access to create, update and delete your active account', - category: 'Auth' - }, { scope: 'teams.read', description: "Access to read your project's teams", diff --git a/src/lib/elements/forms/inputCheckbox.svelte b/src/lib/elements/forms/inputCheckbox.svelte index e2c09629c..ba4d1037f 100644 --- a/src/lib/elements/forms/inputCheckbox.svelte +++ b/src/lib/elements/forms/inputCheckbox.svelte @@ -11,6 +11,7 @@ element?: HTMLInputElement | undefined; indeterminate?: boolean; wrapperTag?: FormItemTag; + size?: 'small' | 'medium'; } export let id: string; @@ -20,6 +21,7 @@ export let disabled = false; export let element: HTMLInputElement | undefined = undefined; export let wrapperTag: FormItemTag = 'li'; + export let size: $$Props['size'] = 'medium'; let error: string; const handleInvalid = (event: Event) => { @@ -44,6 +46,7 @@ {disabled} {required} {...$$restProps} + class:is-small={size === 'small'} type="checkbox" bind:this={element} bind:checked diff --git a/src/lib/elements/forms/inputDate.svelte b/src/lib/elements/forms/inputDate.svelte index 99ea3482e..95cd6813c 100644 --- a/src/lib/elements/forms/inputDate.svelte +++ b/src/lib/elements/forms/inputDate.svelte @@ -71,7 +71,7 @@ {max} autocomplete={autocomplete ? 'on' : 'off'} type="date" - style="cursor: pointer;" + style={disabled ? '' : 'cursor: pointer;'} class="input-text" bind:value bind:this={element} diff --git a/src/lib/elements/forms/inputTime.svelte b/src/lib/elements/forms/inputTime.svelte index 55322f9ca..2e0caf60b 100644 --- a/src/lib/elements/forms/inputTime.svelte +++ b/src/lib/elements/forms/inputTime.svelte @@ -57,7 +57,7 @@ autocomplete={autocomplete ? 'on' : 'off'} type="time" class="input-text" - style="cursor: pointer;" + style={disabled ? '' : 'cursor: pointer;'} bind:value bind:this={element} on:invalid={handleInvalid} diff --git a/src/routes/console/project-[project]/messaging/actions.svelte b/src/routes/console/project-[project]/messaging/actions.svelte index 9a6542d20..f52264348 100644 --- a/src/routes/console/project-[project]/messaging/actions.svelte +++ b/src/routes/console/project-[project]/messaging/actions.svelte @@ -28,6 +28,7 @@ { @@ -35,10 +36,14 @@ dispatch('addTopics', e.detail); }} /> { showUserTargets = false; dispatch('addTargets', e.detail); - }} /> + }}> + Select existing targets to which you want to send this message. + diff --git a/src/routes/console/project-[project]/messaging/providers/store.ts b/src/routes/console/project-[project]/messaging/providers/store.ts index 9df85042f..c93e5f445 100644 --- a/src/routes/console/project-[project]/messaging/providers/store.ts +++ b/src/routes/console/project-[project]/messaging/providers/store.ts @@ -22,6 +22,7 @@ type ProvidersMap = { classIcon?: string; title: string; description: string; + needAHand?: string[]; configure: { label: string; name: string; @@ -56,6 +57,11 @@ export const providers: ProvidersMap = { imageIcon: 'firebase', title: 'FCM', description: 'Firebase Cloud Messaging', + needAHand: [ + 'Create a Firebase project.', + 'Head to Firebase dashboard -> Settings -> Project settings -> Cloud Messaging.', + "If FCM is disabled, click the three-dots menu and open the link. On the following page, click 'Enable' (it might take a few minutes for the action to complete)." + ], configure: [ { label: 'Service account JSON (.json file)', @@ -355,6 +361,10 @@ export const providers: ProvidersMap = { imageIcon: 'twilio', title: 'Twilio', description: '', + needAHand: [ + 'Create an account in Twilio.', + 'Head to Twilio console -> Get a Twilio phone number.' + ], configure: [ { label: 'Account SID', diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte b/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte index 1fc3860b0..47222cc82 100644 --- a/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte +++ b/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte @@ -9,12 +9,19 @@ InputText, InputPassword } from '$lib/elements/forms'; - import InputPhone from '$lib/elements/forms/inputPhone.svelte'; import { WizardStep } from '$lib/layout'; import { onMount } from 'svelte'; import { providers } from '../store'; import { providerType, provider, providerParams } from './store'; + import { Table, TableBody, TableCell, TableRowButton, TableRowLink } from '$lib/elements/table'; + import { newMemberModal } from '$lib/stores/organization'; + import CreateMember from '$routes/console/organization-[organization]/createMember.svelte'; + import Collapsible from '$lib/components/collapsible.svelte'; + import CollapsibleItem from '$lib/components/collapsibleItem.svelte'; + import Provider from '../../provider.svelte'; + import { MessagingProviderType } from '@appwrite.io/console'; + import ProviderTypeComponent from '$routes/console/project-[project]/messaging/providerType.svelte'; let files: Record = {}; const inputs = providers[$providerType].providers[$provider].configure; @@ -154,27 +161,84 @@ {/each} -

Need a hand?

+
+

Need a hand?

-
-
-
-
-
+ {/if} -
-
-
-
- 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;