Skip to content

Fix domain queries #1941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 30, 2025
Merged

Fix domain queries #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
177cdcd
add: teamId filter to org domains.
ItzNotABug May 30, 2025
8ff1bcc
add: teamId filter to domain fetching.
ItzNotABug May 30, 2025
fb7ad6e
revert: org id.
ItzNotABug May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/routes/(console)/organization-[organization]/domains/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpe
import { Dependencies, PAGE_LIMIT } from '$lib/constants';
import { queries, queryParamToMap } from '$lib/components/filters';

export const load = async ({ depends, url, route }) => {
export const load = async ({ depends, url, route, parent }) => {
const { organization } = await parent();
depends(Dependencies.DOMAINS);

const page = getPage(url);
const limit = getLimit(url, route, PAGE_LIMIT);
const offset = pageToOffset(page, limit);
Expand All @@ -24,6 +26,7 @@ export const load = async ({ depends, url, route }) => {
Query.limit(limit),
Query.offset(offset),
Query.orderDesc(''),
Query.equal('teamId', organization.$id),
...parsedQueries.values()
])
};
Expand Down
6 changes: 4 additions & 2 deletions ...ole)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants';
import { isCloud } from '$lib/system';

export const load = async ({ parent, depends, params }) => {
const { function: func } = await parent();
const { function: func, organization } = await parent();
depends(Dependencies.DOMAINS, Dependencies.FUNCTION_DOMAINS);

const [rules, installations, domains] = await Promise.all([
Expand All @@ -16,7 +16,9 @@ export const load = async ({ parent, depends, params }) => {
Query.equal('trigger', RuleTrigger.MANUAL)
]),
sdk.forProject(params.region, params.project).vcs.listInstallations(),
isCloud ? sdk.forConsole.domains.list() : Promise.resolve(null)
isCloud
? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)])
: Promise.resolve(null)
]);

return {
Expand Down
7 changes: 4 additions & 3 deletions ...gion]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { sdk } from '$lib/stores/sdk';
import { isCloud } from '$lib/system';
import { Dependencies } from '$lib/constants.js';
import type { Models } from '@appwrite.io/console';
import { type Models, Query } from '@appwrite.io/console';

export const load = async ({ depends }) => {
export const load = async ({ depends, parent }) => {
const { organization } = await parent();
depends(Dependencies.DOMAINS);

let domainsList: Models.DomainsList;
if (isCloud) {
domainsList = await sdk.forConsole.domains.list();
domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]);
}

return {
Expand Down
7 changes: 5 additions & 2 deletions src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { RuleTrigger, RuleType } from '$lib/stores/sdk';
import { Dependencies } from '$lib/constants.js';
import { isCloud } from '$lib/system';

export const load = async ({ depends, params }) => {
export const load = async ({ depends, params, parent }) => {
const { organization } = await parent();
depends(Dependencies.DOMAINS);

const [rules, domains] = await Promise.all([
Expand All @@ -14,7 +15,9 @@ export const load = async ({ depends, params }) => {
Query.equal('type', RuleType.API),
Query.equal('trigger', RuleTrigger.MANUAL)
]),
isCloud ? sdk.forConsole.domains.list() : Promise.resolve(null)
isCloud
? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)])
: Promise.resolve(null)
]);

return {
Expand Down
7 changes: 4 additions & 3 deletions ...(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { sdk } from '$lib/stores/sdk';
import { isCloud } from '$lib/system';
import { Dependencies } from '$lib/constants.js';
import type { Models } from '@appwrite.io/console';
import { type Models, Query } from '@appwrite.io/console';

export const load = async ({ depends }) => {
export const load = async ({ depends, parent }) => {
const { organization } = await parent();
depends(Dependencies.DOMAINS);

let domainsList: Models.DomainsList;
if (isCloud) {
domainsList = await sdk.forConsole.domains.list();
domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]);
}

return {
Expand Down
6 changes: 4 additions & 2 deletions ...routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants.js';
import { isCloud } from '$lib/system';

export const load = async ({ parent, depends, params }) => {
const { site } = await parent();
const { site, organization } = await parent();
depends(Dependencies.DOMAINS, Dependencies.SITES_DOMAINS);

const [rules, installations, domains] = await Promise.all([
Expand All @@ -16,7 +16,9 @@ export const load = async ({ parent, depends, params }) => {
Query.equal('trigger', RuleTrigger.MANUAL)
]),
sdk.forProject(params.region, params.project).vcs.listInstallations(),
isCloud ? sdk.forConsole.domains.list() : Promise.resolve(null)
isCloud
? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)])
: Promise.resolve(null)
]);

return {
Expand Down
7 changes: 3 additions & 4 deletions .../project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { sdk } from '$lib/stores/sdk';
import { isCloud } from '$lib/system';
import { Dependencies } from '$lib/constants.js';
import type { Models } from '@appwrite.io/console';
import { type Models, Query } from '@appwrite.io/console';

export const load = async ({ parent, depends }) => {
const { site } = await parent();
const { site, organization } = await parent();
depends(Dependencies.SITES_DOMAINS);

let domainsList: Models.DomainsList;

if (isCloud) {
domainsList = await sdk.forConsole.domains.list();
domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]);
}

return {
Expand Down