From cc669073268be11e667584e0d5aee3541ade48c0 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Tue, 19 Aug 2025 15:33:52 +0530 Subject: [PATCH 1/2] fix: do not check expiry for freemium --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/License/DevtronLicenseCard.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0c35ce2b3..d75d766b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.19.1", + "version": "1.19.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.19.1", + "version": "1.19.2", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index dfd5c4c4b..fe0fdc972 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/Shared/Components/License/DevtronLicenseCard.tsx b/src/Shared/Components/License/DevtronLicenseCard.tsx index 346f2cdda..fdb59d9e2 100644 --- a/src/Shared/Components/License/DevtronLicenseCard.tsx +++ b/src/Shared/Components/License/DevtronLicenseCard.tsx @@ -56,7 +56,7 @@ const LicenseCardSubText = ({ const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded - if (licenseStatus === LicenseStatus.ACTIVE && isFreemium) { + if (isFreemium) { return (
From 62c58efbbb23c2e13d6075b8262cf3a8f17de977 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Tue, 19 Aug 2025 15:44:28 +0530 Subject: [PATCH 2/2] chore: update logic --- .../Components/License/DevtronLicenseCard.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Shared/Components/License/DevtronLicenseCard.tsx b/src/Shared/Components/License/DevtronLicenseCard.tsx index fdb59d9e2..f8934f70a 100644 --- a/src/Shared/Components/License/DevtronLicenseCard.tsx +++ b/src/Shared/Components/License/DevtronLicenseCard.tsx @@ -50,13 +50,9 @@ const LicenseCardSubText = ({ licenseStatus, licenseStatusError, }: Pick) => { - if (licenseStatus === LicenseStatus.ACTIVE && !isFreemium) { - return null - } - - const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded - if (isFreemium) { + const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded + return (
@@ -92,6 +88,12 @@ const LicenseCardSubText = ({ ) } + // Cases when not freemium + + if (licenseStatus === LicenseStatus.ACTIVE) { + return null + } + const isLicenseExpired = licenseStatus === LicenseStatus.EXPIRED return (