Skip to content

Commit 6c8ec04

Browse files
dvaldiviahuncrys
authored andcommitted
License Comparisson updates (minio#3532)
* License Comparisson updates Signed-off-by: Daniel Valdivia <hola@danielvaldivia.com> * Prettier --------- Signed-off-by: Daniel Valdivia <hola@danielvaldivia.com>
1 parent 7ff56d1 commit 6c8ec04

File tree

2 files changed

+107
-137
lines changed

2 files changed

+107
-137
lines changed

web-app/src/screens/Console/License/LicensePlans.tsx

Lines changed: 66 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ const LicensesInformation = styled.div(({ theme }) => ({
8888
},
8989
"& .planName": {
9090
fontWeight: 600,
91-
fontSize: 35,
92-
marginBottom: 20,
91+
fontSize: 32,
92+
marginBottom: 24,
9393
textAlign: "center",
94-
marginTop: 10,
94+
marginTop: 8,
9595
},
9696
"& .planIcon": {
9797
height: 45,
@@ -153,96 +153,71 @@ const LicensePlans = ({ licenseInfo }: IRegisterStatus) => {
153153
};
154154

155155
return (
156-
<LicensesInformation>
157-
{[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => {
158-
return (
159-
<Box
160-
key={`${element?.planType}-${index}`}
161-
className={`${index === 1 ? "openSource first" : ""}`}
162-
>
163-
{element !== null && (
164-
<Box>
165-
<Box className={"planName"}>{element.planName}</Box>
166-
<Box
167-
className={`planIcon ${
168-
element.planType === "commercial" ? "commercial" : ""
169-
}`}
170-
>
171-
{element?.planIcon}
172-
</Box>
173-
<Box className={"planDescription"}>
174-
{element?.planDescription}
156+
<Fragment>
157+
<LicensesInformation>
158+
{[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => {
159+
return (
160+
<Box className={`${index === 1 ? "openSource first" : ""}`}>
161+
{element !== null && (
162+
<Box>
163+
<Box className={"planName"}>{element.planName}</Box>
164+
<Box
165+
className={`planIcon ${
166+
element.planType === "commercial" ? "commercial" : ""
167+
}`}
168+
>
169+
{element?.planIcon}
170+
</Box>
171+
<Box className={"planDescription"}>
172+
{element?.planDescription}
173+
</Box>
175174
</Box>
175+
)}
176+
</Box>
177+
);
178+
})}
179+
{FEATURE_ITEMS.map((feature, index) => {
180+
const lastItem =
181+
index === FEATURE_ITEMS.length - 1 ? "noBorderBottom" : "";
182+
183+
return (
184+
<Fragment>
185+
<Box className={`feature-label ${lastItem}`}>
186+
{feature.featureLabel}
187+
</Box>
188+
<Box className={`feature-information openSource ${lastItem}`}>
189+
{renderFeatureInformation(
190+
feature.featurePlans.openSource || null,
191+
)}
192+
</Box>
193+
<Box className={`feature-information ${lastItem}`}>
194+
{renderFeatureInformation(feature.featurePlans.eosPlus || null)}
176195
</Box>
177-
)}
178-
</Box>
179-
);
180-
})}
181-
{FEATURE_ITEMS.map((feature, index) => {
182-
return (
183-
<Box
184-
key={`${feature.featureLabel}-${index}`}
185-
className={`feature-information`}
186-
sx={{
187-
display: "flex",
188-
borderLeft: `#002562 2px solid`,
189-
borderRight: `#002562 2px solid`,
190-
flexDirection: "column",
191-
gap: "10px",
192-
alignItems: "center",
193-
}}
194-
>
195-
<Box className={`feature-label `}>{feature.featureLabel}</Box>
196-
{renderFeatureInformation(feature.featurePlans.eosPlus || null)}
197-
</Box>
198-
);
199-
})}
200-
{[...LICENSE_PLANS_INFORMATION].map((element) => {
201-
return element && currentPlan === "community" ? (
202-
<div
203-
key="plan-subscribe-btn"
204-
style={{
205-
borderLeft: `#002562 2px solid`,
206-
display: "flex",
207-
alignItems: "center",
208-
justifyContent: "center",
209-
borderRight: `#002562 2px solid`,
210-
borderBottom: `#002562 2px solid`,
211-
borderBottomLeftRadius: "10px",
212-
borderBottomRightRadius: "10px",
213-
}}
214-
>
215-
{getButton(
216-
element.planType === "commercial"
217-
? `https://min.io/signup`
218-
: `https://slack.min.io`,
219-
element.planType === "commercial" ? "Subscribe" : "Join Slack",
220-
element.planType === "commercial" ? "callAction" : "regular",
221-
)}
222-
</div>
223-
) : (
224-
<div
225-
key="plan-subscribe-btn-1"
226-
style={{
227-
borderLeft: `#002562 2px solid`,
228-
display: "flex",
229-
alignItems: "center",
230-
justifyContent: "center",
231-
borderRight: `#002562 2px solid`,
232-
borderBottom: `#002562 2px solid`,
233-
borderBottomLeftRadius: "10px",
234-
borderBottomRightRadius: "10px",
235-
}}
236-
>
237-
{getButton(
238-
`https://subnet.min.io/`,
239-
"Log in to SUBNET",
240-
"callAction",
241-
)}
242-
</div>
243-
);
244-
})}
245-
</LicensesInformation>
196+
</Fragment>
197+
);
198+
})}
199+
{[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => {
200+
return (
201+
<Box
202+
className={`${
203+
index === 1 ? "openSource last" : ""
204+
} noBorderBottom`}
205+
sx={{
206+
display: "flex",
207+
justifyContent: "center",
208+
}}
209+
>
210+
{element &&
211+
getButton(
212+
`https://min.io/signup`,
213+
element.planType === "commercial" ? "Upgrade" : "Join Slack",
214+
element.planType === "commercial" ? "callAction" : "regular",
215+
)}
216+
</Box>
217+
);
218+
})}
219+
</LicensesInformation>
220+
</Fragment>
246221
);
247222
};
248223

web-app/src/screens/Console/License/utils.tsx

Lines changed: 41 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -41,100 +41,95 @@ interface PlansFeatures {
4141

4242
export const FEATURE_ITEMS: PlansFeatures[] = [
4343
{
44-
featureLabel: "",
44+
featureLabel: "License",
4545
featurePlans: {
4646
eosPlus: {
4747
content: "Commercial License",
4848
},
4949
},
5050
},
5151
{
52-
featureLabel: "",
52+
featureLabel: "Intended Use",
5353
featurePlans: {
54-
eosPlus: {
55-
content: "Enterprise Stable Release",
54+
openSource: {
55+
content: <div>Test and Dev Use</div>,
5656
},
57-
},
58-
},
59-
{
60-
featureLabel: "Additional Features",
61-
featurePlans: {
6257
eosPlus: {
63-
content:
64-
"Global Console, Observability, Cache, Data Firewall, Key Management Server Catalog",
58+
content: (
59+
<div>
60+
Production Use <br /> (Site-Replication, Enterprise Grade Security,
61+
Encryption and Key Management)
62+
</div>
63+
),
6564
},
6665
},
6766
},
6867
{
69-
featureLabel: "Long Term Release Support",
68+
featureLabel: "Features",
7069
featurePlans: {
71-
eosPlus: {
72-
content: "5 years LTS",
70+
openSource: {
71+
content: "Community Support",
7372
},
74-
},
75-
},
76-
{
77-
featureLabel: "Support SLA",
78-
featurePlans: {
7973
eosPlus: {
80-
content: "Less than 4 Hours",
74+
content:
75+
"SLA backed - 24/7/365, <4 hr response time, Instant SLA for P0 issues ",
8176
},
8277
},
8378
},
8479
{
85-
featureLabel: "Panic button",
80+
featureLabel: "Support",
8681
featurePlans: {
87-
eosPlus: {
88-
content: "Unlimited Panic Buttons Per Year",
82+
openSource: {
83+
content: "Basic Features",
8984
},
90-
},
91-
},
92-
{
93-
featureLabel:
94-
"Call Home Diagnostics, Health Check, Performance Benchmark, Security and Critical Vulnerabilities Notifications",
95-
featurePlans: {
9685
eosPlus: {
97-
content: "",
98-
isCheck: true,
86+
content:
87+
"FIPS 140-a Compliant, Pentest\n" +
88+
"SOC2, ISO 27001, \n" +
89+
"SEC 17a-4(f), FINRA 4511(c) and CFTC 1.31(c)-(d)\n" +
90+
"\n",
9991
},
10092
},
10193
},
10294
{
103-
featureLabel: "Indemnification",
95+
featureLabel: "System Management",
10496
featurePlans: {
97+
openSource: {
98+
content: "CLI and API",
99+
},
105100
eosPlus: {
106-
content: "",
107-
isCheck: true,
101+
content: "CLI, API and Graphical User Interface (GUI)",
108102
},
109103
},
110104
},
111105
{
112-
featureLabel: "Annual Review of Architecture, Performance and Security",
106+
featureLabel: "Panic button",
113107
featurePlans: {
114108
eosPlus: {
115-
content: "",
116-
isCheck: true,
109+
content: "Unlimited Panic Buttons Per Year",
117110
},
118111
},
119112
},
120113
];
121114

122115
export const LICENSE_PLANS_INFORMATION: LicensePlanOption[] = [
116+
{
117+
planId: "openSource",
118+
planName: "Community Edition",
119+
planType: "open-source",
120+
planIcon: (
121+
<ApplicationLogo applicationName={"console"} subVariant={"AGPL"} />
122+
),
123+
planDescription: "",
124+
},
123125
{
124126
planId: "eosPlus",
125-
planName: "Enterprise",
127+
planName: "Enterprise Edition",
126128
planType: "commercial",
127129
planIcon: (
128130
<ApplicationLogo applicationName={"minio"} subVariant={"enterpriseos"} />
129131
),
130-
planDescription: (
131-
<span>
132-
Designed for customers where a commercial license and the
133-
strictest,engineer-backed SLA are required. It offers additional
134-
features and operational capabilities, more interaction options and more
135-
enterprise deliverables.
136-
</span>
137-
),
132+
planDescription: "",
138133
},
139134
];
140135

0 commit comments

Comments
 (0)