Merge pull request #859 from devtron-labs/fix/freemium-license

fix: do not check expiry for freemium

Author: arunjaindev

package-lock.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",

package.json

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