Skip to content

fix: do not check expiry for freemium #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2025
Merged

fix: do not check expiry for freemium #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc66907
fix: do not check expiry for freemium
arunjaindev Aug 19, 2025
62c58ef
chore: update logic
arunjaindev Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtron-labs/devtron-fe-common-lib",
"version": "1.19.1",
"version": "1.19.2",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand Down
14 changes: 8 additions & 6 deletions src/Shared/Components/License/DevtronLicenseCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,9 @@ const LicenseCardSubText = ({
licenseStatus,
licenseStatusError,
}: Pick<DevtronLicenseCardProps, 'isFreemium' | 'licenseStatus' | 'licenseStatusError'>) => {
if (licenseStatus === LicenseStatus.ACTIVE && !isFreemium) {
return null
}
if (isFreemium) {
const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded

const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded

if (licenseStatus === LicenseStatus.ACTIVE && isFreemium) {
return (
<div className="p-16 fs-13 lh-1-5 flexbox-col dc__gap-8">
<div className="flexbox dc__gap-8 dc__content-space fs-13 fw-4 lh-20 cn-9">
Expand Down Expand Up @@ -92,6 +88,12 @@ const LicenseCardSubText = ({
)
}

// Cases when not freemium

if (licenseStatus === LicenseStatus.ACTIVE) {
return null
}

const isLicenseExpired = licenseStatus === LicenseStatus.EXPIRED

return (
Expand Down
Loading