diff --git a/web-app/src/screens/Console/License/License.tsx b/web-app/src/screens/Console/License/License.tsx index f8bdb02963..e8681597d3 100644 --- a/web-app/src/screens/Console/License/License.tsx +++ b/web-app/src/screens/Console/License/License.tsx @@ -127,7 +127,7 @@ const License = () => { return ( {!isRegistered && ( @@ -151,7 +151,7 @@ const License = () => { } /> - + {isRegistered && ( diff --git a/web-app/src/screens/Console/License/LicensePlans.tsx b/web-app/src/screens/Console/License/LicensePlans.tsx index b95e1fd1ff..68262363be 100644 --- a/web-app/src/screens/Console/License/LicensePlans.tsx +++ b/web-app/src/screens/Console/License/LicensePlans.tsx @@ -32,13 +32,14 @@ interface IRegisterStatus { const LicensesInformation = styled.div(({ theme }) => ({ display: "grid", - gridTemplateColumns: "repeat(4, minmax(350px, 400px));", - justifyContent: "flex-start", + gridTemplateColumns: "repeat(1, minmax(350px, 400px));", + alignItems:"center", + justifyContent:"center", marginTop: 30, marginLeft: 30, "& > div": { borderBottom: `${get(theme, "borderColor", "#EAEAEA")} 1px solid`, - padding: "25px 40px", + padding: "13px 20px", justifyContent: "center", "&.openSource": { borderRight: `#002562 2px solid`, @@ -152,11 +153,10 @@ const LicensePlans = ({ licenseInfo }: IRegisterStatus) => { }; return ( - {[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => { return ( - + {element !== null && ( {element.planName} @@ -176,52 +176,43 @@ const LicensePlans = ({ licenseInfo }: IRegisterStatus) => { ); })} {FEATURE_ITEMS.map((feature, index) => { - const lastItem = - index === FEATURE_ITEMS.length - 1 ? "noBorderBottom" : ""; - return ( - - - {feature.featureLabel} - - - {renderFeatureInformation( - feature.featurePlans.openSource || null, - )} - - - {renderFeatureInformation(feature.featurePlans.eosLite || null)} - - + + + {feature.featureLabel} + {renderFeatureInformation(feature.featurePlans.eosPlus || null)} - ); })} - {[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => { + {[ ...LICENSE_PLANS_INFORMATION].map((element) => { return ( - - {element && - getButton( - `https://min.io/signup`, - element.planType === "commercial" - ? "Subscribe" - : "Join Slack", - element.planType === "commercial" ? "callAction" : "regular", - )} - + element && currentPlan==="community" ? +
+ {getButton( + `https://min.io/signup`, + element.planType === "commercial" + ? "Subscribe" + : "Join Slack", + element.planType === "commercial" ? "callAction" : "regular", + )}
: ( +
+ {getButton( + `https://subnet.min.io/`,"Log in to SUBNET","callAction" + )}
+ ) ); })}
-
); }; diff --git a/web-app/src/screens/Console/License/utils.tsx b/web-app/src/screens/Console/License/utils.tsx index 173d007a61..6f423f8768 100644 --- a/web-app/src/screens/Console/License/utils.tsx +++ b/web-app/src/screens/Console/License/utils.tsx @@ -41,28 +41,16 @@ interface PlansFeatures { export const FEATURE_ITEMS: PlansFeatures[] = [ { - featureLabel: "License", + featureLabel: "", featurePlans: { - openSource: { - content: "Requires AGPLv3 License Compliance", - }, - eosLite: { - content: "Commercial License", - }, eosPlus: { content: "Commercial License", }, }, }, { - featureLabel: "Release", + featureLabel: "", featurePlans: { - openSource: { - content: "Upstream Community Release", - }, - eosLite: { - content: "Enterprise Stable Release", - }, eosPlus: { content: "Enterprise Stable Release", }, @@ -71,13 +59,6 @@ export const FEATURE_ITEMS: PlansFeatures[] = [ { featureLabel: "Additional Features", featurePlans: { - openSource: { - content: "None", - }, - eosLite: { - content: - "Global Console, Observability, Cache, Data Firewall, Key Management Server Catalog", - }, eosPlus: { content: "Global Console, Observability, Cache, Data Firewall, Key Management Server Catalog", @@ -87,12 +68,6 @@ export const FEATURE_ITEMS: PlansFeatures[] = [ { featureLabel: "Long Term Release Support", featurePlans: { - openSource: { - content: "None", - }, - eosLite: { - content: "1 year LTS", - }, eosPlus: { content: "5 years LTS", }, @@ -101,26 +76,14 @@ export const FEATURE_ITEMS: PlansFeatures[] = [ { featureLabel: "Support SLA", featurePlans: { - openSource: { - content: "No SLA", - }, - eosLite: { - content: "Next Business Day SLA", - }, eosPlus: { - content: "Less than 4 Hour SLA", + content: "Less than 4 Hours", }, }, }, { featureLabel: "Panic button", featurePlans: { - openSource: { - content: "None", - }, - eosLite: { - content: "1 Panic Button Per Year", - }, eosPlus: { content: "Unlimited Panic Buttons Per Year", }, @@ -130,13 +93,6 @@ export const FEATURE_ITEMS: PlansFeatures[] = [ featureLabel: "Call Home Diagnostics, Health Check, Performance Benchmark, Security and Critical Vulnerabilities Notifications", featurePlans: { - openSource: { - content: "", - }, - eosLite: { - content: "", - isCheck: true, - }, eosPlus: { content: "", isCheck: true, @@ -146,12 +102,6 @@ export const FEATURE_ITEMS: PlansFeatures[] = [ { featureLabel: "Indemnification", featurePlans: { - openSource: { - content: "", - }, - eosLite: { - content: "", - }, eosPlus: { content: "", isCheck: true, @@ -161,12 +111,6 @@ export const FEATURE_ITEMS: PlansFeatures[] = [ { featureLabel: "Annual Review of Architecture, Performance and Security", featurePlans: { - openSource: { - content: "", - }, - eosLite: { - content: "", - }, eosPlus: { content: "", isCheck: true, @@ -176,40 +120,9 @@ export const FEATURE_ITEMS: PlansFeatures[] = [ ]; export const LICENSE_PLANS_INFORMATION: LicensePlanOption[] = [ - { - planId: "openSource", - planName: "Open Source", - planType: "open-source", - planIcon: ( - - ), - planDescription: ( - - Designed for developers who are building open source applications in - compliance with the GNU AGPL v3 license which requires developers to - distribute their code under the same AGPL v3 license when they - distribute, host or modify MinIO. - - ), - }, - { - planId: "eosLite", - planName: "Enterprise Lite", - planType: "commercial", - planIcon: ( - - ), - planDescription: ( - - Designed for customers who require a commercial license and can mostly - self-support but want the peace of mind that comes with an - engineer-backend SLA, additional features and operational capabilities. - - ), - }, { planId: "eosPlus", - planName: "Enterprise Plus", + planName: "Enterprise", planType: "commercial", planIcon: ( @@ -217,7 +130,7 @@ export const LICENSE_PLANS_INFORMATION: LicensePlanOption[] = [ planDescription: ( Designed for customers where a commercial license and the - strictest,engineer-backed SLA are required. The Plus tiers offers + strictest,engineer-backed SLA are required. It offers additional features and operational capabilities, more interaction options and more enterprise deliverables.