Rename "Organization" to "Team" across web app and update related services
Renamed all instances of "Organization" with "Team" across the entire web application to reflect the latest change in terminology. This further extends to renaming related services, components, and their respective invocation instances. Separate billing permissions have been defined for Team accounts, and security actions have been updated in SQL schema along with some layout adjustments.
This commit is contained in:
@@ -2,8 +2,8 @@ import { notFound } from 'next/navigation';
|
||||
|
||||
import featureFlagsConfig from '~/config/feature-flags.config';
|
||||
|
||||
function OrganizationAccountBillingLayout(props: React.PropsWithChildren) {
|
||||
const isEnabled = featureFlagsConfig.enableOrganizationBilling;
|
||||
function TeamAccountBillingLayout(props: React.PropsWithChildren) {
|
||||
const isEnabled = featureFlagsConfig.enableTeamAccountBilling;
|
||||
|
||||
if (!isEnabled) {
|
||||
notFound();
|
||||
@@ -12,4 +12,4 @@ function OrganizationAccountBillingLayout(props: React.PropsWithChildren) {
|
||||
return <>{props.children}</>;
|
||||
}
|
||||
|
||||
export default OrganizationAccountBillingLayout;
|
||||
export default TeamAccountBillingLayout;
|
||||
|
||||
@@ -21,7 +21,7 @@ interface Params {
|
||||
};
|
||||
}
|
||||
|
||||
async function OrganizationAccountBillingPage({ params }: Params) {
|
||||
async function TeamAccountBillingPage({ params }: Params) {
|
||||
const workspace = await loadTeamWorkspace(params.account);
|
||||
const accountId = workspace.account.id;
|
||||
const [subscription, customerId] = await loadAccountData(accountId);
|
||||
@@ -60,7 +60,7 @@ async function OrganizationAccountBillingPage({ params }: Params) {
|
||||
);
|
||||
}
|
||||
|
||||
export default withI18n(OrganizationAccountBillingPage);
|
||||
export default withI18n(TeamAccountBillingPage);
|
||||
|
||||
async function loadAccountData(accountId: string) {
|
||||
const client = getSupabaseServerComponentClient();
|
||||
|
||||
@@ -13,7 +13,7 @@ interface Params {
|
||||
account: string;
|
||||
}
|
||||
|
||||
function OrganizationWorkspaceLayout({
|
||||
function TeamWorkspaceLayout({
|
||||
children,
|
||||
params,
|
||||
}: React.PropsWithChildren<{
|
||||
@@ -48,7 +48,7 @@ function OrganizationWorkspaceLayout({
|
||||
);
|
||||
}
|
||||
|
||||
export default withI18n(OrganizationWorkspaceLayout);
|
||||
export default withI18n(TeamWorkspaceLayout);
|
||||
|
||||
function getUIStateCookies() {
|
||||
return {
|
||||
|
||||
@@ -56,7 +56,7 @@ async function loadInvitations(account: string) {
|
||||
return data ?? [];
|
||||
}
|
||||
|
||||
async function OrganizationAccountMembersPage({ params }: Params) {
|
||||
async function TeamAccountMembersPage({ params }: Params) {
|
||||
const slug = params.account;
|
||||
|
||||
const [{ account, user }, members, invitations] = await Promise.all([
|
||||
@@ -142,4 +142,4 @@ async function OrganizationAccountMembersPage({ params }: Params) {
|
||||
);
|
||||
}
|
||||
|
||||
export default withI18n(OrganizationAccountMembersPage);
|
||||
export default withI18n(TeamAccountMembersPage);
|
||||
|
||||
@@ -35,7 +35,7 @@ export const metadata = {
|
||||
title: 'Organization Account Home',
|
||||
};
|
||||
|
||||
function OrganizationAccountHomePage({
|
||||
function TeamAccountHomePage({
|
||||
params,
|
||||
}: {
|
||||
params: {
|
||||
@@ -62,4 +62,4 @@ function OrganizationAccountHomePage({
|
||||
);
|
||||
}
|
||||
|
||||
export default withI18n(OrganizationAccountHomePage);
|
||||
export default withI18n(TeamAccountHomePage);
|
||||
|
||||
@@ -28,7 +28,7 @@ const routes = (account: string) => [
|
||||
path: createPath(pathsConfig.app.accountMembers, account),
|
||||
Icon: <Users className={iconClasses} />,
|
||||
},
|
||||
featureFlagsConfig.enableOrganizationBilling
|
||||
featureFlagsConfig.enableTeamAccountBilling
|
||||
? {
|
||||
label: 'common:billingTabLabel',
|
||||
path: createPath(pathsConfig.app.accountBilling, account),
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"homeTabLabel": "Home",
|
||||
"homeTabDescription": "Welcome to your home page",
|
||||
"accountMembers": "Members",
|
||||
"membersTabDescription": "Manage your organization's members",
|
||||
"billingTabLabel": "Billing",
|
||||
"billingTabDescription": "Manage your billing and subscription",
|
||||
"yourAccountTabLabel": "Account Settings",
|
||||
|
||||
Reference in New Issue
Block a user