diff --git a/src/lib/components/archiveProject.svelte b/src/lib/components/archiveProject.svelte new file mode 100644 index 000000000..d521b2b24 --- /dev/null +++ b/src/lib/components/archiveProject.svelte @@ -0,0 +1,154 @@ + + +{#if projectsToArchive.length > 0} +
+ + + These projects have been archived and are read-only. You can view and migrate their + data. + + +
+ + {#each projectsToArchive as project} + {@const platforms = filterPlatforms( + project.platforms.map((platform) => getPlatformInfo(platform.type)) + )} + + + {project?.platforms?.length ? project?.platforms?.length : 'No'} apps + + {project.name} + + + + { + e.preventDefault(); + e.stopPropagation(); + readOnlyInfoOpen = { + ...readOnlyInfoOpen, + [project.$id]: !readOnlyInfoOpen[project.$id] + }; + }}> + + Read only + + +
  • + + Archived projects are read-only. You can view + and migrate their data, but they no longer + accept edits or requests. + +
  • +
    +
    + + + + Unarchive project + Migrate project + + +
    +
    + {#each platforms.slice(0, 2) as platform} + {@const icon = getIconForPlatform(platform.icon)} + + + + {/each} +
    + {/each} +
    +
    +
    +
    +{/if} diff --git a/src/lib/components/gridItem1.svelte b/src/lib/components/gridItem1.svelte index 89b2d3bb2..40c8e66d9 100644 --- a/src/lib/components/gridItem1.svelte +++ b/src/lib/components/gridItem1.svelte @@ -1,6 +1,6 @@ diff --git a/src/lib/sdk/billing.ts b/src/lib/sdk/billing.ts index 4692bbcd7..9a0163599 100644 --- a/src/lib/sdk/billing.ts +++ b/src/lib/sdk/billing.ts @@ -207,7 +207,7 @@ export type AggregationTeam = { * Aggregation billing plan */ plan: string; - projectBreakdown: ProjectBreakdown[] + projectBreakdown: ProjectBreakdown[]; }; export type ProjectBreakdown = { @@ -215,13 +215,13 @@ export type ProjectBreakdown = { name: string; amount: number; resources: InvoiceUsage[]; -} +}; export type InvoiceUsage = { resourceId: string; value: number; amount: number; -} +}; export type AvailableCredit = { available: number; diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index a622d9523..3787a3857 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -40,6 +40,7 @@ import CreateProjectCloud from './createProjectCloud.svelte'; import { currentPlan, regions as regionsStore } from '$lib/stores/organization'; import SelectProjectCloud from '$lib/components/billing/alerts/selectProjectCloud.svelte'; + import ArchiveProject from '$lib/components/archiveProject.svelte'; import { toLocaleDate } from '$lib/helpers/date'; export let data; @@ -138,6 +139,10 @@ $: projectsToArchive = data.projects.projects.filter( (project) => !data.organization.projects?.includes(project.$id) ); + + $: activeProjects = data.projects.projects.filter((project) => + data.organization.projects?.includes(project.$id) + ); @@ -167,9 +172,9 @@ - {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > 2 && $canWriteProjects} + {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && projectsToArchive.length > 0 && $canWriteProjects} + title={`${projectsToArchive.length} projects will be archived on ${toLocaleDate(billingProjectsLimitDate)}`}> {#each projectsToArchive as project, index}{@const text = `${project.name}`} {@html text}{index == projectsToArchive.length - 2 @@ -199,13 +204,13 @@ {/if} - {#if data.projects.total} + {#if activeProjects.length > 0} - {#each data.projects.projects as project} + {#each activeProjects as project} {@const platforms = filterPlatforms( project.platforms.map((platform) => getPlatformInfo(platform.type)) )} @@ -270,7 +275,7 @@

    Create a new project

    - {:else} + {:else if data.projects.total === 0} + total={activeProjects.length} /> + + + diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte index 11b2e824c..f545aabcf 100644 --- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte @@ -85,7 +85,7 @@ {/each} {#each currentAggregation.projectBreakdown as projectBreakdown} - + {formatCurrency(projectBreakdown.amount)} @@ -96,9 +96,7 @@ {/if} - + {resource.resourceId} diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.ts b/src/routes/(console)/organization-[organization]/change-plan/+page.ts index 5f1af0a4e..2272bd636 100644 --- a/src/routes/(console)/organization-[organization]/change-plan/+page.ts +++ b/src/routes/(console)/organization-[organization]/change-plan/+page.ts @@ -7,9 +7,7 @@ export const load: PageLoad = async ({ depends, parent }) => { const { members, currentPlan, organizations } = await parent(); depends(Dependencies.UPGRADE_PLAN); - const [plans] = await Promise.all([ - sdk.forConsole.billing.listPlans() - ]); + const [plans] = await Promise.all([sdk.forConsole.billing.listPlans()]); let plan: BillingPlan; if (currentPlan?.$id === BillingPlan.SCALE) {