diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte index df3e783aa..f807e8487 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte @@ -17,6 +17,8 @@ import { Icon, Layout } from '@appwrite.io/pink-svelte'; import { IconPlus } from '@appwrite.io/pink-icons-svelte'; import EmptySearch from '$lib/components/emptySearch.svelte'; + import ErrorResourceBlocked from '../errorResourceBlocked.svelte'; + import ErrorFailedToLoad from '../errorFailedToLoad.svelte'; export let data: PageData; @@ -46,56 +48,64 @@ ]); - - - - - - - - {#if $canWriteDatabases} - - {/if} - - - - {#if data.databases.total} - {#if data.view === 'grid'} - - {:else} - - {/if} - - - {:else if data.search} - - - +{#if data.error} + {#if data.error.type === 'general_resource_blocked'} + {:else} - (showCreate = true)} /> + {/if} - +{:else} + + + + + + + + {#if $canWriteDatabases} + + {/if} + + - + {#if data.databases.total} + {#if data.view === 'grid'} + + {:else} +
+ {/if} + + + {:else if data.search} + + + + {:else} + (showCreate = true)} /> + {/if} + + + +{/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts index 6abcffdc5..f78a84442 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts @@ -21,23 +21,35 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) => // already loaded by parent. const { currentPlan } = await parent(); - const { databases, policies, lastBackups } = await fetchDatabasesAndBackups( - limit, - offset, - params, - search, - currentPlan - ); + try { + const { databases, policies, lastBackups } = await fetchDatabasesAndBackups( + limit, + offset, + params, + search, + currentPlan + ); + return { + offset, + limit, + view, + search, + policies, + databases, + lastBackups + }; - return { - offset, - limit, - view, - search, - policies, - databases, - lastBackups - }; + } catch (error) { + return { + error: { + type: error.type, + }, + offset, + limit, + view, + search, + }; + } }; async function fetchDatabasesAndBackups( diff --git a/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte b/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte new file mode 100644 index 000000000..2e458f043 --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/errorFailedToLoad.svelte @@ -0,0 +1,15 @@ + + + + + Failed to load {resource} +

+ An error occurred while trying to load the {resource.toLowerCase()}. Please try again later or contact support if the issue persists. +

+
+
diff --git a/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte b/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte new file mode 100644 index 000000000..28841852f --- /dev/null +++ b/src/routes/(console)/project-[region]-[project]/errorResourceBlocked.svelte @@ -0,0 +1,16 @@ + + + + + Your {resource} is paused +

+ We've detected unusual activity and temporarily paused your {resource}. If you believe + this is a mistake or need urgent access, please contact support@appwrite.io. +

+
+