diff --git a/package-lock.json b/package-lock.json
index 3cb51c8c5..1a99fd57e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,7 +6,7 @@
"": {
"name": "@appwrite/console",
"dependencies": {
- "@appwrite.io/console": "^0.6.0-rc.13",
+ "@appwrite.io/console": "^0.6.0-rc.14",
"@appwrite.io/pink": "0.4.0",
"@appwrite.io/pink-icons": "0.4.0",
"@popperjs/core": "^2.11.8",
@@ -158,9 +158,9 @@
"integrity": "sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg=="
},
"node_modules/@appwrite.io/console": {
- "version": "0.6.0-rc.13",
- "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.0-rc.13.tgz",
- "integrity": "sha512-/c+HGkqdqWjjlzVgOmC6vb4t2jsHgbmX/aaDLoQHXFmaakEDWzK1cgVYRHoU3o14xIEpBupteh3KzOoqdLvvsQ==",
+ "version": "0.6.0-rc.14",
+ "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.6.0-rc.14.tgz",
+ "integrity": "sha512-7Od0RuGRF01YUCWGTAvlTvgUG7sUCVHG9ig11OKz9jjBxE91BVcWsmqGWiXw+xb4HhF2jiyHd9ZU3sKAo0IC3w==",
"dependencies": {
"cross-fetch": "3.1.5",
"isomorphic-form-data": "2.0.0"
diff --git a/package.json b/package.json
index 07f589ab2..ba7717f02 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"e2e": "playwright test tests/e2e"
},
"dependencies": {
- "@appwrite.io/console": "^0.6.0-rc.13",
+ "@appwrite.io/console": "^0.6.0-rc.14",
"@appwrite.io/pink": "0.4.0",
"@appwrite.io/pink-icons": "0.4.0",
"@popperjs/core": "^2.11.8",
diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte
index 06322677f..78c1645e9 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMfa.svelte
@@ -15,7 +15,7 @@
async function deleteProvider() {
try {
- await sdk.forConsole.users.deleteAuthenticator($user.$id, AuthenticatorType.Totp, '');
+ await sdk.forConsole.users.deleteAuthenticator($user.$id, AuthenticatorType.Totp);
await invalidate(Dependencies.ACCOUNT);
await invalidate(Dependencies.FACTORS);
showDelete = false;
diff --git a/src/routes/console/project-[project]/messaging/+page.svelte b/src/routes/console/project-[project]/messaging/+page.svelte
index ff96c206e..e27bd3f07 100644
--- a/src/routes/console/project-[project]/messaging/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/+page.svelte
@@ -28,7 +28,7 @@
} from '$lib/elements/table';
import { toLocaleDateTime } from '$lib/helpers/date';
import { Container } from '$lib/layout';
- import { MessageStatus, MessagingProviderType } from '@appwrite.io/console';
+ import { MessagingProviderType } from '@appwrite.io/console';
import type { PageData } from './$types';
import CreateMessageDropdown from './createMessageDropdown.svelte';
import FailedModal from './failedModal.svelte';
@@ -141,7 +141,7 @@
+ disabled={message.status === 'processing'} />
{#each $columns as column (column.id)}
{#if column.show}
diff --git a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
index 8bcefdc55..0f24f99f8 100644
--- a/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/message-[message]/+page.svelte
@@ -12,7 +12,7 @@
import Wizard from '../wizard.svelte';
import type { PageData } from './$types';
import { isValueOfStringEnum } from '$lib/helpers/types';
- import { MessageStatus, MessagingProviderType } from '@appwrite.io/console';
+ import { MessagingProviderType } from '@appwrite.io/console';
import Topics from './topics.svelte';
import Targets from './targets.svelte';
@@ -35,7 +35,7 @@
topics: $message.topics,
users: $message.users,
targets: $message.targets,
- status: MessageStatus.Draft,
+ draft: $message.status === 'draft',
scheduledAt: $message.scheduledAt
};
@@ -98,21 +98,15 @@
{#if $message.providerType === MessagingProviderType.Email}
-
+
{:else if $message.providerType === MessagingProviderType.Sms}
-
+
{:else if $message.providerType === MessagingProviderType.Push}
-
+
{/if}
- {#if $message.status !== MessageStatus.Processing}
+ {#if $message.status !== 'processing'}
{/if}
diff --git a/src/routes/console/project-[project]/messaging/wizard.svelte b/src/routes/console/project-[project]/messaging/wizard.svelte
index 4fbc93c55..9ee98b32c 100644
--- a/src/routes/console/project-[project]/messaging/wizard.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard.svelte
@@ -12,7 +12,7 @@
import { project } from '../store';
import { wizard } from '$lib/stores/wizard';
import { providerType, messageParams, operation } from './wizard/store';
- import { ID, MessageStatus, MessagingProviderType, type Models } from '@appwrite.io/console';
+ import { ID, MessagingProviderType, type Models } from '@appwrite.io/console';
import { Dependencies } from '$lib/constants';
async function create() {
@@ -32,7 +32,7 @@
undefined,
undefined,
undefined,
- $messageParams[$providerType].status,
+ $messageParams[$providerType].draft,
$messageParams[$providerType].html,
$messageParams[$providerType].scheduledAt
);
@@ -44,7 +44,7 @@
$messageParams[$providerType].topics,
$messageParams[$providerType].users,
$messageParams[$providerType].targets,
- $messageParams[$providerType].status,
+ $messageParams[$providerType].draft,
$messageParams[$providerType].scheduledAt
);
break;
@@ -74,7 +74,7 @@
undefined,
undefined,
undefined,
- $messageParams[$providerType].status,
+ $messageParams[$providerType].draft,
$messageParams[$providerType].scheduledAt
);
}
@@ -83,14 +83,13 @@
wizard.hide();
let message = '';
switch (response.status) {
- case MessageStatus.Draft:
+ case 'draft':
message = 'The message has been saved as draft.';
break;
- case MessageStatus.Processing:
+ case 'processing':
message = 'The message is queued for processing.';
break;
case 'scheduled':
- // TODO: fix message status
message = 'The message has been scheduled.';
break;
}
@@ -131,7 +130,7 @@
$messageParams[$providerType].targets,
$messageParams[$providerType].subject,
$messageParams[$providerType].content,
- $messageParams[$providerType].status,
+ $messageParams[$providerType].draft,
$messageParams[$providerType].html,
undefined,
undefined,
@@ -145,7 +144,7 @@
$messageParams[$providerType].users,
$messageParams[$providerType].targets,
$messageParams[$providerType].content,
- $messageParams[$providerType].status,
+ $messageParams[$providerType].draft,
$messageParams[$providerType].scheduledAt
);
break;
@@ -175,7 +174,7 @@
undefined,
undefined,
undefined,
- $messageParams[$providerType].status,
+ $messageParams[$providerType].draft,
$messageParams[$providerType].scheduledAt
);
}
@@ -184,14 +183,13 @@
wizard.hide();
let message = '';
switch (response.status) {
- case MessageStatus.Draft:
+ case 'draft':
message = 'The message has been saved as draft.';
break;
- case MessageStatus.Processing:
+ case 'processing':
message = 'The message is queued for processing.';
break;
case 'scheduled':
- // TODO: fix message status
message = 'The message has been scheduled.';
break;
}
@@ -202,7 +200,7 @@
await invalidate(Dependencies.MESSAGING_MESSAGE);
trackEvent(Submit.MessagingMessageUpdate, {
providerType: $providerType,
- status: params.status
+ status: response.status
});
await goto(`${base}/console/project-${$project.$id}/messaging/message-${response.$id}`);
} catch (error) {
@@ -215,7 +213,7 @@
}
async function saveDraft() {
- $messageParams[$providerType].status = MessageStatus.Draft;
+ $messageParams[$providerType].draft = true;
if ($operation === 'create') {
create();
} else {
diff --git a/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte
index bcc6be1d6..3de535a53 100644
--- a/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/emailFormList.svelte
@@ -13,7 +13,7 @@
import { CustomId, Modal } from '$lib/components';
import { user } from '$lib/stores/user';
import { clickOnEnter } from '$lib/helpers/a11y';
- import { ID, MessageStatus, MessagingProviderType } from '@appwrite.io/console';
+ import { ID, MessagingProviderType } from '@appwrite.io/console';
import { sdk } from '$lib/stores/sdk';
let showCustomId = false;
@@ -36,7 +36,7 @@
undefined,
undefined,
undefined,
- MessageStatus.Processing,
+ undefined,
$messageParams[MessagingProviderType.Email]?.html || false,
undefined
);
diff --git a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte
index 53c48900c..8a81efc16 100644
--- a/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/pushFormList.svelte
@@ -41,7 +41,7 @@
import { CustomId, Modal } from '$lib/components';
import { user } from '$lib/stores/user';
import { clickOnEnter } from '$lib/helpers/a11y';
- import { ID, MessageStatus, MessagingProviderType } from '@appwrite.io/console';
+ import { ID, MessagingProviderType } from '@appwrite.io/console';
import { sdk } from '$lib/stores/sdk';
import PushPhone from '../pushPhone.svelte';
import { onMount } from 'svelte';
@@ -76,7 +76,7 @@
undefined,
undefined,
undefined,
- MessageStatus.Processing,
+ undefined,
undefined
);
}
diff --git a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte b/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte
index 5627dcd5c..dac09f2fb 100644
--- a/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/smsFormList.svelte
@@ -5,7 +5,7 @@
import { CustomId, Modal } from '$lib/components';
import { user } from '$lib/stores/user';
import { clickOnEnter } from '$lib/helpers/a11y';
- import { ID, MessageStatus, MessagingProviderType } from '@appwrite.io/console';
+ import { ID, MessagingProviderType } from '@appwrite.io/console';
import { sdk } from '$lib/stores/sdk';
import SMSPhone from '../smsPhone.svelte';
@@ -24,7 +24,7 @@
$messageParams[MessagingProviderType.Sms]?.topics || [],
$messageParams[MessagingProviderType.Sms]?.users || [],
$messageParams[MessagingProviderType.Sms]?.targets || [],
- MessageStatus.Processing,
+ undefined,
undefined
);
}
diff --git a/src/routes/console/project-[project]/messaging/wizard/step3.svelte b/src/routes/console/project-[project]/messaging/wizard/step3.svelte
index ba2e7be3b..29059d029 100644
--- a/src/routes/console/project-[project]/messaging/wizard/step3.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/step3.svelte
@@ -2,7 +2,7 @@
import { Button, FormList, InputDate, InputSelect, InputTime } from '$lib/elements/forms';
import Helper from '$lib/elements/forms/helper.svelte';
import { WizardStep } from '$lib/layout';
- import { MessageStatus, MessagingProviderType } from '@appwrite.io/console';
+ import { MessagingProviderType } from '@appwrite.io/console';
import { messageParams, providerType } from './store';
let when: 'now' | 'later' = 'now';
@@ -41,9 +41,7 @@
};
async function beforeSubmit() {
- $messageParams[$providerType].status = MessageStatus.Processing;
if (when === 'later') {
- $messageParams[$providerType].status = 'scheduled' as MessageStatus;
$messageParams[$providerType].scheduledAt = dateTime.toISOString();
}
}
diff --git a/src/routes/console/project-[project]/messaging/wizard/store.ts b/src/routes/console/project-[project]/messaging/wizard/store.ts
index e710f7278..9a8457adf 100644
--- a/src/routes/console/project-[project]/messaging/wizard/store.ts
+++ b/src/routes/console/project-[project]/messaging/wizard/store.ts
@@ -1,4 +1,4 @@
-import { MessageStatus, MessagingProviderType, type Models } from '@appwrite.io/console';
+import { MessagingProviderType, type Models } from '@appwrite.io/console';
import { get, writable } from 'svelte/store';
export type MessageParams = {
@@ -6,7 +6,7 @@ export type MessageParams = {
topics: string[];
users: string[];
targets: string[];
- status: MessageStatus;
+ draft: boolean;
scheduledAt?: string;
};