diff --git a/package.json b/package.json index 2cfef462d..666f4000e 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@4a5aab5", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84", "@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 8e4974541..b48a48724 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,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@4a5aab5 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@4a5aab5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -215,14 +215,14 @@ packages: resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9562} version: 1.2.1 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@203ff849e6d6a66529bf690af2e97cade99ef488': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@203ff849e6d6a66529bf690af2e97cade99ef488} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab516090e3ae16aef591d8de5f04e1a84fbd': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab516090e3ae16aef591d8de5f04e1a84fbd} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,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@4a5aab5': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@4a5aab5} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4243,11 +4243,11 @@ snapshots: '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@9562': {} - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@203ff849e6d6a66529bf690af2e97cade99ef488(svelte@4.2.19)': dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab516090e3ae16aef591d8de5f04e1a84fbd(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab5(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4260,9 +4260,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@4a5aab5(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@203ff84(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@4a5aab516090e3ae16aef591d8de5f04e1a84fbd(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@203ff849e6d6a66529bf690af2e97cade99ef488(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) diff --git a/src/lib/components/filters/quickfiltersSubMenu.svelte b/src/lib/components/filters/quickfiltersSubMenu.svelte index 23159f67e..0e5793e10 100644 --- a/src/lib/components/filters/quickfiltersSubMenu.svelte +++ b/src/lib/components/filters/quickfiltersSubMenu.svelte @@ -69,7 +69,15 @@ }); }}> - + { + option.checked = !option.checked; + dispatch('add', { + value: option.checked + }); + }} + size="s" /> {capitalize(option.label)} diff --git a/src/lib/components/logs/index.ts b/src/lib/components/logs/index.ts new file mode 100644 index 000000000..588612d36 --- /dev/null +++ b/src/lib/components/logs/index.ts @@ -0,0 +1,2 @@ +export { default as LogsRequest } from './logsRequest.svelte'; +export { default as LogsResponse } from './logsResponse.svelte'; diff --git a/src/lib/components/logs/loggingAlert.svelte b/src/lib/components/logs/loggingAlert.svelte new file mode 100644 index 000000000..fc4018cd2 --- /dev/null +++ b/src/lib/components/logs/loggingAlert.svelte @@ -0,0 +1,26 @@ + + +{#if product === 'site'} + + To view logs and errors, enable them in your + + site settings. + +{:else if product === 'function'} + + To view execution logs and errors, enable them in your + + function settings. + +{/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsRequest.svelte b/src/lib/components/logs/logsRequest.svelte similarity index 100% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsRequest.svelte rename to src/lib/components/logs/logsRequest.svelte diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte b/src/lib/components/logs/logsResponse.svelte similarity index 80% rename from src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte rename to src/lib/components/logs/logsResponse.svelte index 9a082779d..c75e93b47 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/(components)/LogsResponse.svelte +++ b/src/lib/components/logs/logsResponse.svelte @@ -14,9 +14,11 @@ Typography } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; + import LoggingAlert from './loggingAlert.svelte'; export let selectedLog: Models.Execution; - + export let product: 'site' | 'function'; + export let logging: boolean; let responseTab: 'logs' | 'errors' | 'headers' | 'body' = 'logs'; onMount(() => { @@ -37,12 +39,14 @@ on:click={() => (responseTab = 'logs')}> Logs - (responseTab = 'errors')}> - Errors - + {#if product !== 'site'} + (responseTab = 'errors')}> + Errors + + {/if} - - (responseTab = 'body')}> - Body - + {#if product !== 'site'} + (responseTab = 'body')}> + Body + + {/if} {#if responseTab === 'logs'} + {#if !logging} + + {/if} {#if selectedLog.logs} {:else} @@ -72,6 +80,9 @@ {/if} {:else if responseTab === 'errors'} + {#if !logging} + + {/if} {#if selectedLog.errors} {:else} @@ -120,8 +131,8 @@ {:else} - Body data is not captured by Appwrite for your user's security and privacy. To + + Body data is not captured by Appwrite for your user's security and privacy. To display body data in the Logs tab, use . { const parsedRoute = route ?? get(page).route; return ( - preferences[sdk.forProject.client.config.project]?.[parsedRoute.id] ?? { + preferences?.[parsedRoute.id] ?? { limit: null, view: null, columns: null @@ -60,60 +58,58 @@ function createPreferences() { }, getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => { - return ( - preferences[sdk.forProject.client.config.project]?.collections?.[collectionId] ?? [] - ); + return preferences?.collections?.[collectionId] ?? []; }, setLimit: (limit: Preferences['limit']) => update((n) => { const path = get(page).route.id; - const project = sdk.forProject.client.config.project; - if (!n[project]?.[path]) { - n[project] ??= {}; - n[project][path] ??= {}; + + if (!n?.[path]) { + n ??= {}; + n[path] ??= {}; } - n[project][path].limit = limit; + n[path].limit = limit; return n; }), setView: (view: Preferences['view']) => update((n) => { const path = get(page).route.id; - const project = sdk.forProject.client.config.project; - if (!n[project]?.[path]) { - n[project] ??= {}; - n[project][path] ??= {}; + + if (!n?.[path]) { + n ??= {}; + n[path] ??= {}; } - n[project][path].view = view; + n[path].view = view; return n; }), setColumns: (columns: Preferences['columns']) => update((n) => { const path = get(page).route.id; - const project = sdk.forProject.client.config.project; - if (!n[project]?.[path]) { - n[project] ??= {}; - n[project][path] ??= {}; + + if (!n?.[path]) { + n ??= {}; + n[path] ??= {}; } - n[project][path].columns = columns; + n[path].columns = columns; return n; }), setCustomCollectionColumns: (columns: Preferences['columns']) => update((n) => { const current = get(page); - const project = sdk.forProject.client.config.project; + const collection = current.params.collection; - if (!n[project]?.collections?.[collection]) { - n[project] ??= {}; - n[project].collections ??= {}; + if (!n?.collections?.[collection]) { + n ??= {}; + n.collections ??= {}; } - n[project].collections[collection] = columns; + n.collections[collection] = columns; return n; }), @@ -127,22 +123,19 @@ function createPreferences() { return teamPrefs; }, getDisplayNames: () => { - const id = get(organization)?.$id; - if (!id) return {}; - - return preferences?.[id]?.displayNames ?? {}; + return preferences?.displayNames ?? {}; }, setDisplayNames: async (collectionId: string, names: TeamPreferences['names']) => { const id = get(organization).$id; let teamPrefs: Models.Preferences; update((n) => { - if (!n[id]?.displayNames) { - n[id] ??= {}; - n[id].displayNames ??= {}; + if (!n?.displayNames) { + n ??= {}; + n.displayNames ??= {}; } - teamPrefs = n[id]; - n[id].displayNames[collectionId] = names; + teamPrefs = n; + n.displayNames[collectionId] = names; return n; }); diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index 5cc61575d..45235332a 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -46,7 +46,7 @@ function updateMaxWidth() { const tableCells = Array.from(document.querySelectorAll('.less-width-truncated')); - const visibleColumnsCount = $columns.filter((col) => col.show).length; + const visibleColumnsCount = $columns.filter((col) => !col.hide).length; const newMaxWidth = Math.max(50 - (visibleColumnsCount - 1) * 5, 25); tableCells.forEach((cell) => { diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte index fd38e91fb..3111f513c 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/+page.svelte @@ -9,7 +9,7 @@ import { project } from '$routes/(console)/project-[project]/store'; import { base } from '$app/paths'; import { View } from '$lib/helpers/load'; - import { Alert, Icon, Layout, Link, Tooltip } from '@appwrite.io/pink-svelte'; + import { Icon, Layout, Tooltip } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; import Table from './table.svelte'; import { columns } from './store'; @@ -54,17 +54,6 @@ - {#if !data.func.logging} -
- - To view execution logs and errors, enable them in your - - Function settings. - -
- {/if} {#if data?.executions?.total} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte index 6657a6fc0..42248ac4a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/sheet.svelte @@ -19,12 +19,12 @@ import { capitalize } from '$lib/helpers/string'; import { Copy } from '$lib/components'; import { logStatusConverter } from './store'; - import LogsResponse from './(components)/LogsResponse.svelte'; - import LogsRequest from './(components)/LogsRequest.svelte'; + import { LogsRequest, LogsResponse } from '$lib/components/logs'; export let open = false; export let selectedLogId: string; export let logs: Models.Execution[]; + export let logging: boolean; function nextLog() { const currentIndex = logs.findIndex((log) => log.$id === selectedLogId); @@ -160,7 +160,7 @@ - + {/if} diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte index 0fe896442..3d82af0c9 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/executions/table.svelte @@ -9,6 +9,7 @@ import { formatTimeDetailed } from '$lib/helpers/timeConversion'; import { logStatusConverter } from './store'; import DualTimeView from '$lib/components/dualTimeView.svelte'; + import { func } from '../store'; export let columns: Column[]; export let logs: Models.ExecutionList; @@ -82,4 +83,4 @@ {/each} - + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte index 0db9d6895..0d1468222 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/+page.svelte @@ -108,7 +108,7 @@ - + diff --git a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte index 76d235655..a5a92f00a 100644 --- a/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte +++ b/src/routes/(console)/project-[project]/functions/function-[function]/settings/updateLogging.svelte @@ -1,60 +1,49 @@ -
+ Execution logs - + - When disabled, execution logs and errors will not be shown in the - Executions tab. We recommend disabling them for better performance in production. + When disabled, executions will exclude logs and errors, and will be slightly faster. - + diff --git a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte index aa1df9886..955d3e280 100644 --- a/src/routes/(console)/project-[project]/settings/updateInstallations.svelte +++ b/src/routes/(console)/project-[project]/settings/updateInstallations.svelte @@ -96,7 +96,11 @@ + columns={[ + { id: 'repo', width: { min: 150, max: 500 } }, + { id: 'updated', width: { min: 150, max: 500 } }, + { id: 'actions', width: 60 } + ]}> Repository Updated diff --git a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte index 9ba9a924e..fc15eccc3 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/connectRepoModal.svelte @@ -62,6 +62,7 @@ site.name, site.framework as Framework, site.enabled, + site.logging || undefined, site.timeout, site.installCommand, site.buildCommand, diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index e5c79cd8b..60bcb040a 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -22,7 +22,6 @@ import { Badge, Layout, Logs, Typography } from '@appwrite.io/pink-svelte'; import LogsTimer from './logsTimer.svelte'; - export let site: Models.Site; export let deployment: Models.Deployment; export let hideTitle = false; export let hideScrollButtons = false; diff --git a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte index edca6d2d0..8dee1b4d9 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/deploying/+page.svelte @@ -59,7 +59,6 @@
diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte index 3578b0598..5bac94204 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte @@ -55,6 +55,7 @@ buildRuntime, undefined, undefined, + undefined, installCommand || undefined, buildCommand || undefined, outputDirectory || undefined, diff --git a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte index 2f10361ac..1cf3266e4 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte @@ -99,6 +99,7 @@ buildRuntime, undefined, undefined, + undefined, installCommand, buildCommand, outputDirectory, diff --git a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte index dc869e44d..0223f6f0b 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/templates/template-[template]/+page.svelte @@ -118,6 +118,7 @@ buildRuntime, undefined, undefined, + undefined, framework.installCommand, framework.buildCommand, framework.outputDirectory, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte index 6de0fdec1..0a96db614 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte @@ -79,6 +79,7 @@ site.name, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index cd19241e2..e06295683 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -74,12 +74,7 @@ open badgeType={badgeTypeDeployment(data.deployment.status)} hideDivider> - + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index de191bbe1..fdcc0b319 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -15,27 +15,28 @@ import { writable } from 'svelte/store'; export let data; + + const ruleId = $page.url.searchParams.get('rule'); let selectedTab: 'cname' | 'nameserver'; - let domainData = data.domain; + let verified = false; let routeBase = `${base}/project-${$page.params.project}/sites/site-${$page.params.site}/domains`; let isSubmitting = writable(false); - async function addDomain() { + async function verify() { const isNewDomain = data.domainsList.domains.findIndex((rule) => rule.domain === $page.params.domain) === -1; try { - // if (selectedTab === 'cname'){ - // domainData = await sdk.forProject.proxy.updateRuleVerification( - // $page.params.domain - // ); - // } - if (isNewDomain && isCloud) { - domainData = await sdk.forConsole.domains.create( + if (selectedTab === 'cname') { + const ruleData = await sdk.forProject.proxy.updateRuleVerification(ruleId); + verified = ruleData.status === 'verified'; + } else if (isNewDomain && isCloud) { + const domainData = await sdk.forConsole.domains.create( $organization.$id, $page.params.domain ); + verified = domainData.nameservers.toLocaleLowerCase() === 'appwrite'; } addNotification({ @@ -46,8 +47,7 @@ await invalidate(Dependencies.DOMAINS); await invalidate(Dependencies.SITES_DOMAINS); } catch (error) { - await invalidate(Dependencies.DOMAINS); - + verified = false; addNotification({ type: 'error', message: error.message @@ -56,20 +56,15 @@ } async function back() { - if ($page.url.searchParams.has('rule')) { - const rule = $page.url.searchParams.get('rule'); - await sdk.forProject.proxy.deleteRule(rule); + if (ruleId) { + await sdk.forProject.proxy.deleteRule(ruleId); } await goto(`${routeBase}/add-domain?domain=${$page.params.domain}`); } - - $: isVerified = domainData?.nameservers - ? domainData?.nameservers.toLocaleLowerCase() === 'appwrite' - : undefined; -
+ - +
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte index 66f2acae2..5ec97049e 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/verificationFieldset.svelte @@ -38,7 +38,7 @@ {#if selectedTab === 'cname' && isSubDomain} {:else if isCloud} - + {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte deleted file mode 100644 index 2c6ff7f40..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsRequest.svelte +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - (requestTab = 'parameters')}> - Parameters - - - (requestTab = 'headers')}> - Headers - - - - - {#if requestTab === 'parameters'} - {#if parameters?.length} - - - Key - Value - - {#each parameters as parameter} - - {parameter.name} - {parameter.value} - - {/each} - - {:else} - - No parameters found. - - {/if} - {:else if requestTab === 'headers'} - {#if selectedLog.requestHeaders?.length} - - - Key - Value - - {#each selectedLog.requestHeaders as request} - - {request.name} - {request.value} - - {/each} - - - - - Missing headers? Check the docs to - see the supported data and how to log it. - - - {:else} - - No headers found. - - {/if} - {/if} - diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte deleted file mode 100644 index 94cd2b55e..000000000 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/(components)/LogsResponse.svelte +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - (responseTab = 'logs')}> - Logs - - - (responseTab = 'headers')}> - Headers - - - - - - {#if responseTab === 'logs'} - {#if selectedLog.logs} - - {:else} - - No logs found. - - {/if} - {:else if responseTab === 'errors'} - {#if selectedLog.errors} - - {:else} - - No errors found. - - {/if} - {:else if responseTab === 'headers'} - {#if selectedLog.responseHeaders?.length} - - - Key - Value - - {#each selectedLog.responseHeaders as request} - - {request.name} - {request.value} - - {/each} - - - - - Missing headers? Check the docs to - see the supported data and how to log it. - - - {:else} - - No headers found. - - {/if} - {:else if responseTab === 'body'} - {#if selectedLog.responseBody} - - {:else} - - No parameters found. - - {/if} - {/if} - diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte index d50a824b3..63979f208 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/sheet.svelte @@ -14,10 +14,10 @@ Typography } from '@appwrite.io/pink-svelte'; import { timeFromNow } from '$lib/helpers/date'; - import LogsRequest from './(components)/LogsRequest.svelte'; - import LogsResponse from './(components)/LogsResponse.svelte'; import { capitalize } from '$lib/helpers/string'; import { Copy } from '$lib/components'; + import { LogsRequest, LogsResponse } from '$lib/components/logs'; + import { site } from '../store'; export let open = false; export let selectedLogId: string; @@ -127,7 +127,7 @@ - + {/if} diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte index 676d1c3a0..78493460f 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/+page.svelte @@ -15,6 +15,7 @@ import { isCloud } from '$lib/system'; import UpdateResourceLimits from './updateResourceLimits.svelte'; import UpdateVariables from '$routes/(console)/project-[project]/updateVariables.svelte'; + import UpdateLogging from './updateLogging.svelte'; export let data; @@ -74,5 +75,6 @@ {/if} + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte index 5029895a5..64d653c8b 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/disconnectRepo.svelte @@ -22,6 +22,7 @@ site.name, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte index cda3dfc30..1643b3c69 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateBuildSettings.svelte @@ -40,6 +40,7 @@ site.name, selectedFramework.key as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, installCommand || undefined, buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte new file mode 100644 index 000000000..5f4bae6c4 --- /dev/null +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateLogging.svelte @@ -0,0 +1,68 @@ + + + + + Execution logs + + + + When disabled, request logs will exclude logs and errors, and site responses will be + slightly faster. + + + + + + + + diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte index ab832d922..dc66144f0 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateName.svelte @@ -23,6 +23,7 @@ siteName, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte index a68a3b396..2c32e73db 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRepository.svelte @@ -70,6 +70,7 @@ site.name, site?.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateResourceLimits.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateResourceLimits.svelte index 8f9cc8285..06c7590f4 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateResourceLimits.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateResourceLimits.svelte @@ -24,6 +24,7 @@ site.name, site.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte index 88fde4c1c..c7e495a21 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateRuntimeSettings.svelte @@ -29,6 +29,7 @@ site.name, site?.framework as Framework, site.enabled || undefined, + site.logging || undefined, site.timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined, diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte index 70cdf94e7..4eae9d04e 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/settings/updateTimeout.svelte @@ -22,6 +22,7 @@ site.name, site?.framework as Framework, site.enabled || undefined, + site.logging || undefined, timeout || undefined, site.installCommand || undefined, site.buildCommand || undefined,