From 8485e38c33ed46f82e3c0ae2f2613e89f4c8149b Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 29 May 2025 11:27:35 +0200 Subject: [PATCH] fix: domain screens --- .../domain-[domain]/addPresetModal.svelte | 18 ++++++++++++------ .../domain-[domain]/domainMetrics.svelte | 7 ++++++- .../domains/domain-[domain]/store.ts | 6 +++--- .../domains/domain-[domain]/table.svelte | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/addPresetModal.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/addPresetModal.svelte index 5305ee2b7..566c919b9 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/addPresetModal.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/addPresetModal.svelte @@ -20,17 +20,23 @@ async function fetchPreset() { switch (selectedPreset.toLowerCase()) { case 'zoho': - return await sdk.forConsole.domains.getPresetZoho(page.params.domain); + records = await sdk.forConsole.domains.getPresetZoho(page.params.domain); + return records; case 'mailgun': - return await sdk.forConsole.domains.getPresetMailgun(page.params.domain); + records = await sdk.forConsole.domains.getPresetMailgun(page.params.domain); + return records; case 'outlook': - return await sdk.forConsole.domains.getPresetOutlook(page.params.domain); + records = await sdk.forConsole.domains.getPresetOutlook(page.params.domain); + return records; case 'proton mail': - return await sdk.forConsole.domains.getPresetProtonMail(page.params.domain); + records = await sdk.forConsole.domains.getPresetProtonMail(page.params.domain); + return records; case 'icloud': - return await sdk.forConsole.domains.getPresetICloud(page.params.domain); + records = await sdk.forConsole.domains.getPresetICloud(page.params.domain); + return records; case 'google workspace': - return await sdk.forConsole.domains.getPresetGoogleWorkspace(page.params.domain); + records = await sdk.forConsole.domains.getPresetGoogleWorkspace(page.params.domain); + return records; } } diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte index 7743e790c..fbde9ac6b 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/domainMetrics.svelte @@ -27,7 +27,12 @@ description: 'Expiry date' }, { - value: domain?.autoRenewal ? 'On' : 'Off', + value: + domain?.registrar?.toLocaleLowerCase() === 'appwrite' + ? domain?.autoRenewal + ? 'On' + : 'Off' + : '-', description: 'Auto renewal' }, { diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts index cba5cf5ae..85493f072 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/store.ts @@ -5,13 +5,13 @@ import { derived, writable } from 'svelte/store'; export const domain = derived(page, ($page) => $page.data.domain as Domain); export const columns = writable([ - { id: 'name', title: 'Name', type: 'string', width: 150 }, + { id: 'name', title: 'Name', type: 'string', width: { min: 150 } }, { id: 'type', title: 'Type', type: 'string', width: 125 }, { id: 'value', title: 'Value', type: 'string', width: 250 }, { id: 'ttl', title: 'TTL', type: 'integer', width: 100 }, { id: 'priority', title: 'Priority', type: 'integer', width: 80, hide: true }, - { id: 'comment', title: 'Comment', type: 'string', width: 200, hide: true }, - { id: '$createdAt', title: 'Created', type: 'datetime' } + { id: 'comment', title: 'Comment', type: 'string', width: { min: 180 } }, + { id: '$createdAt', title: 'Created', type: 'datetime', width: { min: 120 } } ]); export const recordTypes = [ diff --git a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte index fa6f59d80..47c023ec7 100644 --- a/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte +++ b/src/routes/(console)/organization-[organization]/domains/domain-[domain]/table.svelte @@ -73,7 +73,7 @@ {record?.priority ?? '-'} {:else if column.id === 'comment'} - + {record?.comment ?? '-'} {:else if column.id === '$createdAt'}