add: teamId filter to domain fetching.

This commit is contained in:
Darshan committed 2025-05-30 14:56:35 +05:30
1 parent 177cdcdaad
commit 8ff1bcce8c
8 files changed
+27 -20

No files matched your search

+1 -1
View File
@@ -28,7 +28,7 @@ export const isProd = ENV.PROD;
export const hasStripePublicKey = !!VARS.PUBLIC_STRIPE_KEY;
export const GRACE_PERIOD_OVERRIDE = false;
export const APPWRITE_OFFICIALS_ORG = 'appwriteOfficials';
export const APPWRITE_OFFICIALS_ORG = '683154b5001b35cb7c27';
export function isMultiRegionSupported(url: URL): boolean {
if (env.PUBLIC_APPWRITE_MULTI_REGION === 'true') return true;
@@ -5,6 +5,7 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants';
import { queries, queryParamToMap } from '$lib/components/filters';
export const load = async ({ depends, url, route, parent }) => {
const { organization } = await parent();
depends(Dependencies.DOMAINS);
const page = getPage(url);
@@ -13,8 +14,6 @@ export const load = async ({ depends, url, route, parent }) => {
const query = getQuery(url);
const search = getSearch(url);
const { organization } = await parent();
const parsedQueries = queryParamToMap(query || '[]');
queries.set(parsedQueries);
@@ -27,7 +26,7 @@ export const load = async ({ depends, url, route, parent }) => {
Query.limit(limit),
Query.offset(offset),
Query.orderDesc(''),
Query.equal('teamId', [organization.$id]),
Query.equal('teamId', organization.$id),
...parsedQueries.values()
])
};
@@ -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([
@@ -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 {
@@ -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 {
@@ -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([
@@ -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 {
@@ -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 {
@@ -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([
@@ -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 {
@@ -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 {