mirror of
https://github.com/appwrite/console.git
synced 2026-11-18 20:47:21 +00:00
Merge pull request #1987 from appwrite/fix-block-info
Fix: blocked resource info
This commit is contained in:
26 files changed
+292
-349
No files matched your search
Vendored
+12
@@ -1,2 +1,14 @@
|
||||
/// <reference types="@sveltejs/kit" />
|
||||
interface Window {}
|
||||
|
||||
namespace App {
|
||||
interface Error {
|
||||
type?: string;
|
||||
}
|
||||
|
||||
interface HandleClientError {
|
||||
message: string;
|
||||
status?: number;
|
||||
type?: string;
|
||||
}
|
||||
}
|
||||
+5
-1
@@ -13,13 +13,17 @@ Sentry.init({
|
||||
|
||||
export const handleError: HandleClientError = ({ error, message, status }) => {
|
||||
console.error(error);
|
||||
|
||||
let type;
|
||||
if (error instanceof AppwriteException) {
|
||||
status = error.code === 0 ? undefined : error.code;
|
||||
message = error.message;
|
||||
type = error.type;
|
||||
}
|
||||
|
||||
return {
|
||||
message,
|
||||
status
|
||||
status,
|
||||
type
|
||||
};
|
||||
};
|
||||
@@ -1,13 +1,44 @@
|
||||
<script>
|
||||
<script lang="ts">
|
||||
import { page } from '$app/state';
|
||||
import { Container } from '$lib/layout';
|
||||
import { Typography } from '@appwrite.io/pink-svelte';
|
||||
import { Card, Link, Typography } from '@appwrite.io/pink-svelte';
|
||||
import SupportWizard from '$routes/(console)/supportWizard.svelte';
|
||||
import { capitalize } from '$lib/helpers/string';
|
||||
import { currentPlan } from '$lib/stores/organization';
|
||||
import { wizard } from '$lib/stores/wizard';
|
||||
function getResource(id: string) {
|
||||
id = id.replace('/(console)/project-[region]-[project]/', '');
|
||||
let parts = id.split('/');
|
||||
const resource = parts[0];
|
||||
|
||||
return resource === 'settings' ? 'project' : resource;
|
||||
}
|
||||
</script>
|
||||
|
||||
<Container>
|
||||
<Typography.Title size="xl"
|
||||
>{'status' in page.error
|
||||
? page.error.status || 'Invalid Argument'
|
||||
: 'Invalid Argument'}</Typography.Title>
|
||||
<p class="body-text-2 u-bold u-margin-block-start-4">{page.error.message}</p>
|
||||
{#if page.error.type === 'general_resource_blocked'}
|
||||
{@const resource = getResource(page.route.id)}
|
||||
<Card.Base>
|
||||
<Typography.Title size="s">Your {capitalize(resource)} is paused</Typography.Title>
|
||||
<p class="text-red-500">
|
||||
We've detected unusual activity and temporarily paused your {resource}. If you
|
||||
believe this is a mistake or need urgent access, please contact
|
||||
{#if $currentPlan?.premiumSupport}
|
||||
<Link.Button
|
||||
on:click={() => {
|
||||
wizard.start(SupportWizard);
|
||||
}}>support</Link.Button
|
||||
>.
|
||||
{:else}
|
||||
support@appwrite.io.
|
||||
{/if}
|
||||
</p>
|
||||
</Card.Base>
|
||||
{:else}
|
||||
<Typography.Title size="xl"
|
||||
>{'status' in page.error
|
||||
? page.error.status || 'Invalid Argument'
|
||||
: 'Invalid Argument'}</Typography.Title>
|
||||
<p class="body-text-2 u-bold u-margin-block-start-4">{page.error.message}</p>
|
||||
{/if}
|
||||
</Container>
|
||||
@@ -1,6 +1,5 @@
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import type { LayoutLoad } from './$types';
|
||||
import { preferences } from '$lib/stores/preferences';
|
||||
import { failedInvoice } from '$lib/stores/billing';
|
||||
@@ -17,50 +16,46 @@ export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.PROJECT);
|
||||
let currentPlan: Plan = null;
|
||||
|
||||
try {
|
||||
const project = await sdk.forConsole.projects.get(params.project);
|
||||
const [organization, prefs, regionalConsoleVariables, _] = await Promise.all([
|
||||
sdk.forConsole.teams.get(project.teamId) as Promise<Organization>,
|
||||
sdk.forConsole.account.getPrefs(),
|
||||
sdk.forConsoleIn(project.region).console.variables(),
|
||||
loadAvailableRegions(project.teamId)
|
||||
]);
|
||||
if (prefs?.organization !== project.teamId) {
|
||||
sdk.forConsole.account.updatePrefs({
|
||||
...prefs,
|
||||
organization: project.teamId
|
||||
});
|
||||
}
|
||||
await preferences.loadTeamPrefs(project.teamId);
|
||||
let roles = isCloud ? [] : defaultRoles;
|
||||
let scopes = isCloud ? [] : defaultScopes;
|
||||
if (isCloud) {
|
||||
currentPlan = await sdk.forConsole.billing.getOrganizationPlan(project.teamId);
|
||||
const res = await sdk.forConsole.billing.getRoles(project.teamId);
|
||||
roles = res.roles;
|
||||
scopes = res.scopes;
|
||||
if (scopes.includes('billing.read')) {
|
||||
await failedInvoice.load(project.teamId);
|
||||
if (get(failedInvoice)) {
|
||||
headerAlert.add({
|
||||
show: true,
|
||||
component: PaymentFailed,
|
||||
id: 'paymentFailed',
|
||||
importance: 1
|
||||
});
|
||||
}
|
||||
const project = await sdk.forConsole.projects.get(params.project);
|
||||
const [organization, prefs, regionalConsoleVariables, _] = await Promise.all([
|
||||
sdk.forConsole.teams.get(project.teamId) as Promise<Organization>,
|
||||
sdk.forConsole.account.getPrefs(),
|
||||
sdk.forConsoleIn(project.region).console.variables(),
|
||||
loadAvailableRegions(project.teamId)
|
||||
]);
|
||||
if (prefs?.organization !== project.teamId) {
|
||||
sdk.forConsole.account.updatePrefs({
|
||||
...prefs,
|
||||
organization: project.teamId
|
||||
});
|
||||
}
|
||||
await preferences.loadTeamPrefs(project.teamId);
|
||||
let roles = isCloud ? [] : defaultRoles;
|
||||
let scopes = isCloud ? [] : defaultScopes;
|
||||
if (isCloud) {
|
||||
currentPlan = await sdk.forConsole.billing.getOrganizationPlan(project.teamId);
|
||||
const res = await sdk.forConsole.billing.getRoles(project.teamId);
|
||||
roles = res.roles;
|
||||
scopes = res.scopes;
|
||||
if (scopes.includes('billing.read')) {
|
||||
await failedInvoice.load(project.teamId);
|
||||
if (get(failedInvoice)) {
|
||||
headerAlert.add({
|
||||
show: true,
|
||||
component: PaymentFailed,
|
||||
id: 'paymentFailed',
|
||||
importance: 1
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
project,
|
||||
organization,
|
||||
regionalConsoleVariables,
|
||||
roles,
|
||||
scopes,
|
||||
currentPlan
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
|
||||
return {
|
||||
project,
|
||||
organization,
|
||||
regionalConsoleVariables,
|
||||
roles,
|
||||
scopes,
|
||||
currentPlan
|
||||
};
|
||||
};
|
||||
@@ -3,17 +3,12 @@ import Header from './header.svelte';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import type { LayoutLoad } from './$types';
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.TEAM);
|
||||
try {
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
team: await sdk.forProject(params.region, params.project).teams.get(params.team)
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
team: await sdk.forProject(params.region, params.project).teams.get(params.team)
|
||||
};
|
||||
};
|
||||
@@ -2,15 +2,10 @@ import { isValueOfStringEnum } from '$lib/helpers/types';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { UserUsageRange } from '@appwrite.io/console';
|
||||
import type { PageLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: PageLoad = async ({ params }) => {
|
||||
const period = isValueOfStringEnum(UserUsageRange, params.period)
|
||||
? params.period
|
||||
: UserUsageRange.ThirtyDays;
|
||||
try {
|
||||
return sdk.forProject(params.region, params.project).users.getUsage(period);
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return sdk.forProject(params.region, params.project).users.getUsage(period);
|
||||
};
|
||||
@@ -3,24 +3,19 @@ import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.USER);
|
||||
|
||||
try {
|
||||
const [user, userFactors] = await Promise.all([
|
||||
sdk.forProject(params.region, params.project).users.get(params.user),
|
||||
sdk.forProject(params.region, params.project).users.listMfaFactors(params.user)
|
||||
]);
|
||||
const [user, userFactors] = await Promise.all([
|
||||
sdk.forProject(params.region, params.project).users.get(params.user),
|
||||
sdk.forProject(params.region, params.project).users.listMfaFactors(params.user)
|
||||
]);
|
||||
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
user,
|
||||
userFactors
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
user,
|
||||
userFactors
|
||||
};
|
||||
};
|
||||
@@ -28,7 +28,6 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) =>
|
||||
search,
|
||||
currentPlan
|
||||
);
|
||||
|
||||
return {
|
||||
offset,
|
||||
limit,
|
||||
|
||||
+5
-12
@@ -1,6 +1,5 @@
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import type { LayoutLoad } from './$types';
|
||||
import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
@@ -8,15 +7,9 @@ import Header from './header.svelte';
|
||||
export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.DATABASE);
|
||||
|
||||
try {
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
database: await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.databases.get(params.database)
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
database: await sdk.forProject(params.region, params.project).databases.get(params.database)
|
||||
};
|
||||
};
|
||||
+16
-20
@@ -3,30 +3,26 @@ import { Dependencies } from '$lib/constants';
|
||||
import type { LayoutLoad } from './$types';
|
||||
import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import SubNavigation from './subNavigation.svelte';
|
||||
import { Query } from '@appwrite.io/console';
|
||||
|
||||
export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.COLLECTION);
|
||||
try {
|
||||
const [collection, allCollections] = await Promise.all([
|
||||
sdk
|
||||
.forProject(params.region, params.project)
|
||||
.databases.getCollection(params.database, params.collection),
|
||||
sdk
|
||||
.forProject(params.region, params.project)
|
||||
.databases.listCollections(params.database, [Query.orderDesc(''), Query.limit(100)])
|
||||
]);
|
||||
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
subNavigation: SubNavigation,
|
||||
collection,
|
||||
allCollections
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
const [collection, allCollections] = await Promise.all([
|
||||
sdk
|
||||
.forProject(params.region, params.project)
|
||||
.databases.getCollection(params.database, params.collection),
|
||||
sdk
|
||||
.forProject(params.region, params.project)
|
||||
.databases.listCollections(params.database, [Query.orderDesc(''), Query.limit(100)])
|
||||
]);
|
||||
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
subNavigation: SubNavigation,
|
||||
collection,
|
||||
allCollections
|
||||
};
|
||||
};
|
||||
+27
-32
@@ -3,47 +3,42 @@ import { Dependencies } from '$lib/constants';
|
||||
import type { LayoutLoad } from './$types';
|
||||
import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import type { Attributes } from '../store';
|
||||
|
||||
export const load: LayoutLoad = async ({ params, parent, depends }) => {
|
||||
depends(Dependencies.DOCUMENT);
|
||||
const { collection } = await parent();
|
||||
|
||||
try {
|
||||
const document = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.databases.getDocument(params.database, params.collection, params.document);
|
||||
const document = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.databases.getDocument(params.database, params.collection, params.document);
|
||||
|
||||
/**
|
||||
* Sanitize DateTime to remove UTC Timezone section.
|
||||
*/
|
||||
collection.attributes.forEach((attribute) => {
|
||||
const { type, key, array } = attribute as unknown as Attributes;
|
||||
if (type === 'datetime') {
|
||||
if (array) {
|
||||
document[key] = document[key].map((n: string) => {
|
||||
if (!n) {
|
||||
return null;
|
||||
}
|
||||
return new Date(n).toISOString().slice(0, 23);
|
||||
});
|
||||
} else {
|
||||
if (document[key]) {
|
||||
document[key] = new Date(document[key]).toISOString().slice(0, 23);
|
||||
} else {
|
||||
document[key] = null;
|
||||
/**
|
||||
* Sanitize DateTime to remove UTC Timezone section.
|
||||
*/
|
||||
collection.attributes.forEach((attribute) => {
|
||||
const { type, key, array } = attribute as unknown as Attributes;
|
||||
if (type === 'datetime') {
|
||||
if (array) {
|
||||
document[key] = document[key].map((n: string) => {
|
||||
if (!n) {
|
||||
return null;
|
||||
}
|
||||
return new Date(n).toISOString().slice(0, 23);
|
||||
});
|
||||
} else {
|
||||
if (document[key]) {
|
||||
document[key] = new Date(document[key]).toISOString().slice(0, 23);
|
||||
} else {
|
||||
document[key] = null;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
document
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
document
|
||||
};
|
||||
};
|
||||
@@ -2,15 +2,10 @@ import { isValueOfStringEnum } from '$lib/helpers/types';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { DatabaseUsageRange } from '@appwrite.io/console';
|
||||
import type { PageLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: PageLoad = async ({ params }) => {
|
||||
const period = isValueOfStringEnum(DatabaseUsageRange, params.period)
|
||||
? params.period
|
||||
: DatabaseUsageRange.ThirtyDays;
|
||||
try {
|
||||
return sdk.forProject(params.region, params.project).databases.getUsage(period);
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return sdk.forProject(params.region, params.project).databases.getUsage(period);
|
||||
};
|
||||
+17
-24
@@ -3,7 +3,6 @@ import { Dependencies } from '$lib/constants';
|
||||
import type { LayoutLoad } from './$types';
|
||||
import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import { Query } from '@appwrite.io/console';
|
||||
import { RuleType } from '$lib/stores/sdk';
|
||||
|
||||
@@ -11,29 +10,23 @@ export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.FUNCTION);
|
||||
depends(Dependencies.DEPLOYMENTS);
|
||||
|
||||
try {
|
||||
const func = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.functions.get(params.function);
|
||||
const func = await sdk.forProject(params.region, params.project).functions.get(params.function);
|
||||
|
||||
//TODO remove rule limit of 1 and display extra rules
|
||||
const proxyRuleList = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.proxy.listRules([
|
||||
Query.equal('type', RuleType.DEPLOYMENT),
|
||||
Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION),
|
||||
Query.equal('deploymentResourceId', params.function),
|
||||
Query.equal('deploymentId', func.deploymentId),
|
||||
Query.limit(1)
|
||||
]);
|
||||
//TODO remove rule limit of 1 and display extra rules
|
||||
const proxyRuleList = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.proxy.listRules([
|
||||
Query.equal('type', RuleType.DEPLOYMENT),
|
||||
Query.equal('deploymentResourceType', DeploymentResourceType.FUNCTION),
|
||||
Query.equal('deploymentResourceId', params.function),
|
||||
Query.equal('deploymentId', func.deploymentId),
|
||||
Query.limit(1)
|
||||
]);
|
||||
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
function: func,
|
||||
proxyRuleList
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
function: func,
|
||||
proxyRuleList
|
||||
};
|
||||
};
|
||||
+6
-11
@@ -1,18 +1,13 @@
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { FunctionUsageRange } from '@appwrite.io/console';
|
||||
import type { PageLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import { isValueOfStringEnum } from '$lib/helpers/types';
|
||||
|
||||
export const load: PageLoad = async ({ params }) => {
|
||||
try {
|
||||
const period = isValueOfStringEnum(FunctionUsageRange, params.period)
|
||||
? params.period
|
||||
: FunctionUsageRange.ThirtyDays;
|
||||
return sdk
|
||||
.forProject(params.region, params.project)
|
||||
.functions.getUsage(params.function, period);
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
const period = isValueOfStringEnum(FunctionUsageRange, params.period)
|
||||
? params.period
|
||||
: FunctionUsageRange.ThirtyDays;
|
||||
return sdk
|
||||
.forProject(params.region, params.project)
|
||||
.functions.getUsage(params.function, period);
|
||||
};
|
||||
@@ -2,15 +2,11 @@ import { isValueOfStringEnum } from '$lib/helpers/types';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { FunctionUsageRange } from '@appwrite.io/console';
|
||||
import type { PageLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: PageLoad = async ({ params }) => {
|
||||
const period = isValueOfStringEnum(FunctionUsageRange, params.period)
|
||||
? params.period
|
||||
: FunctionUsageRange.ThirtyDays;
|
||||
try {
|
||||
return sdk.forProject(params.region, params.project).functions.listUsage(period);
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
|
||||
return sdk.forProject(params.region, params.project).functions.listUsage(period);
|
||||
};
|
||||
+55
-60
@@ -3,77 +3,72 @@ import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import type { Models } from '@appwrite.io/console';
|
||||
|
||||
export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.MESSAGING_MESSAGE);
|
||||
|
||||
try {
|
||||
const message = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.messaging.getMessage(params.message);
|
||||
const message = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.messaging.getMessage(params.message);
|
||||
|
||||
const topicsById: Record<string, Models.Topic> = {};
|
||||
const topicsPromise = Promise.allSettled(
|
||||
message.topics.map((topicId) =>
|
||||
sdk.forProject(params.region, params.project).messaging.getTopic(topicId)
|
||||
)
|
||||
).then((results) => {
|
||||
results.forEach((result) => {
|
||||
if (result.status === 'fulfilled') {
|
||||
topicsById[result.value.$id] = result.value;
|
||||
}
|
||||
const topicsById: Record<string, Models.Topic> = {};
|
||||
const topicsPromise = Promise.allSettled(
|
||||
message.topics.map((topicId) =>
|
||||
sdk.forProject(params.region, params.project).messaging.getTopic(topicId)
|
||||
)
|
||||
).then((results) => {
|
||||
results.forEach((result) => {
|
||||
if (result.status === 'fulfilled') {
|
||||
topicsById[result.value.$id] = result.value;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
const targetsById: Record<string, Models.Target> = {};
|
||||
const targetsPromise = sdk
|
||||
.forProject(params.region, params.project)
|
||||
.messaging.listTargets(params.message)
|
||||
.then((response) => {
|
||||
response.targets.forEach((target) => {
|
||||
targetsById[target.$id] = target;
|
||||
});
|
||||
});
|
||||
|
||||
const targetsById: Record<string, Models.Target> = {};
|
||||
const targetsPromise = sdk
|
||||
await Promise.allSettled([topicsPromise, targetsPromise]);
|
||||
|
||||
const usersById: Record<string, Models.User<Models.Preferences>> = {};
|
||||
const usersPromise = Object.values(targetsById).map((target) =>
|
||||
sdk
|
||||
.forProject(params.region, params.project)
|
||||
.messaging.listTargets(params.message)
|
||||
.then((response) => {
|
||||
response.targets.forEach((target) => {
|
||||
targetsById[target.$id] = target;
|
||||
});
|
||||
});
|
||||
.users.get(target.userId)
|
||||
.then((user) => {
|
||||
usersById[user.$id] = user;
|
||||
})
|
||||
);
|
||||
|
||||
await Promise.allSettled([topicsPromise, targetsPromise]);
|
||||
const messageRecipients: Record<string, Models.User<Models.Preferences>> = {};
|
||||
const messageRecipientsPromise = Object.values(message.users).map((userId) =>
|
||||
sdk
|
||||
.forProject(params.region, params.project)
|
||||
.users.get(userId)
|
||||
.then((user) => {
|
||||
messageRecipients[user.$id] = user;
|
||||
})
|
||||
.catch(() => {
|
||||
messageRecipients[userId] = null;
|
||||
})
|
||||
);
|
||||
|
||||
const usersById: Record<string, Models.User<Models.Preferences>> = {};
|
||||
const usersPromise = Object.values(targetsById).map((target) =>
|
||||
sdk
|
||||
.forProject(params.region, params.project)
|
||||
.users.get(target.userId)
|
||||
.then((user) => {
|
||||
usersById[user.$id] = user;
|
||||
})
|
||||
);
|
||||
await Promise.allSettled([usersPromise, messageRecipientsPromise]);
|
||||
|
||||
const messageRecipients: Record<string, Models.User<Models.Preferences>> = {};
|
||||
const messageRecipientsPromise = Object.values(message.users).map((userId) =>
|
||||
sdk
|
||||
.forProject(params.region, params.project)
|
||||
.users.get(userId)
|
||||
.then((user) => {
|
||||
messageRecipients[user.$id] = user;
|
||||
})
|
||||
.catch(() => {
|
||||
messageRecipients[userId] = null;
|
||||
})
|
||||
);
|
||||
|
||||
await Promise.allSettled([usersPromise, messageRecipientsPromise]);
|
||||
|
||||
return {
|
||||
message,
|
||||
topicsById,
|
||||
targetsById,
|
||||
usersById,
|
||||
messageRecipients,
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs
|
||||
};
|
||||
} catch (e) {
|
||||
throw error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
message,
|
||||
topicsById,
|
||||
targetsById,
|
||||
usersById,
|
||||
messageRecipients,
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs
|
||||
};
|
||||
};
|
||||
+5
-10
@@ -3,18 +3,13 @@ import { sdk } from '$lib/stores/sdk';
|
||||
import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
import type { LayoutLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.WEBHOOK);
|
||||
|
||||
try {
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
webhook: await sdk.forConsole.projects.getWebhook(params.project, params.webhook)
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
webhook: await sdk.forConsole.projects.getWebhook(params.project, params.webhook)
|
||||
};
|
||||
};
|
||||
@@ -26,19 +26,17 @@ export const load = async ({ url, depends, route, params }) => {
|
||||
} as Models.SiteList
|
||||
};
|
||||
|
||||
const siteList = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.sites.list(
|
||||
[Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
|
||||
search || undefined
|
||||
);
|
||||
|
||||
return {
|
||||
sitesLive,
|
||||
offset,
|
||||
limit,
|
||||
search,
|
||||
siteList,
|
||||
siteList: await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.sites.list(
|
||||
[Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
|
||||
search || undefined
|
||||
),
|
||||
view
|
||||
};
|
||||
};
|
||||
@@ -2,21 +2,16 @@ import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load = async ({ depends, params }) => {
|
||||
depends(Dependencies.SITE);
|
||||
try {
|
||||
const [site] = await Promise.all([
|
||||
sdk.forProject(params.region, params.project).sites.get(params.site)
|
||||
]);
|
||||
const [site] = await Promise.all([
|
||||
sdk.forProject(params.region, params.project).sites.get(params.site)
|
||||
]);
|
||||
|
||||
return {
|
||||
site,
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
site,
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs
|
||||
};
|
||||
};
|
||||
+5
-9
@@ -1,16 +1,12 @@
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import { error } from '@sveltejs/kit';
|
||||
import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
|
||||
export const load = async ({ depends }) => {
|
||||
depends(Dependencies.SITE);
|
||||
try {
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs
|
||||
};
|
||||
};
|
||||
+2
-6
@@ -2,15 +2,11 @@ import { isValueOfStringEnum } from '$lib/helpers/types';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { SiteUsageRange } from '@appwrite.io/console';
|
||||
import type { PageLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: PageLoad = async ({ params }) => {
|
||||
const period = isValueOfStringEnum(SiteUsageRange, params.period)
|
||||
? params.period
|
||||
: SiteUsageRange.ThirtyDays;
|
||||
try {
|
||||
return sdk.forProject(params.region, params.project).sites.getUsage(params.site, period);
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
|
||||
return sdk.forProject(params.region, params.project).sites.getUsage(params.site, period);
|
||||
};
|
||||
@@ -2,15 +2,10 @@ import { isValueOfStringEnum } from '$lib/helpers/types';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { SiteUsageRange } from '@appwrite.io/console';
|
||||
import type { PageLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: PageLoad = async ({ params }) => {
|
||||
const period = isValueOfStringEnum(SiteUsageRange, params.period)
|
||||
? params.period
|
||||
: SiteUsageRange.ThirtyDays;
|
||||
try {
|
||||
return sdk.forProject(params.region, params.project).sites.listUsage(period);
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return sdk.forProject(params.region, params.project).sites.listUsage(period);
|
||||
};
|
||||
@@ -10,17 +10,18 @@ export const load: PageLoad = async ({ url, route, params }) => {
|
||||
const view = getView(url, route, View.Grid);
|
||||
const limit = getLimit(url, route, CARD_LIMIT);
|
||||
const offset = pageToOffset(page, limit);
|
||||
const buckets = await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.storage.listBuckets(
|
||||
[Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
|
||||
search || undefined
|
||||
);
|
||||
|
||||
return {
|
||||
offset,
|
||||
limit,
|
||||
view,
|
||||
search,
|
||||
buckets: await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.storage.listBuckets(
|
||||
[Query.limit(limit), Query.offset(offset), Query.orderDesc('')],
|
||||
search || undefined
|
||||
)
|
||||
buckets
|
||||
};
|
||||
};
|
||||
@@ -3,20 +3,13 @@ import Breadcrumbs from './breadcrumbs.svelte';
|
||||
import Header from './header.svelte';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.BUCKET);
|
||||
|
||||
try {
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
bucket: await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.storage.getBucket(params.bucket)
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
bucket: await sdk.forProject(params.region, params.project).storage.getBucket(params.bucket)
|
||||
};
|
||||
};
|
||||
+10
-15
@@ -3,24 +3,19 @@ import Header from './header.svelte';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { Dependencies } from '$lib/constants';
|
||||
import type { LayoutLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: LayoutLoad = async ({ params, depends }) => {
|
||||
depends(Dependencies.FILE);
|
||||
depends(Dependencies.FILE_TOKENS);
|
||||
|
||||
try {
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
file: await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.storage.getFile(params.bucket, params.file),
|
||||
tokens: await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.tokens.list(params.bucket, params.file)
|
||||
};
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
return {
|
||||
header: Header,
|
||||
breadcrumbs: Breadcrumbs,
|
||||
file: await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.storage.getFile(params.bucket, params.file),
|
||||
tokens: await sdk
|
||||
.forProject(params.region, params.project)
|
||||
.tokens.list(params.bucket, params.file)
|
||||
};
|
||||
};
|
||||
@@ -2,15 +2,10 @@ import { isValueOfStringEnum } from '$lib/helpers/types';
|
||||
import { sdk } from '$lib/stores/sdk';
|
||||
import { StorageUsageRange } from '@appwrite.io/console';
|
||||
import type { PageLoad } from './$types';
|
||||
import { error } from '@sveltejs/kit';
|
||||
|
||||
export const load: PageLoad = async ({ params }) => {
|
||||
try {
|
||||
const period = isValueOfStringEnum(StorageUsageRange, params.period)
|
||||
? params.period
|
||||
: StorageUsageRange.ThirtyDays;
|
||||
return sdk.forProject(params.region, params.project).storage.getUsage(period);
|
||||
} catch (e) {
|
||||
error(e.code, e.message);
|
||||
}
|
||||
const period = isValueOfStringEnum(StorageUsageRange, params.period)
|
||||
? params.period
|
||||
: StorageUsageRange.ThirtyDays;
|
||||
return sdk.forProject(params.region, params.project).storage.getUsage(period);
|
||||
};
|
||||
Reference in new issue
Block a user