Skip to content

feat: saas#3019

Merged
AbhishekA1509 merged 9 commits intomainfrom
feat/saas
Dec 22, 2025
Merged

feat: saas#3019
AbhishekA1509 merged 9 commits intomainfrom
feat/saas

Conversation

@AbhishekA1509
Copy link
Member

@AbhishekA1509 AbhishekA1509 commented Dec 16, 2025

Description

This pull request updates the license activation flow to support automatic license activation via a query parameter and improves the handling of license activation states in the UI. The most important changes are:

License Activation Flow Improvements:

  • Added logic in ActivateLicense.tsx to automatically activate a license if a license key is present in the URL query parameters, using the new handleActivateLicense function. This function handles the activation process, redirects to login on success, and displays errors if activation fails. [1] [2]
  • Introduced the isActivatingLicense state to show a loading indicator during license activation, preventing UI flicker or user confusion.

Dependency Updates:

  • Updated the dependency @devtron-labs/devtron-fe-common-lib to version 1.22.0-beta-0 in package.json to use new hooks and utilities required for the improved activation flow.

Component and Data Handling Enhancements:

  • Passed the new isSaasInstance flag from license data to the ActivateLicenseDialog component for more accurate rendering based on instance type.
  • Imported and utilized new hooks and utilities (useSearchString, LICENSE_KEY_QUERY_PARAM, showError, activateLicense) from the updated common library to support the new activation logic. [1] [2]

Fixes https://github.com/devtron-labs/sprint-tasks/issues/2730

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A
  • Test B

Checklist:

  • The title of the PR states what changed and the related issues number (used for the release note).
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas

Copilot AI review requested due to automatic review settings December 16, 2025 10:15
@github-actions
Copy link

Some linked issues are invalid. Please update the issue links:\nIssue # in is not found or invalid (HTTP }404).\n

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR introduces SaaS-related functionality by adding automatic license activation via query parameter and updates the common library dependency to a beta version to support the new isSaasInstance property.

  • Adds automatic license activation from URL query parameter in the ActivateLicense component
  • Updates @devtron-labs/devtron-fe-common-lib from 1.21.1 to 1.21.1-beta-0 to support new SaaS features
  • Adds isSaasInstance prop (temporarily hardcoded to false) to DevtronLicenseCard component

Reviewed changes

Copilot reviewed 2 out of 3 changed files in this pull request and generated 5 comments.

File Description
package.json Updates devtron-fe-common-lib dependency to beta version 1.21.1-beta-0
yarn.lock Updates lock file with new checksums for beta version dependency
src/Pages/License/ActivateLicense.tsx Adds license activation from query parameter, imports new utilities, and includes isSaasInstance prop with FIXME comment

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

… isSaasInstance handling in ActivateLicense component
@github-actions
Copy link

Some linked issues are invalid. Please update the issue links:\nIssue # in is not found or invalid (HTTP }404).\n

@github-actions
Copy link

Some linked issues are invalid. Please update the issue links:\nIssue # in is not found or invalid (HTTP }404).\n

vivek-devtron
vivek-devtron previously approved these changes Dec 17, 2025
@github-actions
Copy link

Some linked issues are invalid. Please update the issue links:\nIssue # in is not found or invalid (HTTP }404).\n

@github-actions
Copy link

Some linked issues are invalid. Please update the issue links:\nIssue # in is not found or invalid (HTTP }404).\n

@github-actions
Copy link

Some linked issues are invalid. Please update the issue links:\nIssue # in is not found or invalid (HTTP }404).\n

@AbhishekA1509 AbhishekA1509 self-assigned this Dec 19, 2025
@github-actions github-actions bot added PR:Ready-to-Review PR:Ready-to-Review and removed PR:Issue-verification-failed PR:Issue-verification-failed labels Dec 19, 2025
@sonarqubecloud
Copy link

@AbhishekA1509 AbhishekA1509 merged commit a1efb7a into main Dec 22, 2025
10 checks passed
@AbhishekA1509 AbhishekA1509 deleted the feat/saas branch December 22, 2025 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

PR:Ready-to-Review PR:Ready-to-Review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants