Remove team account related services and actions

Removed services and actions related to team account deletion as well as updated paths within other dependent files, better reflecting their new locations. Also, added a new service titled 'AccountBillingService' for handling billing-related operations and restructured the form layout and handled translation in 'team-account-danger-zone' component.
This commit is contained in:
giancarlo
2024-03-28 15:27:56 +08:00
parent 3ac4d3b00d
commit 041efb89fb
77 changed files with 1998 additions and 1553 deletions

View File

@@ -30,8 +30,8 @@ type AccountModel = {
};
const features = {
enableOrganizationAccounts: featureFlagsConfig.enableOrganizationAccounts,
enableOrganizationCreation: featureFlagsConfig.enableOrganizationCreation,
enableTeamAccounts: featureFlagsConfig.enableTeamAccounts,
enableTeamCreation: featureFlagsConfig.enableTeamCreation,
};
export function AppSidebar(props: {

View File

@@ -27,6 +27,11 @@ import featureFlagsConfig from '~/config/feature-flags.config';
import { getOrganizationAccountSidebarConfig } from '~/config/organization-account-sidebar.config';
import pathsConfig from '~/config/paths.config';
const features = {
enableTeamAccounts: featureFlagsConfig.enableTeamAccounts,
enableTeamCreation: featureFlagsConfig.enableTeamCreation,
};
export const MobileAppNavigation = (
props: React.PropsWithChildren<{
slug: string;
@@ -161,12 +166,7 @@ function OrganizationsModal() {
router.replace(path);
}}
accounts={[]}
features={{
enableOrganizationAccounts:
featureFlagsConfig.enableOrganizationAccounts,
enableOrganizationCreation:
featureFlagsConfig.enableOrganizationCreation,
}}
features={features}
/>
</div>
</DialogContent>

View File

@@ -17,7 +17,7 @@ import pathsConfig from '~/config/paths.config';
*
* @param accountSlug
*/
export const loadOrganizationWorkspace = cache(async (accountSlug: string) => {
export const loadTeamWorkspace = cache(async (accountSlug: string) => {
const client = getSupabaseServerComponentClient();
const accountPromise = client.rpc('organization_account_workspace', {

View File

@@ -8,7 +8,7 @@ import { If } from '@kit/ui/if';
import { PageBody, PageHeader } from '@kit/ui/page';
import { Trans } from '@kit/ui/trans';
import { loadOrganizationWorkspace } from '~/(dashboard)/home/[account]/_lib/load-workspace';
import { loadTeamWorkspace } from '~/(dashboard)/home/[account]/_lib/load-team-account-workspace';
import { createBillingPortalSession } from '~/(dashboard)/home/[account]/billing/server-actions';
import billingConfig from '~/config/billing.config';
import { withI18n } from '~/lib/i18n/with-i18n';
@@ -22,7 +22,7 @@ interface Params {
}
async function OrganizationAccountBillingPage({ params }: Params) {
const workspace = await loadOrganizationWorkspace(params.account);
const workspace = await loadTeamWorkspace(params.account);
const accountId = workspace.account.id;
const [subscription, customerId] = await loadAccountData(accountId);

View File

@@ -6,7 +6,7 @@ import { getSupabaseServerComponentClient } from '@kit/supabase/server-component
import { Page } from '@kit/ui/page';
import { AppSidebar } from '~/(dashboard)/home/[account]/_components/app-sidebar';
import { loadOrganizationWorkspace } from '~/(dashboard)/home/[account]/_lib/load-workspace';
import { loadTeamWorkspace } from '~/(dashboard)/home/[account]/_lib/load-team-account-workspace';
import { withI18n } from '~/lib/i18n/with-i18n';
interface Params {
@@ -20,7 +20,7 @@ function OrganizationWorkspaceLayout({
params: Params;
}>) {
const [data, session] = use(
Promise.all([loadOrganizationWorkspace(params.account), loadSession()]),
Promise.all([loadTeamWorkspace(params.account), loadSession()]),
);
const ui = getUIStateCookies();

View File

@@ -17,7 +17,7 @@ import {
import { PageBody, PageHeader } from '@kit/ui/page';
import { Trans } from '@kit/ui/trans';
import { loadOrganizationWorkspace } from '~/(dashboard)/home/[account]/_lib/load-workspace';
import { loadTeamWorkspace } from '~/(dashboard)/home/[account]/_lib/load-team-account-workspace';
import { withI18n } from '~/lib/i18n/with-i18n';
interface Params {
@@ -60,7 +60,7 @@ async function OrganizationAccountMembersPage({ params }: Params) {
const slug = params.account;
const [{ account, user }, members, invitations] = await Promise.all([
loadOrganizationWorkspace(slug),
loadTeamWorkspace(slug),
loadAccountMembers(slug),
loadInvitations(slug),
]);

View File

@@ -0,0 +1,62 @@
import { TeamAccountSettingsContainer } from '@kit/team-accounts/components';
import { PageBody, PageHeader } from '@kit/ui/page';
import { Trans } from '@kit/ui/trans';
import { loadTeamWorkspace } from '~/(dashboard)/home/[account]/_lib/load-team-account-workspace';
import pathsConfig from '~/config/paths.config';
import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
export const generateMetadata = async () => {
const i18n = await createI18nServerInstance();
const title = i18n.t('accounts:settings:pageTitle');
return {
title,
};
};
interface Props {
params: {
account: string;
};
}
const paths = {
teamAccountSettings: pathsConfig.app.accountSettings,
};
async function TeamAccountSettingsPage(props: Props) {
const data = await loadTeamWorkspace(props.params.account);
const account = {
id: data.account.id,
name: data.account.name,
pictureUrl: data.account.picture_url,
slug: data.account.slug,
primaryOwnerUserId: data.account.primary_owner_user_id,
};
return (
<>
<PageHeader
title={<Trans i18nKey={'teams:settings.pageTitle'} />}
description={<Trans i18nKey={'teams:settings.pageDescription'} />}
/>
<PageBody>
<div
className={
'container mx-auto flex w-full max-w-4xl flex-1 flex-col items-center'
}
>
<TeamAccountSettingsContainer
userId={data.user.id}
account={account}
paths={paths}
/>
</div>
</PageBody>
</>
);
}
export default TeamAccountSettingsPage;

View File

@@ -8,8 +8,8 @@ import featureFlagsConfig from '~/config/feature-flags.config';
import pathsConfig from '~/config/paths.config';
const features = {
enableOrganizationAccounts: featureFlagsConfig.enableOrganizationAccounts,
enableOrganizationCreation: featureFlagsConfig.enableOrganizationCreation,
enableTeamAccounts: featureFlagsConfig.enableTeamAccounts,
enableTeamCreation: featureFlagsConfig.enableTeamCreation,
};
export function HomeSidebarAccountSelector(props: {

View File

@@ -1,7 +1,5 @@
'use client';
import { Suspense } from 'react';
import Link from 'next/link';
import type { Session } from '@supabase/supabase-js';

View File

@@ -23,13 +23,12 @@ export default async function RootLayout({
}: {
children: React.ReactNode;
}) {
const i18n = await createI18nServerInstance();
const lang = i18n.language;
const { language } = await createI18nServerInstance();
return (
<html lang={lang} className={getClassName()}>
<html lang={language} className={getClassName()}>
<body>
<RootProviders lang={lang}>{children}</RootProviders>
<RootProviders lang={language}>{children}</RootProviders>
<Toaster richColors={false} />
</body>
</html>