Merge pull request #2007 from appwrite/fix-domains

Fix domains

Author: Meldiron

package.json

@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "@ai-sdk/svelte": "^1.1.24",
-        "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@e190a19",
+        "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@a5e5564",
         "@appwrite.io/pink-icons": "0.25.0",
         "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
         "@appwrite.io/pink-legacy": "^1.0.3",

pnpm-lock.yaml

@@ -11,7 +11,7 @@
     import { sortBranches } from '$lib/stores/vcs';
     import { IconInfo } from '@appwrite.io/pink-icons-svelte';
     import { LabelCard } from '$lib/components';
-    import { Runtime, StatusCode, type Models } from '@appwrite.io/console';
+    import { type Models, ProxyResourceType, Runtime, StatusCode } from '@appwrite.io/console';
     import { statusCodeOptions } from '$lib/stores/domains';
     import { writable } from 'svelte/store';
     import { onMount } from 'svelte';
@@ -75,7 +75,13 @@
             } else if (behaviour === 'REDIRECT') {
                 rule = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .proxy.createRedirectRule(domainName, redirect, statusCode);
+                    .proxy.createRedirectRule(
+                        domainName,
+                        redirect,
+                        statusCode,
+                        page.params.function,
+                        ProxyResourceType.Function
+                    );
             } else if (behaviour === 'ACTIVE') {
                 rule = await sdk
                     .forProject(page.params.region, page.params.project)

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

@@ -26,18 +26,10 @@ export const load = async ({ params, depends, url, route }) => {
             .forProject(params.region, params.project)
             .proxy.listRules(
                 [
-                    Query.or([
-                        Query.and([
-                            Query.equal('type', RuleType.REDIRECT),
-                            Query.equal('trigger', RuleTrigger.MANUAL)
-                        ]),
-                        Query.and([
-                            Query.equal('type', RuleType.DEPLOYMENT),
-                            Query.equal('trigger', RuleTrigger.MANUAL),
-                            Query.equal('deploymentResourceType', DeploymentResourceType.SITE),
-                            Query.equal('deploymentResourceId', params.site)
-                        ])
-                    ]),
+                    Query.equal('type', [RuleType.DEPLOYMENT, RuleType.REDIRECT]),
+                    Query.equal('deploymentResourceType', DeploymentResourceType.SITE),
+                    Query.equal('deploymentResourceId', params.site),
+                    Query.equal('trigger', RuleTrigger.MANUAL),
                     Query.limit(limit),
                     Query.offset(offset),
                     Query.orderDesc(''),

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

@@ -16,6 +16,7 @@
         BuildRuntime,
         Framework,
         type Models,
+        ProxyResourceType,
         StatusCode
     } from '@appwrite.io/console';
     import { statusCodeOptions } from '$lib/stores/domains';
@@ -85,7 +86,13 @@
             } else if (behaviour === 'REDIRECT') {
                 rule = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .proxy.createRedirectRule(domainName, redirect, statusCode);
+                    .proxy.createRedirectRule(
+                        domainName,
+                        redirect,
+                        statusCode,
+                        page.params.site,
+                        ProxyResourceType.Site
+                    );
             } else if (behaviour === 'ACTIVE') {
                 rule = await sdk
                     .forProject(page.params.region, page.params.project)