From 72053d5c03b904604da34502aa31871c1a2a13c4 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 12 Dec 2025 14:37:40 +0530 Subject: [PATCH 01/17] chore: update version to 1.21.0-beta-5 in package.json and package-lock.json; add instanceData to DevtronLicenseDTO type --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/types.ts | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index db4615668..1f9c7323b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0", + "version": "1.21.0-beta-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0", + "version": "1.21.0-beta-5", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 8a89ce40c..d067d22e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0", + "version": "1.21.0-beta-5", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/types.ts b/src/Shared/types.ts index c4b758b5f..e7ade8e2b 100644 --- a/src/Shared/types.ts +++ b/src/Shared/types.ts @@ -1141,9 +1141,14 @@ export type DevtronLicenseDTO = Devt showLicenseData?: never licenseStatusError?: never moduleLimits?: never + instanceData: { + devtronUrl: string + devtronPassword: string + } } : { claimedByUserDetails?: never + instanceData?: never showLicenseData: boolean licenseStatusError?: LicenseErrorStruct moduleLimits: { From 98fb16275039c19516e3115172b7efca4b91cc42 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 15 Dec 2025 13:35:46 +0530 Subject: [PATCH 02/17] Add new SVG illustrations for installation options - Imported ImgInstallFreemiumSaas and ImgInstallViaAwsMarketplace SVGs. - Updated illustrationMap to include new illustrations for 'img-install-freemium-saas' and 'img-install-via-aws-marketplace'. --- package-lock.json | 4 +- package.json | 2 +- .../img-install-freemium-saas.svg | 40 ++++++++++++++++ .../img-install-via-aws-marketplace.svg | 48 +++++++++++++++++++ .../Components/Illustration/Illustration.tsx | 4 ++ 5 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 src/Assets/Illustration/img-install-freemium-saas.svg create mode 100644 src/Assets/Illustration/img-install-via-aws-marketplace.svg diff --git a/package-lock.json b/package-lock.json index 1f9c7323b..c53470dd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-5", + "version": "1.21.0-beta-6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-5", + "version": "1.21.0-beta-6", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index d067d22e7..115ae9b15 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-5", + "version": "1.21.0-beta-6", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Assets/Illustration/img-install-freemium-saas.svg b/src/Assets/Illustration/img-install-freemium-saas.svg new file mode 100644 index 000000000..3ee2d147b --- /dev/null +++ b/src/Assets/Illustration/img-install-freemium-saas.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Assets/Illustration/img-install-via-aws-marketplace.svg b/src/Assets/Illustration/img-install-via-aws-marketplace.svg new file mode 100644 index 000000000..e98457714 --- /dev/null +++ b/src/Assets/Illustration/img-install-via-aws-marketplace.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Shared/Components/Illustration/Illustration.tsx b/src/Shared/Components/Illustration/Illustration.tsx index 8beee2a4b..47feb5052 100644 --- a/src/Shared/Components/Illustration/Illustration.tsx +++ b/src/Shared/Components/Illustration/Illustration.tsx @@ -2,6 +2,8 @@ import ImgCode from '@Illustrations/img-code.webp' import ImgDevtronFreemium from '@Illustrations/img-devtron-freemium.webp' +import { ReactComponent as ImgInstallFreemiumSaas } from '@Illustrations/img-install-freemium-saas.svg' +import { ReactComponent as ImgInstallViaAwsMarketplace } from '@Illustrations/img-install-via-aws-marketplace.svg' import ImgManOnRocket from '@Illustrations/img-man-on-rocket.webp' import { ReactComponent as ImgMechanicalOperation } from '@Illustrations/img-mechanical-operation.svg' import ImgNoResult from '@Illustrations/img-no-result.webp' @@ -11,6 +13,8 @@ import { IllustrationBase } from './IllustrationBase' import { IllustrationBaseProps } from './types' export const illustrationMap = { + 'img-install-freemium-saas': ImgInstallFreemiumSaas, + 'img-install-via-aws-marketplace': ImgInstallViaAwsMarketplace, 'img-mechanical-operation': ImgMechanicalOperation, 'img-code': ImgCode, 'img-devtron-freemium': ImgDevtronFreemium, From fab5e6fd6ea2f598166e64a179d2dee9041ee72a Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 15 Dec 2025 17:29:14 +0530 Subject: [PATCH 03/17] chore: bump version to 1.21.0-beta-7 in package.json and package-lock.json; add img-page-not-found.svg illustration and update DevtronLicenseCard to handle SaaS instance --- package-lock.json | 4 +- package.json | 2 +- .../Illustration/img-page-not-found.svg | 81 +++++++++++++++++++ .../Components/Illustration/Illustration.tsx | 2 + .../Components/License/DevtronLicenseCard.tsx | 23 ++++-- src/Shared/Components/License/types.ts | 2 + 6 files changed, 105 insertions(+), 9 deletions(-) create mode 100644 src/Assets/Illustration/img-page-not-found.svg diff --git a/package-lock.json b/package-lock.json index c53470dd8..67d9ae242 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-6", + "version": "1.21.0-beta-7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-6", + "version": "1.21.0-beta-7", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 115ae9b15..8f4ac1b38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-6", + "version": "1.21.0-beta-7", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Assets/Illustration/img-page-not-found.svg b/src/Assets/Illustration/img-page-not-found.svg new file mode 100644 index 000000000..b0de197a2 --- /dev/null +++ b/src/Assets/Illustration/img-page-not-found.svg @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Shared/Components/Illustration/Illustration.tsx b/src/Shared/Components/Illustration/Illustration.tsx index 47feb5052..f27acecf0 100644 --- a/src/Shared/Components/Illustration/Illustration.tsx +++ b/src/Shared/Components/Illustration/Illustration.tsx @@ -7,6 +7,7 @@ import { ReactComponent as ImgInstallViaAwsMarketplace } from '@Illustrations/im import ImgManOnRocket from '@Illustrations/img-man-on-rocket.webp' import { ReactComponent as ImgMechanicalOperation } from '@Illustrations/img-mechanical-operation.svg' import ImgNoResult from '@Illustrations/img-no-result.webp' +import { ReactComponent as ImgPageNotFound } from '@Illustrations/img-page-not-found.svg' // eslint-disable-next-line no-restricted-imports import { IllustrationBase } from './IllustrationBase' @@ -16,6 +17,7 @@ export const illustrationMap = { 'img-install-freemium-saas': ImgInstallFreemiumSaas, 'img-install-via-aws-marketplace': ImgInstallViaAwsMarketplace, 'img-mechanical-operation': ImgMechanicalOperation, + 'img-page-not-found': ImgPageNotFound, 'img-code': ImgCode, 'img-devtron-freemium': ImgDevtronFreemium, 'img-man-on-rocket': ImgManOnRocket, diff --git a/src/Shared/Components/License/DevtronLicenseCard.tsx b/src/Shared/Components/License/DevtronLicenseCard.tsx index f2904251d..6bf4a4d7a 100644 --- a/src/Shared/Components/License/DevtronLicenseCard.tsx +++ b/src/Shared/Components/License/DevtronLicenseCard.tsx @@ -130,10 +130,9 @@ export const DevtronLicenseCard = ({ appTheme, handleCopySuccess, licenseStatusError, + isSaasInstance, }: DevtronLicenseCardProps) => { const { bgColor, textColor } = getLicenseColorsAccordingToStatus({ isFreemium, licenseStatus, licenseStatusError }) - const remainingTime = getTTLInHumanReadableFormat(ttl) - const remainingTimeString = ttl < 0 ? `Expired ${remainingTime} ago` : `${remainingTime} remaining` const isThemeDark = appTheme === AppThemeType.dark const cardRef = useRef(null) @@ -178,6 +177,15 @@ export const DevtronLicenseCard = ({ ? useMotionTemplate`linear-gradient(55deg, transparent, rgba(122, 127, 131, ${sheenOpacity}) ${sheenPosition}%, transparent)` : useMotionTemplate`linear-gradient(55deg, transparent, rgba(255, 255, 255, ${sheenOpacity}) ${sheenPosition}%, transparent)` + const getRemainingTimeString = () => { + if (isFreemium) { + return null + } + + const remainingTime = getTTLInHumanReadableFormat(ttl) + return ttl < 0 ? `Expired ${remainingTime} ago` : `${remainingTime} remaining` + } + return (
@@ -216,13 +224,16 @@ export const DevtronLicenseCard = ({ )}
- - {isFreemium ? 'VALID FOREVER' : expiryDate} - + {/* FIXME: How to hide this in dashboard */} + {!isSaasInstance && ( + + {isFreemium ? 'VALID FOREVER' : expiryDate} + + )} {!isFreemium && ( <> · - {remainingTimeString} + {getRemainingTimeString()} )}
diff --git a/src/Shared/Components/License/types.ts b/src/Shared/Components/License/types.ts index 38b2be000..8fe9d1328 100644 --- a/src/Shared/Components/License/types.ts +++ b/src/Shared/Components/License/types.ts @@ -36,11 +36,13 @@ export type DevtronLicenseCardProps = { | { licenseKey: string handleCopySuccess?: () => void + isSaasInstance: boolean licenseSuffix?: never } | { licenseKey?: never handleCopySuccess?: never + isSaasInstance?: never licenseSuffix: string } ) From adb0815cbbd118facc9460d23e1ecc10efca60ae Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 15 Dec 2025 18:01:45 +0530 Subject: [PATCH 04/17] chore: bump version to 1.21.0-beta-8 in package.json and package-lock.json; add isSaasInstance to DevtronLicenseCardProps and update utils to derive its value from instanceData --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/License/types.ts | 3 +-- src/Shared/Components/License/utils.tsx | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67d9ae242..d2385fcbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-7", + "version": "1.21.0-beta-8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-7", + "version": "1.21.0-beta-8", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 8f4ac1b38..ee46a0b6d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-7", + "version": "1.21.0-beta-8", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/License/types.ts b/src/Shared/Components/License/types.ts index 8fe9d1328..54d8e69a2 100644 --- a/src/Shared/Components/License/types.ts +++ b/src/Shared/Components/License/types.ts @@ -32,17 +32,16 @@ export type DevtronLicenseCardProps = { isFreemium: boolean appTheme: AppThemeType licenseStatusError: LicenseErrorStruct + isSaasInstance: boolean } & ( | { licenseKey: string handleCopySuccess?: () => void - isSaasInstance: boolean licenseSuffix?: never } | { licenseKey?: never handleCopySuccess?: never - isSaasInstance?: never licenseSuffix: string } ) diff --git a/src/Shared/Components/License/utils.tsx b/src/Shared/Components/License/utils.tsx index 540d14613..186482b1f 100644 --- a/src/Shared/Components/License/utils.tsx +++ b/src/Shared/Components/License/utils.tsx @@ -86,6 +86,8 @@ export const parseDevtronLicenseDTOIntoLicenseCardData = Date: Tue, 16 Dec 2025 12:11:34 +0530 Subject: [PATCH 05/17] chore: bump version to 1.21.0-beta-9 in package.json and package-lock.json; add LICENSE_KEY_QUERY_PARAM constant --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/constants.tsx | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d2385fcbb..33c2416f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-8", + "version": "1.21.0-beta-9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-8", + "version": "1.21.0-beta-9", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index ee46a0b6d..0d5e3d2a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-8", + "version": "1.21.0-beta-9", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/constants.tsx b/src/Shared/constants.tsx index a644380a6..a6952be83 100644 --- a/src/Shared/constants.tsx +++ b/src/Shared/constants.tsx @@ -606,3 +606,4 @@ export const CUBIC_BEZIER_CURVE: [number, number, number, number] = [0.33, 1, 0. // Use this class on an element to allow clicking on it outside focus trap export const ALLOW_ACTION_OUTSIDE_FOCUS_TRAP = 'allow-action-outside-focus-trap' +export const LICENSE_KEY_QUERY_PARAM = 'licenseKey' From 0cec9ee0ac8422419021e41ddcb4f5c62800cb7d Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 16 Dec 2025 12:12:37 +0530 Subject: [PATCH 06/17] chore: bump version to 1.21.0-beta-11 in package.json and package-lock.json --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33c2416f8..7ace14e2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-9", + "version": "1.21.0-beta-11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-9", + "version": "1.21.0-beta-11", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 0d5e3d2a6..e2a8561d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-9", + "version": "1.21.0-beta-11", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From a7ea5f8c2a4e16d61588e50840df2bb050a09ea0 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 16 Dec 2025 12:50:08 +0530 Subject: [PATCH 07/17] chore: bump version to 1.21.0-beta-12 in package.json and package-lock.json; add activateLicense export in License component --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/License/index.tsx | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ace14e2f..af2337a45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-11", + "version": "1.21.0-beta-12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-11", + "version": "1.21.0-beta-12", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index e2a8561d4..e91779385 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-11", + "version": "1.21.0-beta-12", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/License/index.tsx b/src/Shared/Components/License/index.tsx index 75fa48db5..52c765f60 100644 --- a/src/Shared/Components/License/index.tsx +++ b/src/Shared/Components/License/index.tsx @@ -17,5 +17,6 @@ export { default as ActivateLicenseDialog } from './ActivateLicenseDialog' export { default as DevtronLicenseCard } from './DevtronLicenseCard' export { ICDevtronWithBorder, default as InstallationFingerprintInfo } from './License.components' +export { activateLicense } from './services' export * from './types' export { parseDevtronLicenseData, parseDevtronLicenseDTOIntoLicenseCardData } from './utils' From f5514b60337d2319a88c2de1206f5aa7831e3f2a Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 16 Dec 2025 14:45:33 +0530 Subject: [PATCH 08/17] chore: bump version to 1.21.0-beta-13 in package.json and package-lock.json; update instanceData handling in License component --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/License/utils.tsx | 3 ++- src/Shared/types.ts | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index af2337a45..91471d07d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-12", + "version": "1.21.0-beta-13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-12", + "version": "1.21.0-beta-13", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index e91779385..ecf1ff6d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.0-beta-12", + "version": "1.21.0-beta-13", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/License/utils.tsx b/src/Shared/Components/License/utils.tsx index 186482b1f..997bc8a6f 100644 --- a/src/Shared/Components/License/utils.tsx +++ b/src/Shared/Components/License/utils.tsx @@ -76,6 +76,7 @@ export const parseDevtronLicenseDTOIntoLicenseCardData = = Devt instanceData: { devtronUrl: string devtronPassword: string - } + } | null } : { claimedByUserDetails?: never From 55f04e47789716c82aedea5a39053e3ffbc12044 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 16 Dec 2025 15:40:56 +0530 Subject: [PATCH 09/17] chore: bump version to 1.21.1-beta-0 in package.json and package-lock.json --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f4bb8517d..6a96ee77b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1", + "version": "1.21.1-beta-0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1", + "version": "1.21.1-beta-0", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index e3506004c..0a75b0675 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1", + "version": "1.21.1-beta-0", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 319dac79d1577a089aba9851e873f44b8cb17d71 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Tue, 16 Dec 2025 18:24:17 +0530 Subject: [PATCH 10/17] chore: update version to 1.21.1-beta-1 and add new celebration SVG illustration - Updated package.json and package-lock.json to version 1.21.1-beta-1 - Added new SVG illustration for celebration to the assets - Updated Illustration.tsx to include the new celebration illustration in the illustration map --- package-lock.json | 4 +- package.json | 2 +- src/Assets/Illustration/img-celebration.svg | 149 ++++++++++++++++++ .../Components/Illustration/Illustration.tsx | 2 + 4 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 src/Assets/Illustration/img-celebration.svg diff --git a/package-lock.json b/package-lock.json index 6a96ee77b..dc70ddc25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-0", + "version": "1.21.1-beta-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-0", + "version": "1.21.1-beta-1", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 0a75b0675..d7fc858c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-0", + "version": "1.21.1-beta-1", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Assets/Illustration/img-celebration.svg b/src/Assets/Illustration/img-celebration.svg new file mode 100644 index 000000000..1982add63 --- /dev/null +++ b/src/Assets/Illustration/img-celebration.svg @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/Components/Illustration/Illustration.tsx b/src/Shared/Components/Illustration/Illustration.tsx index f27acecf0..6f0e02557 100644 --- a/src/Shared/Components/Illustration/Illustration.tsx +++ b/src/Shared/Components/Illustration/Illustration.tsx @@ -1,5 +1,6 @@ // NOTE: This file is auto-generated. Do not edit directly. Run the script `npm run generate-illustration` to update. +import { ReactComponent as ImgCelebration } from '@Illustrations/img-celebration.svg' import ImgCode from '@Illustrations/img-code.webp' import ImgDevtronFreemium from '@Illustrations/img-devtron-freemium.webp' import { ReactComponent as ImgInstallFreemiumSaas } from '@Illustrations/img-install-freemium-saas.svg' @@ -14,6 +15,7 @@ import { IllustrationBase } from './IllustrationBase' import { IllustrationBaseProps } from './types' export const illustrationMap = { + 'img-celebration': ImgCelebration, 'img-install-freemium-saas': ImgInstallFreemiumSaas, 'img-install-via-aws-marketplace': ImgInstallViaAwsMarketplace, 'img-mechanical-operation': ImgMechanicalOperation, From db4bcbb5e72315484e7fd99c98a56f1720cfa0a0 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Wed, 17 Dec 2025 14:07:35 +0530 Subject: [PATCH 11/17] chore: bump version to 1.21.1-beta-2; update License component to use isSaasInstance and add it to DevtronLicenseDTO --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/License/utils.tsx | 5 ++--- src/Shared/types.ts | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index dc70ddc25..95a39336c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-1", + "version": "1.21.1-beta-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-1", + "version": "1.21.1-beta-2", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index d7fc858c0..6f3c33d98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-1", + "version": "1.21.1-beta-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/License/utils.tsx b/src/Shared/Components/License/utils.tsx index 997bc8a6f..6b91a557f 100644 --- a/src/Shared/Components/License/utils.tsx +++ b/src/Shared/Components/License/utils.tsx @@ -76,7 +76,7 @@ export const parseDevtronLicenseDTOIntoLicenseCardData = = DevtronLicenseBaseDTO & From a3aa6c521bf73960dcea5164a93b60a22f3b6920 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Wed, 17 Dec 2025 14:46:20 +0530 Subject: [PATCH 12/17] chore: remove FIXME comment about hiding element in dashboard for non-SaaS instances --- src/Shared/Components/License/DevtronLicenseCard.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Shared/Components/License/DevtronLicenseCard.tsx b/src/Shared/Components/License/DevtronLicenseCard.tsx index 6bf4a4d7a..090759451 100644 --- a/src/Shared/Components/License/DevtronLicenseCard.tsx +++ b/src/Shared/Components/License/DevtronLicenseCard.tsx @@ -224,7 +224,6 @@ export const DevtronLicenseCard = ({ )}
- {/* FIXME: How to hide this in dashboard */} {!isSaasInstance && ( {isFreemium ? 'VALID FOREVER' : expiryDate} From bd9ca156b6a54af2c0f3feaad487e2da3790a9ef Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Thu, 18 Dec 2025 18:38:40 +0530 Subject: [PATCH 13/17] chore: bump version to 1.21.1-beta-3; update LicenseCard component to include isFreeForever logic and enhance license status handling --- package-lock.json | 4 +- package.json | 2 +- .../Components/License/DevtronLicenseCard.tsx | 32 ++++++++++------ src/Shared/Components/License/types.ts | 5 +++ src/Shared/Components/License/utils.tsx | 25 ++++++++++--- src/Shared/types.ts | 37 +++++++++++++------ 6 files changed, 73 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index 95a39336c..1c517cd2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-2", + "version": "1.21.1-beta-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-2", + "version": "1.21.1-beta-3", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 6f3c33d98..c1353b03f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-2", + "version": "1.21.1-beta-3", "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 090759451..b7815b374 100644 --- a/src/Shared/Components/License/DevtronLicenseCard.tsx +++ b/src/Shared/Components/License/DevtronLicenseCard.tsx @@ -27,7 +27,7 @@ import { LicensingErrorCodes } from '@Shared/types' import { Button, ButtonComponentType, ButtonVariantType } from '../Button' import { Icon } from '../Icon' -import { DevtronLicenseCardProps, LicenseStatus } from './types' +import { DevtronLicenseCardProps, LicenseCardSubTextProps, LicenseStatus } from './types' import { getLicenseColorsAccordingToStatus } from './utils' import './licenseCard.scss' @@ -49,10 +49,11 @@ const LicenseCardSubText = ({ isFreemium, licenseStatus, licenseStatusError, -}: Pick) => { - if (isFreemium) { - const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded + isFreeForever, +}: LicenseCardSubTextProps) => { + const freemiumLimitReached = isFreemium && licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded + if (isFreeForever || freemiumLimitReached) { return (
@@ -132,7 +133,15 @@ export const DevtronLicenseCard = ({ licenseStatusError, isSaasInstance, }: DevtronLicenseCardProps) => { - const { bgColor, textColor } = getLicenseColorsAccordingToStatus({ isFreemium, licenseStatus, licenseStatusError }) + const isFreeForever = isFreemium && !isSaasInstance + + const { bgColor, textColor } = getLicenseColorsAccordingToStatus({ + isFreemium, + licenseStatus, + licenseStatusError, + isSaasInstance, + }) + const isThemeDark = appTheme === AppThemeType.dark const cardRef = useRef(null) @@ -178,7 +187,7 @@ export const DevtronLicenseCard = ({ : useMotionTemplate`linear-gradient(55deg, transparent, rgba(255, 255, 255, ${sheenOpacity}) ${sheenPosition}%, transparent)` const getRemainingTimeString = () => { - if (isFreemium) { + if (isFreeForever) { return null } @@ -224,12 +233,10 @@ export const DevtronLicenseCard = ({ )}
- {!isSaasInstance && ( - - {isFreemium ? 'VALID FOREVER' : expiryDate} - - )} - {!isFreemium && ( + + {isFreeForever ? 'VALID FOREVER' : expiryDate} + + {!isFreeForever && ( <> · {getRemainingTimeString()} @@ -249,6 +256,7 @@ export const DevtronLicenseCard = ({ isFreemium={isFreemium} licenseStatusError={licenseStatusError} licenseStatus={licenseStatus} + isFreeForever={isFreeForever} />
) diff --git a/src/Shared/Components/License/types.ts b/src/Shared/Components/License/types.ts index 54d8e69a2..4c2d639ae 100644 --- a/src/Shared/Components/License/types.ts +++ b/src/Shared/Components/License/types.ts @@ -46,6 +46,11 @@ export type DevtronLicenseCardProps = { } ) +export interface LicenseCardSubTextProps + extends Pick { + isFreeForever: boolean +} + export type DevtronLicenseInfo = Omit & Pick diff --git a/src/Shared/Components/License/utils.tsx b/src/Shared/Components/License/utils.tsx index 6b91a557f..423eb9648 100644 --- a/src/Shared/Components/License/utils.tsx +++ b/src/Shared/Components/License/utils.tsx @@ -27,16 +27,22 @@ export const getLicenseColorsAccordingToStatus = ({ isFreemium, licenseStatus, licenseStatusError, -}: Pick): { + isSaasInstance, +}: Pick): { bgColor: string textColor: string } => { if (isFreemium) { const freemiumLimitReached = licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded - return freemiumLimitReached - ? { bgColor: 'var(--R100)', textColor: 'var(--R500)' } - : { bgColor: 'var(--G100)', textColor: 'var(--G500)' } + if (freemiumLimitReached) { + return { bgColor: 'var(--R100)', textColor: 'var(--R500)' } + } + + if (!isSaasInstance) { + return { bgColor: 'var(--G100)', textColor: 'var(--G500)' } + } } + switch (licenseStatus) { case LicenseStatus.ACTIVE: return { bgColor: 'var(--G100)', textColor: 'var(--G500)' } @@ -68,8 +74,8 @@ export const parseDevtronLicenseDTOIntoLicenseCardData = => { const { isTrial, - expiry, - ttl, + expiry: onPremExpiry, + ttl: onPremTTL, reminderThreshold, organisationMetadata, license, @@ -77,8 +83,15 @@ export const parseDevtronLicenseDTOIntoLicenseCardData = = DevtronLicenseBaseDTO & (isCentralDashboard extends true From 6a2efd4d813693329717c05c0f6d946bdc4fbc06 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Thu, 18 Dec 2025 18:50:46 +0530 Subject: [PATCH 14/17] chore: bump version to 1.21.1-beta-5; update creationTime type in DevtronLicenseBaseDTO to string --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/types.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1c517cd2f..b717bed5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-3", + "version": "1.21.1-beta-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-3", + "version": "1.21.1-beta-5", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index c1353b03f..1709b8060 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-3", + "version": "1.21.1-beta-5", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/types.ts b/src/Shared/types.ts index b589cde1c..287887737 100644 --- a/src/Shared/types.ts +++ b/src/Shared/types.ts @@ -1127,7 +1127,7 @@ export type DevtronLicenseBaseDTO = { * In seconds */ timeElapsedSinceCreation: number - creationTime: number + creationTime: string ttl?: never expiry?: never } From 443382c1c8b7a839eb96a442458bcba46847fbb0 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 19 Dec 2025 12:24:33 +0530 Subject: [PATCH 15/17] chore: bump version to 1.21.1-beta-6; update LicenseCard component to enhance freemium message logic --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/License/DevtronLicenseCard.tsx | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b717bed5c..3bfd3d43d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-5", + "version": "1.21.1-beta-6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-5", + "version": "1.21.1-beta-6", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 1709b8060..f171c527c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-5", + "version": "1.21.1-beta-6", "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 b7815b374..754cd385b 100644 --- a/src/Shared/Components/License/DevtronLicenseCard.tsx +++ b/src/Shared/Components/License/DevtronLicenseCard.tsx @@ -52,8 +52,10 @@ const LicenseCardSubText = ({ isFreeForever, }: LicenseCardSubTextProps) => { const freemiumLimitReached = isFreemium && licenseStatusError?.code === LicensingErrorCodes.ClusterLimitExceeded + const showFreemiumMessage = + isFreeForever || freemiumLimitReached || (isFreemium && licenseStatus === LicenseStatus.ACTIVE) - if (isFreeForever || freemiumLimitReached) { + if (showFreemiumMessage) { return (
From 098ee89e73e32308512d7401a58b9bcf4aa8c0e3 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 19 Dec 2025 12:29:00 +0530 Subject: [PATCH 16/17] chore: bump version to 1.21.1-beta-7 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3bfd3d43d..6c90acd75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-6", + "version": "1.21.1-beta-7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-6", + "version": "1.21.1-beta-7", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index f171c527c..18ee52ac2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.21.1-beta-6", + "version": "1.21.1-beta-7", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From aab47cff7354cae1b35a2b829e03303b10f8799e Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 19 Dec 2025 17:09:50 +0530 Subject: [PATCH 17/17] chore: bump version to 1.22.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebb6d99a7..4bfa82df5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.22.0-beta-0", + "version": "1.22.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.22.0-beta-0", + "version": "1.22.1", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 16613387d..36ca027eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.22.0-beta-0", + "version": "1.22.1", "description": "Supporting common component library", "type": "module", "main": "dist/index.js",