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..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 - } + if (isFreemium) { + const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded - const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded - - if (licenseStatus === LicenseStatus.ACTIVE && isFreemium) { return (
@@ -92,6 +88,12 @@ const LicenseCardSubText = ({ ) } + // Cases when not freemium + + if (licenseStatus === LicenseStatus.ACTIVE) { + return null + } + const isLicenseExpired = licenseStatus === LicenseStatus.EXPIRED return (