awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Tuan Dang
2023-06-29 17:49:01 +07:00
parent 056f5a4555 f9d0e0d971
commit c4da5a6ead
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/ManagePlansTable.tsx
View File

@@ -34,7 +34,7 @@ export const ManagePlansTable = ({
const createCustomerPortalSession = useCreateCustomerPortalSession(); const createCustomerPortalSession = useCreateCustomerPortalSession();
const displayCell = (value: null | number | string | boolean) => { const displayCell = (value: null | number | string | boolean) => {
if (value === null) return "-"; if (value === null) return "Unlimited";
if (typeof value === "boolean") { if (typeof value === "boolean") {
if (value) return ( if (value) return (

14
frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/PreviewSection.tsx
View File

@@ -12,7 +12,7 @@ export const PreviewSection = () => {
const { subscription, isLoading: isSubscriptionLoading } = useSubscription(); const { subscription, isLoading: isSubscriptionLoading } = useSubscription();
const { data, isLoading } = useGetOrgPlanBillingInfo(currentOrg?._id ?? ""); const { data, isLoading } = useGetOrgPlanBillingInfo(currentOrg?._id ?? "");
const createCustomerPortalSession = useCreateCustomerPortalSession(); const createCustomerPortalSession = useCreateCustomerPortalSession();
const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([ const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
"managePlan" "managePlan"
] as const); ] as const);
@@ -35,6 +35,12 @@ export const PreviewSection = () => {
return formattedDate; return formattedDate;
} }
function formatPlanSlug(slug: string) {
return slug
.replace(/(\b[a-z])/g, match => match.toUpperCase())
.replace(/-/g, " ");
}
return ( return (
<div> <div>
@@ -52,11 +58,13 @@ export const PreviewSection = () => {
</Button> </Button>
</div> </div>
)} )}
{!isLoading && data && ( {!isLoading && subscription && data && (
<div className="flex mb-6 max-w-screen-lg"> <div className="flex mb-6 max-w-screen-lg">
<div className="p-4 bg-mineshaft-900 rounded-lg flex-1 mr-4 border border-mineshaft-600"> <div className="p-4 bg-mineshaft-900 rounded-lg flex-1 mr-4 border border-mineshaft-600">
<p className="mb-2 text-gray-400">Current plan</p> <p className="mb-2 text-gray-400">Current plan</p>
<p className="text-2xl mb-8 text-mineshaft-50 font-semibold">Starter</p> <p className="text-2xl mb-8 text-mineshaft-50 font-semibold">
{formatPlanSlug(subscription.slug)}
</p>
<button <button
type="button" type="button"
onClick={async () => { onClick={async () => {