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

Add gamma to isInfisicalCloud and fix for no billing plan set

Browse Source
This commit is contained in:
carlosmonastyrski
2025-03-25 11:59:13 -03:00
parent 9924ef3a71
commit 9a5633fda4
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/helpers/platform.ts
View File

@@ -1,4 +1,5 @@
export const isInfisicalCloud = () => export const isInfisicalCloud = () =>
window.location.origin.includes("https://app.infisical.com") || window.location.origin.includes("https://app.infisical.com") ||
window.location.origin.includes("https://us.infisical.com") || window.location.origin.includes("https://us.infisical.com") ||
window.location.origin.includes("https://eu.infisical.com"); window.location.origin.includes("https://eu.infisical.com") ||
window.location.origin.includes("https://gamma.infisical.com");

15
frontend/src/pages/organization/BillingPage/components/BillingCloudTab/PreviewSection.tsx
View File

@@ -9,6 +9,7 @@ import {
useOrganization, useOrganization,
useSubscription useSubscription
} from "@app/context"; } from "@app/context";
import { isInfisicalCloud } from "@app/helpers/platform";
import { import {
useCreateCustomerPortalSession, useCreateCustomerPortalSession,
useGetOrgPlanBillingInfo, useGetOrgPlanBillingInfo,
@@ -47,19 +48,17 @@ export const PreviewSection = () => {
}; };
function formatPlanSlug(slug: string) { function formatPlanSlug(slug: string) {
if (!slug) {
return "-";
}
return slug.replace(/(\b[a-z])/g, (match) => match.toUpperCase()).replace(/-/g, " "); return slug.replace(/(\b[a-z])/g, (match) => match.toUpperCase()).replace(/-/g, " ");
} }
const isCloudInstance =
window.location.origin.includes("https://app.infisical.com") ||
window.location.origin.includes("https://eu.infisical.com") ||
window.location.origin.includes("https://gamma.infisical.com");
const handleUpgradeBtnClick = async () => { const handleUpgradeBtnClick = async () => {
try { try {
if (!subscription || !currentOrg) return; if (!subscription || !currentOrg) return;
if (!isCloudInstance) { if (!isInfisicalCloud()) {
window.open("https://infisical.com/pricing", "_blank"); window.open("https://infisical.com/pricing", "_blank");
return; return;
} }
@@ -82,7 +81,7 @@ export const PreviewSection = () => {
}; };
const getUpgradePlanLabel = () => { const getUpgradePlanLabel = () => {
if (!isCloudInstance) { if (!isInfisicalCloud()) {
return ( return (
<div> <div>
Go to Pricing Go to Pricing
@@ -156,7 +155,7 @@ export const PreviewSection = () => {
subscription.status === "trialing" ? "(Trial)" : "" subscription.status === "trialing" ? "(Trial)" : ""
}`} }`}
</p> </p>
{isCloudInstance && ( {isInfisicalCloud() && (
<OrgPermissionCan I={OrgPermissionActions.Edit} a={OrgPermissionSubjects.Billing}> <OrgPermissionCan I={OrgPermissionActions.Edit} a={OrgPermissionSubjects.Billing}>
{(isAllowed) => ( {(isAllowed) => (
<button <button

10
frontend/src/pages/organization/BillingPage/components/BillingTabGroup/BillingTabGroup.tsx
View File

@@ -1,5 +1,6 @@
import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2"; import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context"; import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
import { isInfisicalCloud } from "@app/helpers/platform";
import { withPermission } from "@app/hoc"; import { withPermission } from "@app/hoc";
import { BillingCloudTab } from "../BillingCloudTab"; import { BillingCloudTab } from "../BillingCloudTab";
@@ -16,12 +17,7 @@ const tabs = [
export const BillingTabGroup = withPermission( export const BillingTabGroup = withPermission(
() => { () => {
const isCloudInstance = const tabsFiltered = isInfisicalCloud()
window.location.origin.includes("https://app.infisical.com") ||
window.location.origin.includes("https://eu.infisical.com") ||
window.location.origin.includes("https://gamma.infisical.com");
const tabsFiltered = isCloudInstance
? tabs ? tabs
: [{ name: "Infisical Self-Hosted", key: "tab-infisical-cloud" }]; : [{ name: "Infisical Self-Hosted", key: "tab-infisical-cloud" }];
@@ -35,7 +31,7 @@ export const BillingTabGroup = withPermission(
<TabPanel value={tabs[0].key}> <TabPanel value={tabs[0].key}>
<BillingCloudTab /> <BillingCloudTab />
</TabPanel> </TabPanel>
{isCloudInstance && ( {isInfisicalCloud() && (
<> <>
<TabPanel value={tabs[1].key}> <TabPanel value={tabs[1].key}>
<BillingSelfHostedTab /> <BillingSelfHostedTab />