{tierPro.name}
{#if $organization?.billingPlan === BillingPlan.PRO && !isNewOrg}
diff --git a/src/lib/components/bottomModalAlert.svelte b/src/lib/components/bottomModalAlert.svelte
index 1ad42dda7..03ace8873 100644
--- a/src/lib/components/bottomModalAlert.svelte
+++ b/src/lib/components/bottomModalAlert.svelte
@@ -1,5 +1,4 @@
-
+
diff --git a/src/lib/components/drop.svelte b/src/lib/components/drop.svelte
index 2d4ee2b73..db5eac60e 100644
--- a/src/lib/components/drop.svelte
+++ b/src/lib/components/drop.svelte
@@ -42,7 +42,7 @@
{
name: 'offset',
options: {
- offset: [noArrow ? 0 : -arrowSize, noArrow ? 0 : arrowSize / 1.5]
+ offset: [noArrow ? 0 : arrowSize * 1.75, noArrow ? 0 : arrowSize / 1.5]
}
},
{
@@ -135,10 +135,12 @@
diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index 410116586..c043fc1dc 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -70,7 +70,7 @@
{/if}
{#if description.length > 0}
-
+
{description}
diff --git a/src/lib/components/permissions/label.svelte b/src/lib/components/permissions/label.svelte
index b927b544f..86a86b714 100644
--- a/src/lib/components/permissions/label.svelte
+++ b/src/lib/components/permissions/label.svelte
@@ -34,7 +34,7 @@
diff --git a/src/lib/components/progressBarBig.svelte b/src/lib/components/progressBarBig.svelte
index 1ad497660..01d47ed26 100644
--- a/src/lib/components/progressBarBig.svelte
+++ b/src/lib/components/progressBarBig.svelte
@@ -14,7 +14,7 @@
{/if}
+
+
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 707d0f66f..2fc910428 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -50,6 +50,7 @@ export enum Dependencies {
WEBHOOKS = 'dependency:webhooks',
MIGRATIONS = 'dependency:migrations',
COLLECTIONS = 'dependency:collections',
+ BACKUPS = 'dependency:backups',
RUNTIMES = 'dependency:runtimes',
CONSOLE_VARIABLES = 'dependency:console_variables',
MESSAGING_PROVIDERS = 'dependency:messaging_providers',
@@ -61,6 +62,65 @@ export enum Dependencies {
MESSAGING_TOPIC_SUBSCRIBERS = 'dependency:messaging_topic_subscribers'
}
+export const defaultScopes: string[] = [
+ 'global',
+ 'public',
+ 'home',
+ 'console',
+ 'graphql',
+ 'sessions.write',
+ 'account',
+ 'teams.read',
+ 'teams.write',
+ 'documents.read',
+ 'documents.write',
+ 'files.read',
+ 'files.write',
+ 'projects.read',
+ 'projects.write',
+ 'locale.read',
+ 'avatars.read',
+ 'execution.read',
+ 'execution.write',
+ 'targets.read',
+ 'targets.write',
+ 'subscribers.write',
+ 'subscribers.read',
+ 'assistant.read',
+ 'users.read',
+ 'users.write',
+ 'databases.read',
+ 'databases.write',
+ 'collections.read',
+ 'collections.write',
+ 'buckets.read',
+ 'buckets.write',
+ 'functions.read',
+ 'functions.write',
+ 'platforms.read',
+ 'platforms.write',
+ 'keys.read',
+ 'keys.write',
+ 'webhooks.read',
+ 'webhooks.write',
+ 'rules.read',
+ 'rules.write',
+ 'migrations.read',
+ 'migrations.write',
+ 'vcs.read',
+ 'vcs.write',
+ 'providers.read',
+ 'providers.write',
+ 'messages.read',
+ 'messages.write',
+ 'topics.read',
+ 'topics.write',
+ 'billing.read',
+ 'billing.write'
+];
+
+export const defaultRoles: string[] = ['owner'];
+
export const scopes: {
scope: string;
description: string;
@@ -408,7 +468,9 @@ export const eventServices: Array = [
export enum BillingPlan {
FREE = 'tier-0',
PRO = 'tier-1',
- SCALE = 'tier-2'
+ SCALE = 'tier-2',
+ GITHUB_EDUCATION = 'auto-1',
+ CUSTOM = 'cont-1'
}
export const feedbackDowngradeOptions = [
diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte
index 6db208a9f..9e4c12c7e 100644
--- a/src/lib/elements/forms/inputSelect.svelte
+++ b/src/lib/elements/forms/inputSelect.svelte
@@ -1,6 +1,8 @@
diff --git a/src/lib/layout/footer.svelte b/src/lib/layout/footer.svelte
index 9e92cff65..17a7fe890 100644
--- a/src/lib/layout/footer.svelte
+++ b/src/lib/layout/footer.svelte
@@ -7,7 +7,7 @@
+ {:else if !$user.emailVerification}
+
+
+
+
+
+
+
+ Email
+ unverified
+
+ Verify your email to receive login MFA codes.
+
+
+
+
{/if}
{#if $factors.phone}
-
+
diff --git a/src/routes/(console)/apply-credit/+page.svelte b/src/routes/(console)/apply-credit/+page.svelte
index ca952ebb2..45e701050 100644
--- a/src/routes/(console)/apply-credit/+page.svelte
+++ b/src/routes/(console)/apply-credit/+page.svelte
@@ -268,7 +268,7 @@
{/if}
- {#if selectedOrg?.billingPlan !== BillingPlan.FREE}
+ {#if selectedOrg?.$id && selectedOrg?.billingPlan !== BillingPlan.FREE}
{:else if selectedOrgId}
-
+
`${base}/project-${project.$id}/databases`
+ },
+ learnMore: {
+ text: 'Learn more',
+ link: () => 'http://appwrite.io/docs/products/databases/backups'
+ }
+ }
+];
+
+export function addBottomModalAlerts() {
+ listOfPromotions.forEach((promotion) => showBottomModalAlert(promotion));
+}
diff --git a/src/routes/(console)/create-organization/+page.svelte b/src/routes/(console)/create-organization/+page.svelte
index a5d9a7f2d..137ede330 100644
--- a/src/routes/(console)/create-organization/+page.svelte
+++ b/src/routes/(console)/create-organization/+page.svelte
@@ -10,6 +10,7 @@
SelectPaymentMethod
} from '$lib/components/billing';
import ValidateCreditModal from '$lib/components/billing/validateCreditModal.svelte';
+ import Default from '$lib/components/roles/default.svelte';
import { BillingPlan, Dependencies } from '$lib/constants';
import { Button, Form, FormList, InputTags, InputText, Label } from '$lib/elements/forms';
import {
@@ -101,17 +102,6 @@
null
);
} else {
- // Create free organization if coming from onboarding
- if (previousPage.includes('/console/onboarding') && !anyOrgFree) {
- await sdk.forConsole.billing.createOrganization(
- ID.unique(),
- 'Personal Projects',
- BillingPlan.FREE,
- null,
- null
- );
- }
-
org = await sdk.forConsole.billing.createOrganization(
ID.unique(),
name,
@@ -136,7 +126,7 @@
collaborators.forEach(async (collaborator) => {
await sdk.forConsole.teams.createMembership(
org.$id,
- ['owner'],
+ ['developer'],
collaborator,
undefined,
undefined,
@@ -205,7 +195,7 @@
{
depends(Dependencies.ORGANIZATION);
depends(Dependencies.MEMBERS);
depends(Dependencies.PAYMENT_METHODS);
-
- if (isCloud) {
- await failedInvoice.load(params.organization);
-
- if (get(failedInvoice)) {
- headerAlert.add({
- show: true,
- component: ProjectsAtRisk,
- id: 'projectsAtRisk',
- importance: 1
- });
- }
- }
+ let roles = isCloud ? [] : defaultRoles;
+ let scopes = isCloud ? [] : defaultScopes;
try {
+ if (isCloud) {
+ const res = await sdk.forConsole.billing.getRoles(params.organization);
+ roles = res.roles;
+ scopes = res.scopes;
+ if (scopes.includes('billing.read')) {
+ await failedInvoice.load(params.organization);
+ if (get(failedInvoice)) {
+ headerAlert.add({
+ show: true,
+ component: ProjectsAtRisk,
+ id: 'projectsAtRisk',
+ importance: 1
+ });
+ }
+ }
+ }
const prefs = await sdk.forConsole.account.getPrefs();
if (prefs.organization !== params.organization) {
const newPrefs = { ...prefs, organization: params.organization };
@@ -47,7 +53,9 @@ export const load: LayoutLoad = async ({ params, depends }) => {
header: Header,
breadcrumbs: Breadcrumbs,
organization,
- members
+ members,
+ roles,
+ scopes
};
} catch (e) {
const prefs = await sdk.forConsole.account.getPrefs();
diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index b88300a98..d16339072 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -31,6 +31,7 @@
import type { RegionList } from '$lib/sdk/billing';
import { onMount } from 'svelte';
import { organization } from '$lib/stores/organization';
+ import { canWriteProjects } from '$lib/stores/roles';
export let data;
@@ -79,6 +80,7 @@
}
function handleCreateProject() {
+ if (!$canWriteProjects) return;
if (isCloud) wizard.start(Create);
else showCreate = true;
}
@@ -89,7 +91,7 @@
showCreate = true;
},
keys: ['c'],
- disabled: $readOnly && !GRACE_PERIOD_OVERRIDE,
+ disabled: ($readOnly && !GRACE_PERIOD_OVERRIDE) || !$canWriteProjects,
group: 'projects',
icon: 'plus'
}
@@ -130,7 +132,7 @@
}
});
- function findRegion(project: Partial) {
+ function findRegion(project: Models.Project) {
const region = regions.regions.find((region) => region.$id === project.region);
return region;
}
@@ -142,13 +144,15 @@
Projects
-
+ {#if $canWriteProjects}
+
+ {/if}
(showCreate = true)}>Empty project
@@ -162,6 +166,7 @@
{#if data.projects.total}
@@ -214,6 +219,7 @@
{:else}
- {
- showEdit = true;
- showBillingAddressDropdown = false;
- }}>
- Edit
-
+ {#if billingAddress.userId === $user.$id}
+ {
+ showEdit = true;
+ showBillingAddressDropdown = false;
+ }}>
+ Edit
+
+ {/if}
{
@@ -97,6 +102,14 @@
}}>
Replace
+ {
+ showRemove = true;
+ showBillingAddressDropdown = false;
+ }}>
+ Remove
+
@@ -163,3 +176,6 @@
{#if showReplace}
- {
- isSelectedBackup = false;
- showEdit = true;
- showDropdown = false;
- }}>
- Edit
-
+ {#if defaultPaymentMethod.userId === $user.$id}
+ {
+ isSelectedBackup = false;
+ showEdit = true;
+ showDropdown = false;
+ }}>
+ Edit
+
+ {/if}
{
@@ -208,15 +211,17 @@
- {
- showEdit = true;
- isSelectedBackup = true;
- showDropdownBackup = false;
- }}>
- Edit
-
+ {#if backupPaymentMethod.userId === $user.$id}
+ {
+ showEdit = true;
+ isSelectedBackup = true;
+ showDropdownBackup = false;
+ }}>
+ Edit
+
+ {/if}
{
@@ -320,10 +325,12 @@
Add-onsAdditional members
{formatCurrency(
- extraMembers * currentPlan.addons.member.price
+ extraMembers *
+ (currentPlan?.addons?.member?.price ?? 0)
)}
@@ -135,6 +149,33 @@
{/if}
+ {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0}
+
+
+ Credits to be applied
+
+
+ -{formatCurrency(
+ Math.min(availableCredit, currentInvoice?.amount ?? 0)
+ )}
+
+
+ {/if}
+
Current total (USD)
@@ -147,9 +188,16 @@
}}>
- {$organization?.billingPlan === BillingPlan.FREE
+ {$organization?.billingPlan === BillingPlan.FREE ||
+ $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
? formatCurrency(0)
- : formatCurrency(currentInvoice?.amount ?? 0)}
+ : formatCurrency(
+ Math.max(
+ (currentInvoice?.amount ?? 0) -
+ Math.min(availableCredit, currentInvoice?.amount ?? 0),
+ 0
+ )
+ )}
@@ -171,7 +219,7 @@
Upgrade
- {:else}
+ {:else if $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
-
diff --git a/src/lib/components/drop.svelte b/src/lib/components/drop.svelte index 2d4ee2b73..db5eac60e 100644 --- a/src/lib/components/drop.svelte +++ b/src/lib/components/drop.svelte @@ -42,7 +42,7 @@ { name: 'offset', options: { - offset: [noArrow ? 0 : -arrowSize, noArrow ? 0 : arrowSize / 1.5] + offset: [noArrow ? 0 : arrowSize * 1.75, noArrow ? 0 : arrowSize / 1.5] } }, { @@ -135,10 +135,12 @@ diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte index 410116586..c043fc1dc 100644 --- a/src/lib/components/modal.svelte +++ b/src/lib/components/modal.svelte @@ -70,7 +70,7 @@ {/if}
+
{$organization.name}
{$organization.total} members
+{orgMembers}, {orgProjects}
diff --git a/src/routes/(console)/organization-[organization]/settings/BAA.svelte b/src/routes/(console)/organization-[organization]/settings/BAA.svelte new file mode 100644 index 000000000..970735832 --- /dev/null +++ b/src/routes/(console)/organization-[organization]/settings/BAA.svelte @@ -0,0 +1,36 @@ + + +After requesting a BAA, we will contact you via email for the next steps.
++ Business Associate Agreement (BAA) +
++ A Business Associate Agreement (BAA) is a HIPAA-required document ensuring outside + services handling patient information for a healthcare organization follow privacy + rules. +
+ +After requesting SOC-2, we will contact you via email for the next steps.
++ Service Organization Control Type 2 (SOC-2) +
++ SOC-2 is a framework for managing and protecting sensitive information, ensuring + compliance with trust service criteria such as security, availability, processing + integrity, confidentiality, and privacy. +
+ +- The organization {$organization.name} will be flagged for deletion. -
++ By proceeding, your invoice will be processed within the hour. Upon successful + payment, your organization will be deleted. +
+- All existing projects will be paused and the organization will be deleted once your - upcoming invoice is processed on {toLocaleDate($organization.billingNextInvoiceDate)}. + {#if $projects.total > 0} + The following projects and all data associated with {$organization.name} will + be permanently deleted. This action is irreversible. + {:else} + All data associated with {$organization.name} will be permanently deleted. + This action is irreversible. + {/if}
- {:else} -- Are you sure you want to delete {$organization.name}? All projects ({$projects.total}) - and data associated with this organization will be deleted. This action is irreversible. -
- {/if} -- Calculated for all your files, deployments, builds and databases. While in beta, only - file storage is counted against your plan limits. + Calculated for all your files, deployments, builds, databases and backups.
+ GB hours represent the memory usage (in gigabytes) of your function executions and + builds, multiplied by the total execution time (in hours). +
+ ++ {(Math.ceil(totalGbHours * 100) / 100).toLocaleString( + 'en-US' + )} + {`GB hours`} +
+No data to show
+
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
index 75b9d65c2..f469f97a8 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/+page.ts
@@ -1,5 +1,5 @@
import { sdk } from '$lib/stores/sdk';
-import { Query } from '@appwrite.io/console';
+import { Query, type Models } from '@appwrite.io/console';
import type { PageLoad } from './$types';
import type { Organization } from '$lib/stores/organization';
import type { Invoice } from '$lib/sdk/billing';
@@ -22,9 +22,12 @@ export const load: PageLoad = async ({ params, parent }) => {
filesStorageTotal: null,
buildsStorageTotal: null,
deploymentsStorageTotal: null,
+ backupsStorageTotal: null,
executions: null,
executionsTotal: null,
- projects: null
+ projects: null,
+ executionsMBSecondsTotal: null,
+ buildsMBSecondsTotal: null
}
};
}
@@ -45,22 +48,33 @@ export const load: PageLoad = async ({ params, parent }) => {
sdk.forConsole.teams.listMemberships(params.organization)
]);
- const queries: string[] = [];
-
+ const projectNames: { [key: string]: Models.Project } = {};
if (usage?.projects?.length > 0) {
- queries.push(
- Query.equal(
- '$id',
- usage.projects.map((p) => p.projectId)
- )
- );
- }
+ // in batches of 100 (the max number of values in a query)
+ const requests = [];
+ const chunk = 100;
+ for (let i = 0; i < usage.projects.length; i += chunk) {
+ const queries = [
+ Query.limit(chunk),
+ Query.equal(
+ '$id',
+ usage.projects.slice(i, i + chunk).map((p) => p.projectId)
+ )
+ ];
+ requests.push(sdk.forConsole.projects.list(queries));
+ }
- const projectNames = await sdk.forConsole.projects.list(queries);
+ const responses = await Promise.all(requests);
+ for (const response of responses) {
+ for (const project of response.projects) {
+ projectNames[project.$id] = project;
+ }
+ }
+ }
return {
organizationUsage: usage,
- projectNames: projectNames.projects,
+ projectNames,
invoices,
currentInvoice,
organizationMembers
diff --git a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
index 99a829376..964f50eee 100644
--- a/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
+++ b/src/routes/(console)/organization-[organization]/usage/[[invoice]]/ProjectBreakdown.svelte
@@ -14,16 +14,13 @@
import { humanFileSize } from '$lib/helpers/sizeConvertion';
import type { OrganizationUsage } from '$lib/sdk/billing';
import { base } from '$app/paths';
+ import { canSeeProjects } from '$lib/stores/roles';
type Metric = 'users' | 'storage' | 'bandwidth' | 'executions';
export let data: PageData;
export let projects: OrganizationUsage['projects'];
export let metric: Metric;
- function getProjectName(projectId: string): string {
- return data.projectNames.find((project) => project.$id === projectId)?.name;
- }
-
function getProjectUsageLink(projectId: string): string {
return `${base}/project-${projectId}/settings/usage`;
}
@@ -58,22 +55,26 @@
- {#each $regions.regions.filter((r) => r.$id !== 'default') as region}
+ {#each $regions.regions
+ .filter((r) => r.$id !== 'default')
+ .sort((regionA, regionB) => {
+ if (regionA.disabled >= regionB.disabled) {
+ return 1;
+ }
+ return -1;
+ }) as region}
+