From 40483fea1aa0be029bf63bf3d59867e555a0864b Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 16:00:09 +0530
Subject: [PATCH 01/23] add: logic for tld, apex domain checks.

---
 package.json                                     |  3 ++-
 pnpm-lock.yaml                                   | 16 ++++++++++++++++
 src/lib/helpers/tlds.ts                          |  8 ++++++++
 .../domains/add-domain/+page.svelte              |  9 ++++-----
 .../settings/domains/add-domain/+page.svelte     |  9 ++++-----
 .../site-[site]/domains/add-domain/+page.svelte  |  9 ++++-----
 6 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 src/lib/helpers/tlds.ts

diff --git a/package.json b/package.json
index 851cb4490..83b7b7981 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,8 @@
         "typescript": "^5.8.2",
         "typescript-eslint": "^8.30.1",
         "vite": "^6.2.3",
-        "vitest": "^3.0.0"
+        "vitest": "^3.0.0",
+        "tldts": "^7.0.7"
     },
     "pnpm": {
         "onlyBuiltDependencies": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 92351d55c..b14eb716f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -177,6 +177,9 @@ importers:
       svelte-sequential-preprocessor:
         specifier: ^2.0.2
         version: 2.0.2
+      tldts:
+        specifier: ^7.0.7
+        version: 7.0.7
       tslib:
         specifier: ^2.8.1
         version: 2.8.1
@@ -3239,10 +3242,17 @@ packages:
   tldts-core@6.1.85:
     resolution: {integrity: sha512-DTjUVvxckL1fIoPSb3KE7ISNtkWSawZdpfxGxwiIrZoO6EbHVDXXUIlIuWympPaeS+BLGyggozX/HTMsRAdsoA==}
 
+  tldts-core@7.0.7:
+    resolution: {integrity: sha512-ECqb8imSroX1UmUuhRBNPkkmtZ8mHEenieim80UVxG0M5wXVjY2Fp2tYXCPvk+nLy1geOhFpeD5YQhM/gF63Jg==}
+
   tldts@6.1.85:
     resolution: {integrity: sha512-gBdZ1RjCSevRPFix/hpaUWeak2/RNUZB4/8frF1r5uYMHjFptkiT0JXIebWvgI/0ZHXvxaUDDJshiA0j6GdL3w==}
     hasBin: true
 
+  tldts@7.0.7:
+    resolution: {integrity: sha512-ETNXj36ql5BXDa4VVJk3wgqansg8TI1Yqo217twSAPjyDnh/b2T+XzrI0ftn6EnzVPbXpMTZHOWj5s3a8/uGPA==}
+    hasBin: true
+
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -6834,10 +6844,16 @@ snapshots:
 
   tldts-core@6.1.85: {}
 
+  tldts-core@7.0.7: {}
+
   tldts@6.1.85:
     dependencies:
       tldts-core: 6.1.85
 
+  tldts@7.0.7:
+    dependencies:
+      tldts-core: 7.0.7
+
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
diff --git a/src/lib/helpers/tlds.ts b/src/lib/helpers/tlds.ts
new file mode 100644
index 000000000..d7421b0d2
--- /dev/null
+++ b/src/lib/helpers/tlds.ts
@@ -0,0 +1,8 @@
+import { parse } from 'tldts';
+
+/**
+ * Returns the apex/root domain from a full domain string.
+ */
+export function getApexDomain(domain: string): string {
+    return parse(domain).domain;
+}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
index dd26bd21f..f2df1d77f 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
@@ -20,6 +20,7 @@
     import { isValueOfStringEnum } from '$lib/helpers/types.js';
     import { isCloud } from '$lib/system';
     import { project } from '$routes/(console)/project-[region]-[project]/store';
+    import { getApexDomain } from '$lib/helpers/tlds';
 
     const routeBase = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/domains`;
 
@@ -47,14 +48,12 @@
     });
 
     async function addDomain() {
-        let domain = data.domains?.domains.find((d) => d.domain === domainName);
+        const apexDomain = getApexDomain(domain);
+        let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
         if (!domain && isCloud) {
             try {
-                domain = await sdk.forConsole.domains.create(
-                    $project.teamId,
-                    domainName.toLocaleLowerCase()
-                );
+                domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
             } catch (error) {
                 addNotification({
                     type: 'error',
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
index 09ff91999..49091e243 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
@@ -11,6 +11,7 @@
     import { onMount } from 'svelte';
     import { isCloud } from '$lib/system';
     import { project } from '$routes/(console)/project-[region]-[project]/store';
+    import { getApexDomain } from '$lib/helpers/tlds';
 
     const routeBase = `${base}/project-${page.params.region}-${page.params.project}/settings/domains`;
 
@@ -27,14 +28,12 @@
     });
 
     async function addDomain() {
-        let domain = data.domains?.domains.find((d) => d.domain === domainName);
+        const apexDomain = getApexDomain(domain);
+        let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
         if (!domain && isCloud) {
             try {
-                domain = await sdk.forConsole.domains.create(
-                    $project.teamId,
-                    domainName.toLocaleLowerCase()
-                );
+                domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
             } catch (error) {
                 addNotification({
                     type: 'error',
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index 3b053e49f..c50094ae8 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -25,6 +25,7 @@
     import { ConnectRepoModal } from '$lib/components/git/index.js';
     import { project } from '$routes/(console)/project-[region]-[project]/store';
     import { isCloud } from '$lib/system';
+    import { getApexDomain } from '$lib/helpers/tlds';
 
     const routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`;
 
@@ -52,14 +53,12 @@
     });
 
     async function addDomain() {
-        let domain = data.domains?.domains.find((d) => d.domain === domainName);
+        const apexDomain = getApexDomain(domain);
+        let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
         if (!domain && isCloud) {
             try {
-                domain = await sdk.forConsole.domains.create(
-                    $project.teamId,
-                    domainName.toLocaleLowerCase()
-                );
+                domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
             } catch (error) {
                 addNotification({
                     type: 'error',

From 417feedeffaa3ddb6b26484c25b717941c4617cd Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 16:46:25 +0530
Subject: [PATCH 02/23] update: var names.

---
 .../function-[function]/domains/add-domain/+page.svelte       | 2 +-
 .../settings/domains/add-domain/+page.svelte                  | 4 ++--
 .../sites/site-[site]/domains/add-domain/+page.svelte         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
index f2df1d77f..8e70f0618 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
@@ -48,7 +48,7 @@
     });
 
     async function addDomain() {
-        const apexDomain = getApexDomain(domain);
+        const apexDomain = getApexDomain(domainName);
         let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
         if (!domain && isCloud) {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
index 49091e243..1eb1695e6 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
@@ -28,7 +28,7 @@
     });
 
     async function addDomain() {
-        const apexDomain = getApexDomain(domain);
+        const apexDomain = getApexDomain(domainName);
         let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
         if (!domain && isCloud) {
@@ -47,7 +47,7 @@
         try {
             const rule = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.createAPIRule(domainName);
+                .proxy.createAPIRule(domainName.toLocaleLowerCase());
             if (rule?.status === 'verified') {
                 await goto(routeBase);
                 await invalidate(Dependencies.DOMAINS);
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index c50094ae8..ce7ff80ec 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -53,7 +53,7 @@
     });
 
     async function addDomain() {
-        const apexDomain = getApexDomain(domain);
+        const apexDomain = getApexDomain(domainName);
         let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
         if (!domain && isCloud) {

From a0eeee5ee873a516842c5e220c1edf218be948df Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 17:01:34 +0530
Subject: [PATCH 03/23] improve: subdomain logic.

---
 src/lib/helpers/tlds.ts                           | 15 ++++++++++++++-
 .../add-domain/verify-[domain]/+page.svelte       |  3 ++-
 .../add-domain/verify-[domain]/+page.svelte       |  3 ++-
 .../add-domain/verify-[domain]/+page.svelte       |  4 +++-
 .../site-[site]/domains/retryDomainModal.svelte   |  5 ++---
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/lib/helpers/tlds.ts b/src/lib/helpers/tlds.ts
index d7421b0d2..7eb8e32cc 100644
--- a/src/lib/helpers/tlds.ts
+++ b/src/lib/helpers/tlds.ts
@@ -4,5 +4,18 @@ import { parse } from 'tldts';
  * Returns the apex/root domain from a full domain string.
  */
 export function getApexDomain(domain: string): string {
-    return parse(domain).domain;
+    return parse(domain).domain || '';
+}
+
+/**
+ * Checks whether the given domain is a subdomain.
+ */
+export function isASubdomain(domain: string | null): boolean {
+    if (!domain) return false;
+
+    const { domain: apex, subdomain } = parse(domain);
+    if (!apex) return false;
+    if (subdomain === 'www') return false;
+
+    return !!subdomain;
 }
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
index f8b03eb86..9e3cac8f3 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
@@ -20,6 +20,7 @@
     import Wizard from '$lib/layout/wizard.svelte';
     import { base } from '$app/paths';
     import { writable } from 'svelte/store';
+    import { isASubdomain } from '$lib/helpers/tlds';
     import { consoleVariables } from '$routes/(console)/store';
     import NameserverTable from '$lib/components/domains/nameserverTable.svelte';
     import RecordTable from '$lib/components/domains/recordTable.svelte';
@@ -27,7 +28,7 @@
     let { data } = $props();
 
     const ruleId = page.url.searchParams.get('rule');
-    let isSubDomain = $derived(page.params.domain?.split('.')?.length >= 3);
+    let isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
     $effect(() => {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
index ac027c30b..9de063361 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
@@ -20,6 +20,7 @@
     import Wizard from '$lib/layout/wizard.svelte';
     import { base } from '$app/paths';
     import { writable } from 'svelte/store';
+    import { isASubdomain } from '$lib/helpers/tlds';
     import { consoleVariables } from '$routes/(console)/store';
     import NameserverTable from '$lib/components/domains/nameserverTable.svelte';
     import RecordTable from '$lib/components/domains/recordTable.svelte';
@@ -27,7 +28,7 @@
     let { data } = $props();
 
     const ruleId = page.url.searchParams.get('rule');
-    let isSubDomain = $derived(page.params.domain?.split('.')?.length >= 3);
+    let isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
     $effect(() => {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
index cc27aa40b..236abcbfb 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
@@ -20,6 +20,7 @@
     import Wizard from '$lib/layout/wizard.svelte';
     import { base } from '$app/paths';
     import { writable } from 'svelte/store';
+    import { isASubdomain } from '$lib/helpers/tlds';
     import { consoleVariables } from '$routes/(console)/store';
     import NameserverTable from '$lib/components/domains/nameserverTable.svelte';
     import RecordTable from '$lib/components/domains/recordTable.svelte';
@@ -27,9 +28,10 @@
     let { data } = $props();
 
     const ruleId = page.url.searchParams.get('rule');
-    let isSubDomain = $derived(page.params.domain?.split('.')?.length >= 3);
+    let isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
+
     $effect(() => {
         if ($consoleVariables._APP_DOMAIN_TARGET_CNAME && isSubDomain) {
             selectedTab = 'cname';
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
index f18c1b664..0b1981d9e 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
@@ -11,6 +11,7 @@
     import { consoleVariables } from '$routes/(console)/store';
     import { isCloud } from '$lib/system';
     import { page } from '$app/state';
+    import { isASubdomain } from '$lib/helpers/tlds';
     import NameserverTable from '$lib/components/domains/nameserverTable.svelte';
     import RecordTable from '$lib/components/domains/recordTable.svelte';
 
@@ -22,9 +23,7 @@
         selectedDomain: Models.ProxyRule;
     } = $props();
 
-    let isSubDomain = $derived.by(() =>
-        selectedDomain?.domain?.length ? selectedDomain?.domain?.split('.')?.length >= 3 : false
-    );
+    let isSubDomain = $derived.by(() => isASubdomain(selectedDomain?.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
     $effect(() => {

From f5501f30a57f72bc932e5a470d83a923bdff4084 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 17:13:33 +0530
Subject: [PATCH 04/23] address comments.

---
 src/lib/helpers/tlds.ts                                       | 4 ++--
 .../function-[function]/domains/add-domain/+page.svelte       | 2 +-
 .../domains/add-domain/verify-[domain]/+page.svelte           | 2 +-
 .../settings/domains/add-domain/+page.svelte                  | 2 +-
 .../settings/domains/add-domain/verify-[domain]/+page.svelte  | 2 +-
 .../sites/site-[site]/domains/add-domain/+page.svelte         | 2 +-
 .../domains/add-domain/verify-[domain]/+page.svelte           | 2 +-
 .../sites/site-[site]/domains/retryDomainModal.svelte         | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/helpers/tlds.ts b/src/lib/helpers/tlds.ts
index 7eb8e32cc..d4eaecfbc 100644
--- a/src/lib/helpers/tlds.ts
+++ b/src/lib/helpers/tlds.ts
@@ -3,8 +3,8 @@ import { parse } from 'tldts';
 /**
  * Returns the apex/root domain from a full domain string.
  */
-export function getApexDomain(domain: string): string {
-    return parse(domain).domain || '';
+export function getApexDomain(domain: string): string|null {
+    return parse(domain).domain;
 }
 
 /**
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
index 8e70f0618..e7a55a956 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
@@ -51,7 +51,7 @@
         const apexDomain = getApexDomain(domainName);
         let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
-        if (!domain && isCloud) {
+        if (apexDomain && !domain && isCloud) {
             try {
                 domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
             } catch (error) {
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
index 9e3cac8f3..be84fec9f 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
@@ -28,7 +28,7 @@
     let { data } = $props();
 
     const ruleId = page.url.searchParams.get('rule');
-    let isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
+    const isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
     $effect(() => {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
index 1eb1695e6..781c68bb2 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte
@@ -31,7 +31,7 @@
         const apexDomain = getApexDomain(domainName);
         let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
-        if (!domain && isCloud) {
+        if (apexDomain && !domain && isCloud) {
             try {
                 domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
             } catch (error) {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
index 9de063361..9866c94f0 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
@@ -28,7 +28,7 @@
     let { data } = $props();
 
     const ruleId = page.url.searchParams.get('rule');
-    let isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
+    const isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
     $effect(() => {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index ce7ff80ec..c57b7c2b6 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -56,7 +56,7 @@
         const apexDomain = getApexDomain(domainName);
         let domain = data.domains?.domains.find((d) => d.domain === apexDomain);
 
-        if (!domain && isCloud) {
+        if (apexDomain && !domain && isCloud) {
             try {
                 domain = await sdk.forConsole.domains.create($project.teamId, apexDomain);
             } catch (error) {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
index 236abcbfb..108d34030 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
@@ -28,7 +28,7 @@
     let { data } = $props();
 
     const ruleId = page.url.searchParams.get('rule');
-    let isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
+    const isSubDomain = $derived.by(() => isASubdomain(page.params.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
 
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
index 0b1981d9e..389cbc2f7 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
@@ -23,7 +23,7 @@
         selectedDomain: Models.ProxyRule;
     } = $props();
 
-    let isSubDomain = $derived.by(() => isASubdomain(selectedDomain?.domain));
+    const isSubDomain = $derived.by(() => isASubdomain(selectedDomain?.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
     $effect(() => {

From b18aa1ccb55e672918866b72b1000bdf8f720ea6 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 17:15:10 +0530
Subject: [PATCH 05/23] lint.

---
 src/lib/helpers/tlds.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/helpers/tlds.ts b/src/lib/helpers/tlds.ts
index d4eaecfbc..23adffb4c 100644
--- a/src/lib/helpers/tlds.ts
+++ b/src/lib/helpers/tlds.ts
@@ -3,7 +3,7 @@ import { parse } from 'tldts';
 /**
  * Returns the apex/root domain from a full domain string.
  */
-export function getApexDomain(domain: string): string|null {
+export function getApexDomain(domain: string): string | null {
     return parse(domain).domain;
 }
 

From 814723baf229aaa00a9156996e730b7e2eb275cd Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Thu, 22 May 2025 14:09:36 +0200
Subject: [PATCH 06/23] feat: use combobox for branch inputs

---
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 43 ++++++++++---------
 .../(modals)/createGit.svelte                 | 18 +++++---
 .../createGitDeploymentModal.svelte           | 18 +++++---
 .../domains/add-domain/+page.svelte           | 14 +++---
 5 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/package.json b/package.json
index 851cb4490..4c468640b 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
         "@appwrite.io/pink-legacy": "^1.0.3",
-        "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67c988c",
+        "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9",
         "@popperjs/core": "^2.11.8",
         "@sentry/sveltekit": "^8.38.0",
         "@stripe/stripe-js": "^3.5.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 92351d55c..9ef86d116 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,13 +22,13 @@ importers:
         version: 0.25.0
       '@appwrite.io/pink-icons-svelte':
         specifier: ^2.0.0-RC.1
-        version: 2.0.0-RC.1(svelte@5.25.3)
+        version: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@12707b9(svelte@5.25.3)
       '@appwrite.io/pink-legacy':
         specifier: ^1.0.3
         version: 1.0.3
       '@appwrite.io/pink-svelte':
-        specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67c988c
-        version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67c988c(svelte@5.25.3)
+        specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9
+        version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9(svelte@5.25.3)
       '@popperjs/core':
         specifier: ^2.11.8
         version: 2.11.8
@@ -258,13 +258,14 @@ packages:
     resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959}
     version: 1.5.2
 
-  '@appwrite.io/pink-icons-svelte@2.0.0-RC.1':
-    resolution: {integrity: sha512-iLFlV55hj8mGuAbmxJGenxN5RaZMmVT4GJb9dv/MP1xBAtYibFq7JvBcxm18qV2KU8c31Rntf+Ub4GL7HwqTYg==}
+  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@12707b95033c5822745ec6a2250a9cd0de10a498':
+    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@12707b95033c5822745ec6a2250a9cd0de10a498}
+    version: 2.0.0-RC.1
     peerDependencies:
       svelte: ^4.0.0
 
-  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@67c988c04de3464a9c39630fd798e2316d157fea':
-    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@67c988c04de3464a9c39630fd798e2316d157fea}
+  '@appwrite.io/pink-icons-svelte@https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@12707b9':
+    resolution: {tarball: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@12707b9}
     version: 2.0.0-RC.1
     peerDependencies:
       svelte: ^4.0.0
@@ -278,8 +279,8 @@ packages:
   '@appwrite.io/pink-legacy@1.0.3':
     resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==}
 
-  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67c988c':
-    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67c988c}
+  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9':
+    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9}
     version: 2.0.0-RC.2
     peerDependencies:
       svelte: ^4.0.0
@@ -1340,8 +1341,8 @@ packages:
   '@types/prop-types@15.7.14':
     resolution: {integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==}
 
-  '@types/react@18.3.20':
-    resolution: {integrity: sha512-IPaCZN7PShZK/3t6Q87pfTkRm6oLTd4vztyoj+cbHUF1g3FfVb2tFIL79uCRKEfv16AhqDMBywP2VW3KIZUvcg==}
+  '@types/react@18.3.22':
+    resolution: {integrity: sha512-vUhG0YmQZ7kL/tmKLrD3g5zXbXXreZXB3pmROW8bg3CnLnpjkRVwUlLne7Ufa2r9yJ8+/6B73RzhAek5TBKh2Q==}
 
   '@types/remarkable@2.0.8':
     resolution: {integrity: sha512-eKXqPZfpQl1kOADjdKchHrp2gwn9qMnGXhH/AtZe0UrklzhGJkawJo/Y/D0AlWcdWoWamFNIum8+/nkAISQVGg==}
@@ -2852,8 +2853,8 @@ packages:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
 
-  property-information@7.0.0:
-    resolution: {integrity: sha512-7D/qOz/+Y4X/rzSB6jKxKUsQnphO046ei8qxG59mtM3RG3DHgTK81HrxrmoDVINJb8NKT5ZsRbwHvQ6B68Iyhg==}
+  property-information@7.1.0:
+    resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==}
 
   proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
@@ -3617,11 +3618,11 @@ snapshots:
 
   '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959': {}
 
-  '@appwrite.io/pink-icons-svelte@2.0.0-RC.1(svelte@5.25.3)':
+  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@12707b95033c5822745ec6a2250a9cd0de10a498(svelte@5.25.3)':
     dependencies:
       svelte: 5.25.3
 
-  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@67c988c04de3464a9c39630fd798e2316d157fea(svelte@5.25.3)':
+  '@appwrite.io/pink-icons-svelte@https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-icons-svelte@12707b9(svelte@5.25.3)':
     dependencies:
       svelte: 5.25.3
 
@@ -3634,9 +3635,9 @@ snapshots:
       '@appwrite.io/pink-icons': 1.0.0
       the-new-css-reset: 1.11.3
 
-  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@67c988c(svelte@5.25.3)':
+  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9(svelte@5.25.3)':
     dependencies:
-      '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@67c988c04de3464a9c39630fd798e2316d157fea(svelte@5.25.3)
+      '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@12707b95033c5822745ec6a2250a9cd0de10a498(svelte@5.25.3)
       '@floating-ui/dom': 1.6.13
       '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.6(svelte@5.25.3))(svelte@5.25.3)
       '@melt-ui/svelte': 0.86.6(svelte@5.25.3)
@@ -4777,7 +4778,7 @@ snapshots:
 
   '@types/prop-types@15.7.14': {}
 
-  '@types/react@18.3.20':
+  '@types/react@18.3.22':
     dependencies:
       '@types/prop-types': 15.7.14
       csstype: 3.1.3
@@ -5879,7 +5880,7 @@ snapshots:
       hast-util-whitespace: 3.0.0
       html-void-elements: 3.0.0
       mdast-util-to-hast: 13.2.0
-      property-information: 7.0.0
+      property-information: 7.1.0
       space-separated-tokens: 2.0.2
       stringify-entities: 4.0.4
       zwitch: 2.0.4
@@ -6412,7 +6413,7 @@ snapshots:
 
   progress@2.0.3: {}
 
-  property-information@7.0.0: {}
+  property-information@7.1.0: {}
 
   proxy-from-env@1.1.0: {}
 
@@ -6725,7 +6726,7 @@ snapshots:
 
   svelte-motion@0.12.2(svelte@5.25.3):
     dependencies:
-      '@types/react': 18.3.20
+      '@types/react': 18.3.22
       framesync: 6.1.2
       popmotion: 11.0.5
       style-value-types: 5.1.2
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte
index 8c7011a44..ac269c51e 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte
@@ -4,14 +4,14 @@
     import { Repositories } from '$lib/components/git';
     import { Dependencies } from '$lib/constants';
     import { Link } from '$lib/elements';
-    import { Button, InputCheckbox, InputSelect } from '$lib/elements/forms';
+    import { Button, InputCheckbox } from '$lib/elements/forms';
     import { timeFromNow } from '$lib/helpers/date';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { installation, repository, sortBranches } from '$lib/stores/vcs';
     import { Runtime, VCSDeploymentType, type Models } from '@appwrite.io/console';
     import { IconGithub } from '@appwrite.io/pink-icons-svelte';
-    import { Icon, Layout, Skeleton, Typography } from '@appwrite.io/pink-svelte';
+    import { Icon, Input, Layout, Skeleton, Typography } from '@appwrite.io/pink-svelte';
     import { func } from '../store';
     import { page } from '$app/state';
 
@@ -120,6 +120,14 @@
             error = e.message;
         }
     }
+
+    $: if (!show) {
+        error = '';
+        branch = null;
+        commit = null;
+        activate = true;
+        hasRepository = !!$func?.providerRepositoryId;
+    }
 </script>
 
 <Modal title="Create Git deployment" bind:show onSubmit={createDeployment} bind:error>
@@ -179,13 +187,13 @@
                     </Typography.Caption>
                 </Layout.Stack>
             </Card>
-            <InputSelect
-                required={true}
+            <Input.ComboBox
+                required
                 id="branch"
                 label="Production branch"
                 placeholder="Select branch"
-                bind:value={branch}
                 isSearchable
+                bind:value={branch}
                 on:select={(event) => {
                     branch = event.detail.value;
                 }}
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte
index 836628f5c..98984359a 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte
@@ -5,7 +5,7 @@
     import { Repositories } from '$lib/components/git';
     import { Dependencies } from '$lib/constants';
     import { Link } from '$lib/elements';
-    import { Button, InputCheckbox, InputSelect } from '$lib/elements/forms';
+    import { Button, InputCheckbox } from '$lib/elements/forms';
     import { timeFromNow } from '$lib/helpers/date';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
@@ -18,7 +18,7 @@
         type Models
     } from '@appwrite.io/console';
     import { IconGithub } from '@appwrite.io/pink-icons-svelte';
-    import { Icon, Layout, Skeleton, Typography } from '@appwrite.io/pink-svelte';
+    import { Icon, Input, Layout, Skeleton, Typography } from '@appwrite.io/pink-svelte';
 
     export let show = false;
     export let site: Models.Site;
@@ -125,6 +125,14 @@
             error = e.message;
         }
     }
+
+    $: if (!show) {
+        error = '';
+        branch = null;
+        commit = null;
+        activate = true;
+        hasRepository = !!site?.providerRepositoryId;
+    }
 </script>
 
 <Modal title="Create Git deployment" bind:show onSubmit={createDeployment} bind:error>
@@ -184,13 +192,13 @@
                     </Typography.Caption>
                 </Layout.Stack>
             </Card>
-            <InputSelect
-                required={true}
+            <Input.ComboBox
+                required
                 id="branch"
                 label="Production branch"
                 placeholder="Select branch"
-                bind:value={branch}
                 isSearchable
+                bind:value={branch}
                 on:select={(event) => {
                     branch = event.detail.value;
                 }}
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index 3b053e49f..38ea51c9a 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -175,13 +175,17 @@
                                 value: branch.name
                             }))}
                             <Layout.Stack gap="s">
-                                <InputSelect
-                                    {options}
-                                    label="Production branch"
-                                    id="branch"
+                                <Input.ComboBox
                                     required
+                                    id="branch"
+                                    label="Production branch"
+                                    placeholder="Select branch"
+                                    isSearchable
                                     bind:value={branch}
-                                    placeholder="Select branch" />
+                                    on:select={(event) => {
+                                        branch = event.detail.value;
+                                    }}
+                                    {options} />
                                 {#if !data.branches?.total}
                                     <Input.Helper state="default">
                                         No branches found in the selected repository. Create a

From d3e51c6e7c1b0c9a7ff97b741315f9b35b4c82d9 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 18:11:43 +0530
Subject: [PATCH 07/23] update: badge sizes.

---
 src/lib/components/domains/nameserverTable.svelte | 2 +-
 src/lib/components/domains/recordTable.svelte     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/domains/nameserverTable.svelte b/src/lib/components/domains/nameserverTable.svelte
index da5375bce..f9cbcecfc 100644
--- a/src/lib/components/domains/nameserverTable.svelte
+++ b/src/lib/components/domains/nameserverTable.svelte
@@ -17,7 +17,7 @@
             {domain}
         </Typography.Text>
         {#if verified}
-            <Badge variant="secondary" type="success" content="Verified" />
+            <Badge variant="secondary" type="success" size="xs" content="Verified" />
         {:else if verified === false}
             <Badge variant="secondary" type="warning" size="xs" content="Pending verification" />
         {/if}
diff --git a/src/lib/components/domains/recordTable.svelte b/src/lib/components/domains/recordTable.svelte
index 6dc6e6724..f099fa003 100644
--- a/src/lib/components/domains/recordTable.svelte
+++ b/src/lib/components/domains/recordTable.svelte
@@ -38,9 +38,9 @@
                 {domain}
             </Typography.Text>
             {#if verified}
-                <Badge variant="secondary" type="success" content="Verified" />
+                <Badge variant="secondary" type="success" size="xs" content="Verified" />
             {:else if verified === false}
-                <Badge variant="secondary" type="error" content="Verification failed" />
+                <Badge variant="secondary" type="error" size="xs" content="Verification failed" />
             {:else}
                 <Badge
                     variant="secondary"

From 4af7da2d41de462b93f1124b8c67f8bc70dafe7e Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 18:12:02 +0530
Subject: [PATCH 08/23] update: DNS tabs on sites.

---
 .../domains/add-domain/verify-[domain]/+page.svelte    |  6 +++---
 .../domains/add-domain/verify-[domain]/+page.ts        | 10 ++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
index 108d34030..73a4eba46 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
@@ -129,7 +129,7 @@
                                     Nameservers
                                 </Tabs.Item.Button>
                             {/if}
-                            {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'}
+                            {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'}
                                 <Tabs.Item.Button
                                     {root}
                                     on:click={() => (selectedTab = 'a')}
@@ -137,7 +137,7 @@
                                     A
                                 </Tabs.Item.Button>
                             {/if}
-                            {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'}
+                            {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'}
                                 <Tabs.Item.Button
                                     {root}
                                     on:click={() => (selectedTab = 'aaaa')}
@@ -148,7 +148,7 @@
                         </Tabs.Root>
                         <Divider />
                     </div>
-                    {#if selectedTab === 'nameserver'}
+                    {#if isCloud && selectedTab === 'nameserver'}
                         <NameserverTable domain={page.params.domain} {verified} />
                     {:else}
                         <RecordTable
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts
index 9a5223cb8..cea7e4b71 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts
@@ -1,26 +1,20 @@
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
 import { Dependencies } from '$lib/constants.js';
-import type { Domain, DomainsList } from '$lib/sdk/domains.js';
+import type { DomainsList } from '$lib/sdk/domains';
 
-export const load = async ({ parent, depends, params }) => {
+export const load = async ({ parent, depends }) => {
     const { site } = await parent();
     depends(Dependencies.SITES_DOMAINS);
 
-    let domain: Domain;
     let domainsList: DomainsList;
 
     if (isCloud) {
         domainsList = await sdk.forConsole.domains.list();
-        const domainId = domainsList.domains.find(
-            (domain: Domain) => domain.domain === params.domain
-        ).$id;
-        domain = await sdk.forConsole.domains.get(domainId);
     }
 
     return {
         site,
-        domain,
         domainsList
     };
 };

From 757f20cfdfab699c5e4be7995102f25ae6210457 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 18:13:46 +0530
Subject: [PATCH 09/23] update: DNS tabs on settings.

---
 .../domains/add-domain/verify-[domain]/+page.svelte  |  4 ++--
 .../domains/add-domain/verify-[domain]/+page.ts      | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
index 9866c94f0..dc9946534 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
@@ -126,7 +126,7 @@
                                     Nameservers
                                 </Tabs.Item.Button>
                             {/if}
-                            {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'}
+                            {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'}
                                 <Tabs.Item.Button
                                     {root}
                                     on:click={() => (selectedTab = 'a')}
@@ -134,7 +134,7 @@
                                     A
                                 </Tabs.Item.Button>
                             {/if}
-                            {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'}
+                            {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'}
                                 <Tabs.Item.Button
                                     {root}
                                     on:click={() => (selectedTab = 'aaaa')}
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
index 5fbb56d85..a5f6b1910 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
@@ -1,23 +1,17 @@
 import { sdk } from '$lib/stores/sdk';
-import { Dependencies } from '$lib/constants.js';
 import { isCloud } from '$lib/system';
-import type { Domain, DomainsList } from '$lib/sdk/domains.js';
+import { Dependencies } from '$lib/constants.js';
+import type { DomainsList } from '$lib/sdk/domains.js';
 
-export const load = async ({ depends, params }) => {
+export const load = async ({ depends }) => {
     depends(Dependencies.DOMAINS);
 
-    let domain: Domain;
     let domainsList: DomainsList;
     if (isCloud) {
         domainsList = await sdk.forConsole.domains.list();
-        const domainId = domainsList.domains.find(
-            (domain: Domain) => domain.domain === params.domain
-        ).$id;
-        domain = await sdk.forConsole.domains.get(domainId);
     }
 
     return {
-        domain,
         domainsList
     };
 };

From a07f7e269fb6ebfdd088f9761d89e0b2950d3def Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 18:14:45 +0530
Subject: [PATCH 10/23] update: DNS tabs on functions.

---
 .../domains/add-domain/verify-[domain]/+page.svelte  |  4 ++--
 .../domains/add-domain/verify-[domain]/+page.ts      | 12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
index be84fec9f..0ca8e0f52 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
@@ -127,7 +127,7 @@
                                     Nameservers
                                 </Tabs.Item.Button>
                             {/if}
-                            {#if !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'}
+                            {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_A && $consoleVariables._APP_DOMAIN_TARGET_A !== '127.0.0.1'}
                                 <Tabs.Item.Button
                                     {root}
                                     on:click={() => (selectedTab = 'a')}
@@ -135,7 +135,7 @@
                                     A
                                 </Tabs.Item.Button>
                             {/if}
-                            {#if !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'}
+                            {#if !isCloud && !!$consoleVariables._APP_DOMAIN_TARGET_AAAA && $consoleVariables._APP_DOMAIN_TARGET_AAAA !== '::1'}
                                 <Tabs.Item.Button
                                     {root}
                                     on:click={() => (selectedTab = 'aaaa')}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts
index 5fbb56d85..a5f6b1910 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts
@@ -1,23 +1,17 @@
 import { sdk } from '$lib/stores/sdk';
-import { Dependencies } from '$lib/constants.js';
 import { isCloud } from '$lib/system';
-import type { Domain, DomainsList } from '$lib/sdk/domains.js';
+import { Dependencies } from '$lib/constants.js';
+import type { DomainsList } from '$lib/sdk/domains.js';
 
-export const load = async ({ depends, params }) => {
+export const load = async ({ depends }) => {
     depends(Dependencies.DOMAINS);
 
-    let domain: Domain;
     let domainsList: DomainsList;
     if (isCloud) {
         domainsList = await sdk.forConsole.domains.list();
-        const domainId = domainsList.domains.find(
-            (domain: Domain) => domain.domain === params.domain
-        ).$id;
-        domain = await sdk.forConsole.domains.get(domainId);
     }
 
     return {
-        domain,
         domainsList
     };
 };

From 4b23c8edfd11402352322cad920e1ede5eca4da6 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 18:21:49 +0530
Subject: [PATCH 11/23] fix: check.

---
 .../domains/add-domain/verify-[domain]/+page.svelte         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
index 73a4eba46..9e30d8a05 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
@@ -148,14 +148,14 @@
                         </Tabs.Root>
                         <Divider />
                     </div>
-                    {#if isCloud && selectedTab === 'nameserver'}
+                    {#if selectedTab === 'nameserver'}
                         <NameserverTable domain={page.params.domain} {verified} />
                     {:else}
                         <RecordTable
-                            domain={page.params.domain}
                             {verified}
+                            service="sites"
                             variant={selectedTab}
-                            service="sites" />
+                            domain={page.params.domain} />
                     {/if}
                     <Divider />
                     <Layout.Stack direction="row" justifyContent="flex-end">

From 0126622e5103903f6356fcc47f0c46c16ed1171d Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 18:41:09 +0530
Subject: [PATCH 12/23] fix: return to domains list on deletion.

---
 .../domains/deleteDomainModal.svelte                      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte b/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte
index cdbb00b8c..b30ec8bf1 100644
--- a/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte
+++ b/src/routes/(console)/organization-[organization]/domains/deleteDomainModal.svelte
@@ -1,27 +1,31 @@
 <script lang="ts">
     import { sdk } from '$lib/stores/sdk';
     import { addNotification } from '$lib/stores/notifications';
-    import { invalidate } from '$app/navigation';
+    import { goto, invalidate } from '$app/navigation';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Dependencies } from '$lib/constants';
     import { Confirm } from '$lib/components';
     import type { Domain } from '$lib/sdk/domains';
+    import { base } from '$app/paths';
+    import { page } from '$app/state';
 
     export let show = false;
     export let selectedDomain: Domain;
 
     let error = '';
+    let domainsList = `${base}/organization-${page.params.organization}/domains`;
 
     async function deleteDomain() {
         try {
             await sdk.forConsole.domains.delete(selectedDomain.$id);
-            await invalidate(Dependencies.DOMAINS);
             show = false;
             addNotification({
                 type: 'success',
                 message: `${selectedDomain.domain} has been deleted`
             });
             trackEvent(Submit.DomainDelete);
+            await goto(domainsList);
+            await invalidate(Dependencies.DOMAINS);
         } catch (e) {
             error = e.message;
             trackError(e, Submit.DomainDelete);

From 9d87492445c16a9a1c44dce707793ccedaee87bd Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 19:21:23 +0530
Subject: [PATCH 13/23] add: deployment upload limit logic.

---
 src/lib/sdk/billing.ts                               |  2 ++
 .../function-[function]/(modals)/createManual.svelte | 12 +++++++++++-
 .../deployments/createManualDeploymentModal.svelte   | 12 +++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts
index 5ce84abba..aab3ffe59 100644
--- a/src/lib/sdk/billing.ts
+++ b/src/lib/sdk/billing.ts
@@ -338,6 +338,8 @@ export type Plan = {
     backupPolicies: number;
     emailBranding: boolean;
     supportsCredits: boolean;
+    buildSize: number; // in MB
+    deploymentSize: number; // in MB
 };
 
 export type PlanList = {
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte
index d77741486..aa293dc20 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte
@@ -11,12 +11,22 @@
     import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte';
     import { func } from '../store';
     import { page } from '$app/state';
+    import { consoleVariables } from '$routes/(console)/store';
+    import { currentPlan } from '$lib/stores/organization';
+    import { isCloud } from '$lib/system';
 
     export let show = false;
 
     let files: FileList;
     let error: string = '';
 
+    $: maxSize =
+        isCloud && $currentPlan
+            ? $currentPlan?.deploymentSize === 0
+                ? false
+                : $currentPlan?.deploymentSize * 1000000
+            : $consoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB
+
     async function create() {
         try {
             await sdk
@@ -69,7 +79,7 @@
         <Upload.Dropzone
             extensions={['gz', 'tar']}
             bind:files
-            maxSize={10000000}
+            {maxSize}
             required
             on:invalid={handleInvalid}>
             <Layout.Stack alignItems="center" gap="s">
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte
index cf45a69a6..ac226554f 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte
@@ -9,6 +9,9 @@
     import type { Models } from '@appwrite.io/console';
     import { IconInfo } from '@appwrite.io/pink-icons-svelte';
     import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte';
+    import { isCloud } from '$lib/system';
+    import { currentPlan } from '$lib/stores/organization';
+    import { consoleVariables } from '$routes/(console)/store';
 
     export let show = false;
     export let site: Models.Site;
@@ -16,6 +19,13 @@
     let files: FileList;
     let error: string = '';
 
+    $: maxSize =
+        isCloud && $currentPlan
+            ? $currentPlan?.deploymentSize === 0
+                ? false
+                : $currentPlan?.deploymentSize * 1000000
+            : $consoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB
+
     async function createDeployment() {
         try {
             uploader.uploadSiteDeployment(site.$id, files[0]);
@@ -63,7 +73,7 @@
         <Upload.Dropzone
             extensions={['gz', 'tar']}
             bind:files
-            maxSize={10000000}
+            {maxSize}
             required
             on:invalid={handleInvalid}>
             <Layout.Stack alignItems="center" gap="s">

From 23ec4373bc2320a278067fd4d1bb9155e0e4f495 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 19:23:23 +0530
Subject: [PATCH 14/23] remove: new tag on DENO.

---
 .../functions/create-function/+page.svelte           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte
index cb80520e3..69b47d7d4 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte
@@ -151,12 +151,12 @@
                                     <Typography.Text color="--fgcolor-neutral-primary">
                                         <Layout.Stack direction="row" gap="xs" alignItems="center">
                                             {runtimeDetail?.name}
-                                            {#if runtimeDetail?.name?.toLowerCase() === 'deno'}
-                                                <Badge
-                                                    variant="secondary"
-                                                    size="xs"
-                                                    content="New" />
-                                            {/if}
+                                            <!--{#if runtimeDetail?.name?.toLowerCase() === 'deno'}-->
+                                            <!--    <Badge-->
+                                            <!--        variant="secondary"-->
+                                            <!--        size="xs"-->
+                                            <!--        content="New" />-->
+                                            <!--{/if}-->
                                         </Layout.Stack>
                                     </Typography.Text>
                                 </Layout.Stack>

From 4eae18e77f1430060faa294b2fe0d4ce158383eb Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Thu, 22 May 2025 19:27:17 +0530
Subject: [PATCH 15/23] fix: lint and param type.

---
 .../functions/create-function/+page.svelte                      | 1 -
 .../functions/function-[function]/(modals)/createManual.svelte  | 2 +-
 .../site-[site]/deployments/createManualDeploymentModal.svelte  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte
index 69b47d7d4..51a7f32bb 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte
@@ -12,7 +12,6 @@
     import {
         Alert,
         Avatar,
-        Badge,
         Card,
         Divider,
         Icon,
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte
index aa293dc20..5c8056398 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createManual.svelte
@@ -23,7 +23,7 @@
     $: maxSize =
         isCloud && $currentPlan
             ? $currentPlan?.deploymentSize === 0
-                ? false
+                ? 0
                 : $currentPlan?.deploymentSize * 1000000
             : $consoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB
 
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte
index ac226554f..cd4c9f434 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte
@@ -22,7 +22,7 @@
     $: maxSize =
         isCloud && $currentPlan
             ? $currentPlan?.deploymentSize === 0
-                ? false
+                ? 0
                 : $currentPlan?.deploymentSize * 1000000
             : $consoleVariables._APP_COMPUTE_SIZE_LIMIT; // already in MB
 

From 737aeb422723dcecb73a7fc847c5910333186042 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 23 May 2025 12:50:32 +0530
Subject: [PATCH 16/23] update: fix status code with correct options, show
 target to rules.

---
 src/lib/stores/domains.ts                          | 14 ++++++--------
 .../function-[function]/domains/table.svelte       | 14 +++++++++-----
 .../sites/site-[site]/domains/table.svelte         | 14 +++++++++-----
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/lib/stores/domains.ts b/src/lib/stores/domains.ts
index ea339f83d..348e10c9b 100644
--- a/src/lib/stores/domains.ts
+++ b/src/lib/stores/domains.ts
@@ -1,23 +1,21 @@
+import { StatusCode } from '@appwrite.io/console';
+
 export const statusCodeOptions = [
     {
         label: '301 Moved permanently',
-        value: 301
+        value: StatusCode.MovedPermanently301
     },
     {
         label: '302 Found',
-        value: 302
-    },
-    {
-        label: '303 See other',
-        value: 303
+        value: StatusCode.Found302
     },
     {
         label: '307 Temporary redirect',
-        value: 307
+        value: StatusCode.TemporaryRedirect307
     },
     {
         label: '308 Permanent redirect',
-        value: 308
+        value: StatusCode.PermanentRedirect308
     }
 ];
 
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
index 65813ed6a..4cd12187b 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
@@ -27,6 +27,14 @@
     let showDelete = $state(false);
     let showRetry = $state(false);
     let selectedDomain: Models.ProxyRule = $state(null);
+
+    const domainTarget = (proxy: Models.ProxyRule) => {
+        return proxy?.redirectUrl
+            ? 'Redirect to ' + proxy.redirectUrl
+            : proxy?.deploymentVcsProviderBranch
+              ? 'Deployed from' + proxy.deploymentVcsProviderBranch
+              : 'Active deployment';
+    };
 </script>
 
 <Table.Root columns={[...$columns, { id: 'actions', width: 40 }]} let:root>
@@ -64,11 +72,7 @@
                             {/if}
                         </Layout.Stack>
                     {:else if column.id === 'target'}
-                        {domain?.redirectUrl
-                            ? 'Redirect to ' + domain.redirectUrl
-                            : domain?.deploymentVcsProviderBranch
-                              ? 'Deployed from' + domain.deploymentVcsProviderBranch
-                              : '-'}
+                        {domainTarget(domain)}
                     {/if}
                 </Table.Cell>
             {/each}
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
index 020947970..0d82b3bc3 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
@@ -27,6 +27,14 @@
     let showDelete = $state(false);
     let showRetry = $state(false);
     let selectedDomain: Models.ProxyRule = $state(null);
+
+    const domainTarget = (proxy: Models.ProxyRule) => {
+        return proxy?.redirectUrl
+            ? 'Redirect to ' + proxy.redirectUrl
+            : proxy?.deploymentVcsProviderBranch
+              ? 'Deployed from' + proxy.deploymentVcsProviderBranch
+              : 'Active deployment';
+    };
 </script>
 
 <Table.Root columns={[...$columns, { id: 'actions', width: 40 }]} let:root>
@@ -65,11 +73,7 @@
                             {/if}
                         </Layout.Stack>
                     {:else if column.id === 'target'}
-                        {domain?.redirectUrl
-                            ? 'Redirect to ' + domain.redirectUrl
-                            : domain?.deploymentVcsProviderBranch
-                              ? 'Deployed from' + domain.deploymentVcsProviderBranch
-                              : '-'}
+                        {domainTarget(domain)}
                     {/if}
                 </Table.Cell>
             {/each}

From 289d9fc94c216fcf4469e583aac348ce2919ba4f Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 23 May 2025 13:04:30 +0530
Subject: [PATCH 17/23] update: rename all `domain` vars to `proxy` if
 `ProxyRule` type for clarity in functions.

---
 .../function-[function]/domains/+page.svelte  |  6 ++--
 .../function-[function]/domains/+page.ts      |  2 +-
 .../domains/deleteDomainModal.svelte          | 11 +++----
 .../domains/recordsCard.svelte                |  7 ++---
 .../domains/retryDomainModal.svelte           | 15 +++++-----
 .../function-[function]/domains/table.svelte  | 30 +++++++++----------
 6 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte
index e1ab5a837..eaba6f04b 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte
@@ -18,7 +18,7 @@
 
     let showDelete = $state(false);
     let showRetry = $state(false);
-    let selectedDomain: Models.ProxyRule = null;
+    let selectedProxyRule: Models.ProxyRule = null;
 </script>
 
 <Container>
@@ -83,9 +83,9 @@
 </Container>
 
 {#if showDelete}
-    <DeleteDomainModal bind:show={showDelete} {selectedDomain} />
+    <DeleteDomainModal bind:show={showDelete} {selectedProxyRule} />
 {/if}
 
 {#if showRetry}
-    <RetryDomainModal bind:show={showRetry} {selectedDomain} />
+    <RetryDomainModal bind:show={showRetry} {selectedProxyRule} />
 {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
index 8e96e426a..50397306c 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.ts
@@ -26,7 +26,7 @@ export const load: PageLoad = async ({ depends, params, url, route }) => {
         limit,
         query,
         search,
-        domains: await sdk
+        proxyRules: await sdk
             .forProject(params.region, params.project)
             .proxy.listRules(
                 [
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/deleteDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/deleteDomainModal.svelte
index 1882bc282..c5ce1db80 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/deleteDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/deleteDomainModal.svelte
@@ -11,15 +11,16 @@
     import { page } from '$app/state';
 
     export let show = false;
-    export let selectedDomain: Models.ProxyRule;
-    let confirm = false;
+    export let selectedProxyRule: Models.ProxyRule;
+
     let error = '';
+    let confirm = false;
 
     async function deleteDomain() {
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.deleteRule(selectedDomain.$id);
+                .proxy.deleteRule(selectedProxyRule.$id);
             await invalidate(Dependencies.FUNCTION_DOMAINS);
             show = false;
             addNotification({
@@ -35,13 +36,13 @@
 </script>
 
 <Confirm title="Delete domain" bind:open={show} onSubmit={deleteDomain} bind:error>
-    {#if selectedDomain}
+    {#if selectedProxyRule}
         <Typography.Text variant="m-400">
             Are you sure you want to delete this domain? You will no longer be able to execute your
             function by visiting:
         </Typography.Text>
         <Typography.Text variant="m-500">
-            {selectedDomain.domain}
+            {selectedProxyRule.domain}
         </Typography.Text>
     {/if}
     <InputCheckbox
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/recordsCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/recordsCard.svelte
index 9559a74d3..557c5e1b6 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/recordsCard.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/recordsCard.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import { Link } from '$lib/elements';
-    import type { Domain } from '$lib/sdk/domains';
     import { IconInfo } from '@appwrite.io/pink-icons-svelte';
     import {
         Badge,
@@ -14,7 +13,7 @@
     import type { Models } from '@appwrite.io/console';
     import { consoleVariables } from '$routes/(console)/store';
 
-    export let domain: Domain | Models.ProxyRule;
+    export let proxyRule: Models.ProxyRule;
 </script>
 
 <Fieldset legend="Verification">
@@ -22,7 +21,7 @@
         <Layout.Stack gap="xl">
             <Layout.Stack gap="s">
                 <Layout.Stack gap="s" direction="row" alignItems="center">
-                    <Typography.Text variant="l-500">{domain?.domain}</Typography.Text>
+                    <Typography.Text variant="l-500">{proxyRule?.domain}</Typography.Text>
                     <Badge variant="secondary" type="warning" content="Pending verification" />
                 </Layout.Stack>
                 <Typography.Text variant="m-400">
@@ -39,7 +38,7 @@
                 </svelte:fragment>
                 <Table.Row.Base {root}>
                     <Table.Cell {root}>CNAME</Table.Cell>
-                    <Table.Cell {root}>{domain?.domain}</Table.Cell>
+                    <Table.Cell {root}>{proxyRule?.domain}</Table.Cell>
                     <Table.Cell {root}>
                         <InteractiveText
                             variant="copy"
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
index 44eab42f4..008c36553 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
@@ -7,24 +7,23 @@
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Dependencies } from '$lib/constants';
     import RecordsCard from './recordsCard.svelte';
-    import type { Domain } from '$lib/sdk/domains';
     import type { Models } from '@appwrite.io/console';
     import { page } from '$app/state';
 
     export let show = false;
-    export let selectedDomain: Domain | Models.ProxyRule;
+    export let selectedProxyRule: Models.ProxyRule;
 
     let error = null;
-    async function retryDomain() {
+    async function retryProxyRule() {
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification(selectedDomain.$id);
+                .proxy.updateRuleVerification(selectedProxyRule.$id);
             await invalidate(Dependencies.SITES_DOMAINS);
             show = false;
             addNotification({
                 type: 'success',
-                message: `${selectedDomain.domain} has been verified`
+                message: `${selectedProxyRule.domain} has been verified`
             });
             trackEvent(Submit.DomainUpdateVerification);
         } catch (e) {
@@ -38,9 +37,9 @@
     }
 </script>
 
-<Modal title="Retry verification" bind:show onSubmit={retryDomain} bind:error>
-    {#if selectedDomain}
-        <RecordsCard domain={selectedDomain} />
+<Modal title="Retry verification" bind:show onSubmit={retryProxyRule} bind:error>
+    {#if selectedProxyRule}
+        <RecordsCard proxyRule={selectedProxyRule} />
     {/if}
 
     <svelte:fragment slot="footer">
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
index 4cd12187b..1c9df426f 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/table.svelte
@@ -19,16 +19,16 @@
     import { columns } from './store';
 
     let {
-        domains
+        proxyRules
     }: {
-        domains: Models.ProxyRuleList;
+        proxyRules: Models.ProxyRuleList;
     } = $props();
 
     let showDelete = $state(false);
     let showRetry = $state(false);
-    let selectedDomain: Models.ProxyRule = $state(null);
+    let selectedProxyRule: Models.ProxyRule = $state(null);
 
-    const domainTarget = (proxy: Models.ProxyRule) => {
+    const proxyTarget = (proxy: Models.ProxyRule) => {
         return proxy?.redirectUrl
             ? 'Redirect to ' + proxy.redirectUrl
             : proxy?.deploymentVcsProviderBranch
@@ -46,24 +46,24 @@
         {/each}
         <Table.Header.Cell column="actions" {root} />
     </svelte:fragment>
-    {#each domains.rules as domain}
+    {#each proxyRules.rules as proxyRule}
         <Table.Row.Base {root}>
             {#each $columns as column}
                 <Table.Cell column={column.id} {root}>
                     {#if column.id === 'domain'}
                         <Layout.Stack direction="row" gap="xs">
-                            <Link external href={`${$protocol}${domain.domain}`} variant="quiet">
+                            <Link external href={`${$protocol}${proxyRule.domain}`} variant="quiet">
                                 <Typography.Text truncate>
-                                    {domain.domain}
+                                    {proxyRule.domain}
                                 </Typography.Text>
                             </Link>
-                            {#if domain.status === 'verifying'}
+                            {#if proxyRule.status === 'verifying'}
                                 <Badge
                                     variant="secondary"
                                     type="warning"
                                     content="Verifying"
                                     size="s" />
-                            {:else if domain.status !== 'verified'}
+                            {:else if proxyRule.status !== 'verified'}
                                 <Badge
                                     variant="secondary"
                                     type="error"
@@ -72,7 +72,7 @@
                             {/if}
                         </Layout.Stack>
                     {:else if column.id === 'target'}
-                        {domainTarget(domain)}
+                        {proxyTarget(proxyRule)}
                     {/if}
                 </Table.Cell>
             {/each}
@@ -91,11 +91,11 @@
 
                         <svelte:fragment slot="tooltip" let:toggle>
                             <ActionMenu.Root>
-                                {#if domain.status !== 'verified'}
+                                {#if proxyRule.status !== 'verified'}
                                     <ActionMenu.Item.Button
                                         leadingIcon={IconRefresh}
                                         on:click={(e) => {
-                                            selectedDomain = domain;
+                                            selectedProxyRule = proxyRule;
                                             showRetry = true;
                                             toggle(e);
                                         }}>
@@ -106,7 +106,7 @@
                                     status="danger"
                                     leadingIcon={IconTrash}
                                     on:click={(e) => {
-                                        selectedDomain = domain;
+                                        selectedProxyRule = proxyRule;
                                         showDelete = true;
                                         toggle(e);
                                         trackEvent(Click.DomainDeleteClick, {
@@ -125,9 +125,9 @@
 </Table.Root>
 
 {#if showDelete}
-    <DeleteDomainModal bind:show={showDelete} {selectedDomain} />
+    <DeleteDomainModal bind:show={showDelete} {selectedProxyRule} />
 {/if}
 
 {#if showRetry}
-    <RetryDomainModal bind:show={showRetry} {selectedDomain} />
+    <RetryDomainModal bind:show={showRetry} {selectedProxyRule} />
 {/if}

From 6ead88a74353d58e545675da6fc36269caa75da2 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 23 May 2025 13:50:25 +0530
Subject: [PATCH 18/23] update: rename all `domain` vars to `proxy` if
 `ProxyRule` type for clarity in sites.

---
 .../sites/site-[site]/domains/+page.svelte    |  6 ++--
 .../sites/site-[site]/domains/+page.ts        |  2 +-
 .../domains/deleteDomainModal.svelte          | 10 +++----
 .../domains/retryDomainModal.svelte           | 14 ++++-----
 .../sites/site-[site]/domains/table.svelte    | 30 +++++++++----------
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte
index 23537ff99..8e4d4c3e7 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte
@@ -29,14 +29,14 @@
         </Button>
     </Layout.Stack>
 
-    {#if data.domains.total}
-        <Table domains={data.domains} />
+    {#if data.proxyRules.total}
+        <Table proxyRules={data.proxyRules} />
 
         <PaginationWithLimit
             name="Domains"
             limit={data.limit}
             offset={data.offset}
-            total={data.domains.total} />
+            total={data.proxyRules.total} />
     {:else if data?.search}
         <EmptySearch hidePages bind:search={data.search} target="domains" hidePagination>
             <Button
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts
index 74deea89d..88ec63f09 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts
@@ -22,7 +22,7 @@ export const load = async ({ params, depends, url, route }) => {
         limit,
         query,
         search,
-        domains: await sdk
+        proxyRules: await sdk
             .forProject(params.region, params.project)
             .proxy.listRules(
                 [
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte
index 4e6dba7c6..dcb2fdeac 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte
@@ -11,10 +11,10 @@
 
     let {
         show = $bindable(),
-        selectedDomain
+        selectedProxyRule
     }: {
         show: boolean;
-        selectedDomain: Models.ProxyRule;
+        selectedProxyRule: Models.ProxyRule;
     } = $props();
 
     let error: string = $state(null);
@@ -23,7 +23,7 @@
         try {
             await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.deleteRule(selectedDomain.$id);
+                .proxy.deleteRule(selectedProxyRule.$id);
             await invalidate(Dependencies.SITES_DOMAINS);
             show = false;
             addNotification({
@@ -39,13 +39,13 @@
 </script>
 
 <Confirm title="Delete domain" bind:open={show} onSubmit={deleteDomain} bind:error confirmDeletion>
-    {#if selectedDomain}
+    {#if selectedProxyRule}
         <Typography.Text variant="m-400">
             Are you sure you want to delete this domain? You will no longer be able to view your
             site by visiting:
         </Typography.Text>
         <Typography.Text variant="m-500">
-            {selectedDomain.domain}
+            {selectedProxyRule.domain}
         </Typography.Text>
     {/if}
 </Confirm>
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
index 389cbc2f7..9c0191b22 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
@@ -17,13 +17,13 @@
 
     let {
         show = $bindable(false),
-        selectedDomain
+        selectedProxyRule
     }: {
         show: boolean;
-        selectedDomain: Models.ProxyRule;
+        selectedProxyRule: Models.ProxyRule;
     } = $props();
 
-    const isSubDomain = $derived.by(() => isASubdomain(selectedDomain?.domain));
+    const isSubDomain = $derived.by(() => isASubdomain(selectedProxyRule?.domain));
 
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>('nameserver');
     $effect(() => {
@@ -43,13 +43,13 @@
         try {
             const domain = await sdk
                 .forProject(page.params.region, page.params.project)
-                .proxy.updateRuleVerification(selectedDomain.$id);
+                .proxy.updateRuleVerification(selectedProxyRule.$id);
             await invalidate(Dependencies.SITES_DOMAINS);
             verified = domain.status === 'verified';
             show = false;
             addNotification({
                 type: 'success',
-                message: `${selectedDomain.domain} has been verified`
+                message: `${selectedProxyRule.domain} has been verified`
             });
             trackEvent(Submit.DomainUpdateVerification);
         } catch (e) {
@@ -104,13 +104,13 @@
         <Divider />
     </div>
     {#if selectedTab === 'nameserver'}
-        <NameserverTable domain={selectedDomain.domain} {verified} />
+        <NameserverTable domain={selectedProxyRule.domain} {verified} />
     {:else}
         <RecordTable
             {verified}
             service="sites"
             variant={selectedTab}
-            domain={selectedDomain.domain} />
+            domain={selectedProxyRule.domain} />
     {/if}
 
     <svelte:fragment slot="footer">
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
index 0d82b3bc3..e8dde4d2d 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/table.svelte
@@ -19,16 +19,16 @@
     import { columns } from './store';
 
     let {
-        domains
+        proxyRules
     }: {
-        domains: Models.ProxyRuleList;
+        proxyRules: Models.ProxyRuleList;
     } = $props();
 
     let showDelete = $state(false);
     let showRetry = $state(false);
-    let selectedDomain: Models.ProxyRule = $state(null);
+    let selectedProxyRule: Models.ProxyRule = $state(null);
 
-    const domainTarget = (proxy: Models.ProxyRule) => {
+    const proxyTarget = (proxy: Models.ProxyRule) => {
         return proxy?.redirectUrl
             ? 'Redirect to ' + proxy.redirectUrl
             : proxy?.deploymentVcsProviderBranch
@@ -46,25 +46,25 @@
         {/each}
         <Table.Header.Cell column="actions" {root} />
     </svelte:fragment>
-    {#each domains.rules as domain}
+    {#each proxyRules.rules as rule}
         <Table.Row.Base {root}>
             {#each $columns as column}
                 <Table.Cell column={column.id} {root}>
                     {#if column.id === 'domain'}
                         <Layout.Stack direction="row" gap="xs">
-                            <Link external href={`${$protocol}${domain.domain}`} variant="quiet">
+                            <Link external href={`${$protocol}${rule.domain}`} variant="quiet">
                                 <Typography.Text truncate>
-                                    {domain.domain}
+                                    {rule.domain}
                                 </Typography.Text>
                             </Link>
 
-                            {#if domain.status === 'verifying'}
+                            {#if rule.status === 'verifying'}
                                 <Badge
                                     variant="secondary"
                                     type="warning"
                                     content="Verifying"
                                     size="s" />
-                            {:else if domain.status !== 'verified'}
+                            {:else if rule.status !== 'verified'}
                                 <Badge
                                     variant="secondary"
                                     type="error"
@@ -73,7 +73,7 @@
                             {/if}
                         </Layout.Stack>
                     {:else if column.id === 'target'}
-                        {domainTarget(domain)}
+                        {proxyTarget(rule)}
                     {/if}
                 </Table.Cell>
             {/each}
@@ -92,11 +92,11 @@
 
                         <svelte:fragment slot="tooltip" let:toggle>
                             <ActionMenu.Root>
-                                {#if domain.status !== 'verified'}
+                                {#if rule.status !== 'verified'}
                                     <ActionMenu.Item.Button
                                         leadingIcon={IconRefresh}
                                         on:click={(e) => {
-                                            selectedDomain = domain;
+                                            selectedProxyRule = rule;
                                             showRetry = true;
                                             toggle(e);
                                         }}>
@@ -107,7 +107,7 @@
                                     status="danger"
                                     leadingIcon={IconTrash}
                                     on:click={(e) => {
-                                        selectedDomain = domain;
+                                        selectedProxyRule = rule;
                                         showDelete = true;
                                         toggle(e);
                                         trackEvent(Click.DomainDeleteClick, {
@@ -126,9 +126,9 @@
 </Table.Root>
 
 {#if showDelete}
-    <DeleteDomainModal bind:show={showDelete} {selectedDomain} />
+    <DeleteDomainModal bind:show={showDelete} {selectedProxyRule} />
 {/if}
 
 {#if showRetry}
-    <RetryDomainModal bind:show={showRetry} {selectedDomain} />
+    <RetryDomainModal bind:show={showRetry} {selectedProxyRule} />
 {/if}

From b457086fc5ffbf7de14ee414397b1be60557886f Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Fri, 23 May 2025 13:50:40 +0530
Subject: [PATCH 19/23] fix: prop names.

---
 .../functions/function-[function]/domains/+page.svelte      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte
index eaba6f04b..3e30d3a86 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+page.svelte
@@ -35,14 +35,14 @@
             Add domain
         </Button>
     </Layout.Stack>
-    {#if data.domains.total}
-        <Table domains={data.domains} />
+    {#if data.proxyRules.total}
+        <Table proxyRules={data.proxyRules} />
 
         <PaginationWithLimit
             name="Domains"
             limit={data.limit}
             offset={data.offset}
-            total={data.domains.total} />
+            total={data.proxyRules.total} />
     {:else if data?.search}
         <EmptySearch hidePages bind:search={data.search} target="domains" hidePagination>
             <svelte:fragment slot="actions">

From cdd1eb6dc8992847aa9a133287aecf02002129d2 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Fri, 23 May 2025 10:31:25 +0200
Subject: [PATCH 20/23] Cronjob field as text

---
 src/lib/elements/forms/inputCron.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elements/forms/inputCron.svelte b/src/lib/elements/forms/inputCron.svelte
index 7e2a2ef53..7f31312f4 100644
--- a/src/lib/elements/forms/inputCron.svelte
+++ b/src/lib/elements/forms/inputCron.svelte
@@ -49,7 +49,7 @@
     {pattern}
     on:input
     on:invalid={handleInvalid}
-    type="email"
+    type="text"
     helper={error}
     state={error ? 'error' : 'default'}
     autofocus={autofocus || undefined}

From 6816c63fa8196e0e914804f41f09b6555b7eab29 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Fri, 23 May 2025 11:27:44 +0200
Subject: [PATCH 21/23] fix: logs missing url, deploments overview table

---
 package.json                                  |  6 +++---
 pnpm-lock.yaml                                | 19 +++++++++----------
 src/lib/components/logs/logsRequest.svelte    |  9 +++++++--
 .../site-[site]/deploymentsOverview.svelte    | 10 +++++++---
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index dd211eda9..14e3308bb 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
         "@appwrite.io/pink-legacy": "^1.0.3",
-        "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9",
+        "@appwrite.io/pink-svelte": "https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-svelte@510c1a7",
         "@popperjs/core": "^2.11.8",
         "@sentry/sveltekit": "^8.38.0",
         "@stripe/stripe-js": "^3.5.0",
@@ -79,12 +79,12 @@
         "svelte-check": "^4.1.5",
         "svelte-preprocess": "^6.0.3",
         "svelte-sequential-preprocessor": "^2.0.2",
+        "tldts": "^7.0.7",
         "tslib": "^2.8.1",
         "typescript": "^5.8.2",
         "typescript-eslint": "^8.30.1",
         "vite": "^6.2.3",
-        "vitest": "^3.0.0",
-        "tldts": "^7.0.7"
+        "vitest": "^3.0.0"
     },
     "pnpm": {
         "onlyBuiltDependencies": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4585dc30e..ad29a5d49 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,8 +27,8 @@ importers:
         specifier: ^1.0.3
         version: 1.0.3
       '@appwrite.io/pink-svelte':
-        specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9
-        version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9(svelte@5.25.3)
+        specifier: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-svelte@510c1a7
+        version: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-svelte@510c1a7(svelte@5.25.3)
       '@popperjs/core':
         specifier: ^2.11.8
         version: 2.11.8
@@ -261,9 +261,8 @@ packages:
     resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959}
     version: 1.5.2
 
-  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@12707b95033c5822745ec6a2250a9cd0de10a498':
-    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@12707b95033c5822745ec6a2250a9cd0de10a498}
-    version: 2.0.0-RC.1
+  '@appwrite.io/pink-icons-svelte@2.0.0-RC.1':
+    resolution: {integrity: sha512-iLFlV55hj8mGuAbmxJGenxN5RaZMmVT4GJb9dv/MP1xBAtYibFq7JvBcxm18qV2KU8c31Rntf+Ub4GL7HwqTYg==}
     peerDependencies:
       svelte: ^4.0.0
 
@@ -282,8 +281,8 @@ packages:
   '@appwrite.io/pink-legacy@1.0.3':
     resolution: {integrity: sha512-GGde5fmPhs+s6/3aFeMPc/kKADG/gTFkYQSy6oBN8pK0y0XNCLrZZgBv+EBbdhwdtqVEWXa0X85Mv9w7jcIlwQ==}
 
-  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9':
-    resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9}
+  '@appwrite.io/pink-svelte@https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-svelte@510c1a7':
+    resolution: {tarball: https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-svelte@510c1a7}
     version: 2.0.0-RC.2
     peerDependencies:
       svelte: ^4.0.0
@@ -3628,7 +3627,7 @@ snapshots:
 
   '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@1959': {}
 
-  '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@12707b95033c5822745ec6a2250a9cd0de10a498(svelte@5.25.3)':
+  '@appwrite.io/pink-icons-svelte@2.0.0-RC.1(svelte@5.25.3)':
     dependencies:
       svelte: 5.25.3
 
@@ -3645,9 +3644,9 @@ snapshots:
       '@appwrite.io/pink-icons': 1.0.0
       the-new-css-reset: 1.11.3
 
-  '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@12707b9(svelte@5.25.3)':
+  '@appwrite.io/pink-svelte@https://try-module.cloud/module/@appwrite/%40appwrite.io%2Fpink-svelte@510c1a7(svelte@5.25.3)':
     dependencies:
-      '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@12707b95033c5822745ec6a2250a9cd0de10a498(svelte@5.25.3)
+      '@appwrite.io/pink-icons-svelte': 2.0.0-RC.1(svelte@5.25.3)
       '@floating-ui/dom': 1.6.13
       '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.6(svelte@5.25.3))(svelte@5.25.3)
       '@melt-ui/svelte': 0.86.6(svelte@5.25.3)
diff --git a/src/lib/components/logs/logsRequest.svelte b/src/lib/components/logs/logsRequest.svelte
index 85bd2482a..0e05ce4ed 100644
--- a/src/lib/components/logs/logsRequest.svelte
+++ b/src/lib/components/logs/logsRequest.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { page } from '$app/state';
     import { Card } from '$lib/components';
     import { Link } from '$lib/elements';
     import type { Models } from '@appwrite.io/console';
@@ -121,8 +122,12 @@
 
             <Input.Helper state="default">
                 <span>
-                    Missing headers? Check the <Link variant="muted" href="#" external>docs</Link> to
-                    see the supported data and how to log it.
+                    Missing headers? Check the <Link
+                        variant="muted"
+                        href={page.url.pathname.includes('/sites/')
+                            ? 'https://appwrite.io/docs/products/sites/logs#log-details'
+                            : 'https://appwrite.io/docs/products/functions/develop#logging'}
+                        external>docs</Link> to see the supported data and how to log it.
                 </span>
             </Input.Helper>
         {:else}
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte
index 68f9fc9d9..96a5091eb 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte
@@ -43,12 +43,16 @@
         </Button>
     </Layout.Stack>
     {#if deploymentList?.total}
+        {@const hasAuthor = deploymentList.deployments.some((d) => d?.providerCommitAuthor)}
         <Table.Root
             columns={[
                 { id: '$id', width: 200 },
-                { id: 'status', width: { min: 120 } },
-                { id: 'source', width: { min: 120 } },
-                { id: '$updatedAt', width: { min: 120 } },
+                { id: 'status', width: { min: 80, max: 100 } },
+                { id: 'source', width: { min: 80, max: 100 } },
+                {
+                    id: '$updatedAt',
+                    width: { min: hasAuthor ? 280 : 100 }
+                },
                 { id: 'actions', width: 50 }
             ]}
             let:root>

From 6a4aba84e2dd2961abbb22046743ad1b0cf42b33 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Fri, 23 May 2025 13:52:13 +0200
Subject: [PATCH 22/23] fix: log request

---
 src/lib/components/logs/logsRequest.svelte    | 27 ++++++++++++-------
 .../executions/sheet.svelte                   |  2 +-
 .../sites/site-[site]/logs/sheet.svelte       |  2 +-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/lib/components/logs/logsRequest.svelte b/src/lib/components/logs/logsRequest.svelte
index 0e05ce4ed..3d582f2d0 100644
--- a/src/lib/components/logs/logsRequest.svelte
+++ b/src/lib/components/logs/logsRequest.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import { page } from '$app/state';
     import { Card } from '$lib/components';
     import { Link } from '$lib/elements';
     import type { Models } from '@appwrite.io/console';
@@ -14,11 +13,17 @@
     } from '@appwrite.io/pink-svelte';
     import { onMount } from 'svelte';
 
-    export let selectedLog: Models.Execution;
+    let {
+        selectedLog,
+        product
+    }: {
+        selectedLog: Models.Execution;
+        product: 'site' | 'function';
+    } = $props();
 
-    let requestTab: 'parameters' | 'headers' = 'parameters';
+    let requestTab: 'parameters' | 'headers' = $state('parameters');
 
-    let parameters = [];
+    let parameters = $state([]);
 
     onMount(() => {
         try {
@@ -42,6 +47,12 @@
             requestTab = 'headers';
         }
     });
+
+    let href = $derived(
+        product === 'site'
+            ? 'https://appwrite.io/docs/products/sites/logs#log-details'
+            : 'https://appwrite.io/docs/products/functions/develop#logging'
+    );
 </script>
 
 <Layout.Stack>
@@ -122,12 +133,8 @@
 
             <Input.Helper state="default">
                 <span>
-                    Missing headers? Check the <Link
-                        variant="muted"
-                        href={page.url.pathname.includes('/sites/')
-                            ? 'https://appwrite.io/docs/products/sites/logs#log-details'
-                            : 'https://appwrite.io/docs/products/functions/develop#logging'}
-                        external>docs</Link> to see the supported data and how to log it.
+                    Missing headers? Check the <Link variant="muted" {href} external>docs</Link> to see
+                    the supported data and how to log it.
                 </span>
             </Input.Helper>
         {:else}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/sheet.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/sheet.svelte
index fd6e2bee1..e31caff20 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/sheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/executions/sheet.svelte
@@ -167,7 +167,7 @@
                     </Layout.Stack>
                 </Accordion>
                 <Accordion title="Request" open>
-                    <LogsRequest {selectedLog} />
+                    <LogsRequest {selectedLog} product="function" />
                 </Accordion>
                 <Accordion title="Response" open hideDivider>
                     <LogsResponse {selectedLog} product="function" {logging} />
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/sheet.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/sheet.svelte
index 881e4e3d2..184406e24 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/sheet.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/sheet.svelte
@@ -141,7 +141,7 @@
                     </Layout.Stack>
                 </Accordion>
                 <Accordion title="Request" open>
-                    <LogsRequest {selectedLog} />
+                    <LogsRequest {selectedLog} product="site" />
                 </Accordion>
                 <Accordion title="Response" open hideDivider>
                     <LogsResponse {selectedLog} logging={$site?.logging} product="site" />

From 275b0f4cd340b160d077bfca1d219465028250db Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Fri, 23 May 2025 13:57:03 +0200
Subject: [PATCH 23/23] fix: logic

---
 src/lib/components/logs/logsRequest.svelte  | 11 +++++------
 src/lib/components/logs/logsResponse.svelte |  5 ++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/lib/components/logs/logsRequest.svelte b/src/lib/components/logs/logsRequest.svelte
index 3d582f2d0..dc04eb022 100644
--- a/src/lib/components/logs/logsRequest.svelte
+++ b/src/lib/components/logs/logsRequest.svelte
@@ -25,6 +25,11 @@
 
     let parameters = $state([]);
 
+    const href =
+        product === 'site'
+            ? 'https://appwrite.io/docs/products/sites/logs#log-details'
+            : 'https://appwrite.io/docs/products/functions/develop#logging';
+
     onMount(() => {
         try {
             // Add dummy base URL to parse relative paths
@@ -47,12 +52,6 @@
             requestTab = 'headers';
         }
     });
-
-    let href = $derived(
-        product === 'site'
-            ? 'https://appwrite.io/docs/products/sites/logs#log-details'
-            : 'https://appwrite.io/docs/products/functions/develop#logging'
-    );
 </script>
 
 <Layout.Stack>
diff --git a/src/lib/components/logs/logsResponse.svelte b/src/lib/components/logs/logsResponse.svelte
index 227efc636..a1361af54 100644
--- a/src/lib/components/logs/logsResponse.svelte
+++ b/src/lib/components/logs/logsResponse.svelte
@@ -28,11 +28,10 @@
 
     let responseTab: 'logs' | 'errors' | 'headers' | 'body' = $state('logs');
 
-    let href = $derived(
+    const href =
         product === 'site'
             ? 'https://appwrite.io/docs/products/sites/logs#log-details'
-            : 'https://appwrite.io/docs/products/functions/develop#logging'
-    );
+            : 'https://appwrite.io/docs/products/functions/develop#logging';
 
     onMount(() => {
         if (selectedLog?.errors) {