Skip to content

Commit 1a01859

Browse files
committed
fix null domainsList
1 parent 0802cfb commit 1a01859

9 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
4949
async function addDomain() {
5050
const apexDomain = getApexDomain(domainName);
51-
let domain = data.domainsList?.domains.find((d: Models.Domain) => d.domain === apexDomain);
51+
let domain = data.domainsList.domains.find((d: Models.Domain) => d.domain === apexDomain);
5252
5353
if (apexDomain && !domain && isCloud) {
5454
try {

src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const load = async ({ parent, depends, params }) => {
1818
sdk.forProject(params.region, params.project).vcs.listInstallations(),
1919
isCloud
2020
? sdk.forConsole.domains.list({ queries: [Query.equal('teamId', organization.$id)] })
21-
: Promise.resolve<Models.DomainsList | null>(null)
21+
: Promise.resolve<Models.DomainsList>({ total: 0, domains: [] })
2222
]);
2323

2424
return {

src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const load = async ({ depends, parent, params, url }) => {
1818
? sdk.forConsole.domains.list({
1919
queries: [Query.equal('teamId', organization.$id)]
2020
})
21-
: Promise.resolve<Models.DomainsList | null>(null)
21+
: Promise.resolve<Models.DomainsList>({ total: 0, domains: [] })
2222
]);
2323

2424
return {

src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
3131
async function addDomain() {
3232
const apexDomain = getApexDomain(domainName);
33-
let domain = data.domains?.domains.find((d: Models.Domain) => d.domain === apexDomain);
33+
let domain = data.domainsList.domains.find((d: Models.Domain) => d.domain === apexDomain);
3434
3535
if (apexDomain && !domain && isCloud) {
3636
try {
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Query } from '@appwrite.io/console';
1+
import { Query, type Models } from '@appwrite.io/console';
22
import { sdk } from '$lib/stores/sdk';
33
import { RuleTrigger, RuleType } from '$lib/stores/sdk';
44
import { Dependencies } from '$lib/constants.js';
@@ -8,17 +8,17 @@ export const load = async ({ depends, params, parent }) => {
88
const { organization } = await parent();
99
depends(Dependencies.DOMAINS);
1010

11-
const [rules, domains] = await Promise.all([
11+
const [rules, domainsList] = await Promise.all([
1212
sdk.forProject(params.region, params.project).proxy.listRules({
1313
queries: [Query.equal('type', RuleType.API), Query.equal('trigger', RuleTrigger.MANUAL)]
1414
}),
1515
isCloud
1616
? sdk.forConsole.domains.list({ queries: [Query.equal('teamId', organization.$id)] })
17-
: Promise.resolve(null)
17+
: Promise.resolve<Models.DomainsList>({ total: 0, domains: [] })
1818
]);
1919

2020
return {
2121
rules,
22-
domains
22+
domainsList
2323
};
2424
};

src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const load = async ({ depends, parent, params, url }) => {
1818
? sdk.forConsole.domains.list({
1919
queries: [Query.equal('teamId', organization.$id)]
2020
})
21-
: Promise.resolve<Models.DomainsList | null>(null)
21+
: Promise.resolve<Models.DomainsList>({ total: 0, domains: [] })
2222
]);
2323

2424
return {

src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
async function addDomain() {
5959
const apexDomain = getApexDomain(domainName);
6060
const isSiteDomain = domainName.endsWith($regionalConsoleVariables._APP_DOMAIN_SITES);
61-
let domain = data.domainsList?.domains.find((d) => d.domain === apexDomain);
61+
let domain = data.domainsList.domains.find((d) => d.domain === apexDomain);
6262
6363
if (isCloud && apexDomain && !domain && !isSiteDomain) {
6464
try {

src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const load = async ({ parent, depends, params }) => {
2020
? sdk.forConsole.domains.list({
2121
queries: [Query.equal('teamId', organization.$id)]
2222
})
23-
: Promise.resolve<Models.DomainsList | null>(null)
23+
: Promise.resolve<Models.DomainsList>({ total: 0, domains: [] })
2424
]);
2525

2626
return {

src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const load = async ({ parent, depends, params, url }) => {
1818
? sdk.forConsole.domains.list({
1919
queries: [Query.equal('teamId', organization.$id)]
2020
})
21-
: Promise.resolve<Models.DomainsList | null>(null)
21+
: Promise.resolve<Models.DomainsList>({ total: 0, domains: [] })
2222
]);
2323

2424
return {

0 commit comments

Comments
 (0)