Skip to content

feat: resource conflict main#3017

Merged
AbhishekA1509 merged 4 commits intomainfrom
feat/resource-conflict-main
Dec 12, 2025
Merged

feat: resource conflict main#3017
AbhishekA1509 merged 4 commits intomainfrom
feat/resource-conflict-main

Conversation

@AbhishekA1509
Copy link
Member

@AbhishekA1509 AbhishekA1509 commented Dec 12, 2025

Description

This pull request primarily updates logic related to deployment stage selection and navigation for CD (Continuous Deployment) workflows, with supporting dependency and UI tweaks. The most significant changes ensure that the CD workflow pages and navigation correctly handle a new deployment node type, improving filtering and routing for different deployment stages.

Deployment Stage and Navigation Logic Updates:

  • Enhanced logic in EnvCDDetails.tsx and CDDetails.tsx to handle the new DeploymentNodeType.CD when parsing query parameters, ensuring correct selection and filtering of deployment stages. [1] [2]
  • Updated the TriggerCDNode component to generate URLs that include the type=CD query parameter when navigating to CD details, and to use the new deployment node type in its logic.

Dependency Updates:

  • Bumped @devtron-labs/devtron-fe-common-lib from version 1.21.0 to 1.21.1 in package.json to ensure compatibility with new deployment node types and constants.

UI/Styling Improvements:

  • Added an extra CSS class (scn-0) to the deploy button icon in EnvTriggerView for more consistent styling.

Imports and Code Cleanliness:

  • Added imports for DeploymentNodeType and related constants in affected files to support the new logic. [1] [2] [3]

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

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

@AbhishekA1509 AbhishekA1509 self-assigned this Dec 12, 2025
Copilot AI review requested due to automatic review settings December 12, 2025 11:28
@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 github-actions bot added the PR:Issue-verification-failed PR:Issue-verification-failed label Dec 12, 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 12, 2025
vivek-devtron
vivek-devtron previously approved these changes Dec 12, 2025
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 pull request adds support for a new deployment node type (DeploymentNodeType.CD) in the CD workflow navigation and history selection logic. The changes ensure proper URL generation and query parameter handling when users navigate to CD deployment details from different parts of the application.

Key changes:

  • Enhanced query parameter parsing in CD details pages to handle the new DeploymentNodeType.CD type
  • Updated URL generation in TriggerCDNode to include type=CD query parameter for non-progressing deployments
  • Bumped @devtron-labs/devtron-fe-common-lib dependency from 1.21.0 to 1.21.1 for compatibility

Reviewed changes

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

Show a summary per file
File Description
package.json Updated devtron-fe-common-lib dependency to version 1.21.1
yarn.lock Updated lockfile checksums for devtron-fe-common-lib 1.21.1
triggerCDNode.tsx Added DEPLOYMENT_STATUS import and updated URL generation to include type=CD query parameter for CD details navigation
CDDetails.tsx Enhanced query parameter parsing to handle DeploymentNodeType.CD and map it to DeploymentStageType.DEPLOY
EnvCDDetails.tsx Enhanced query parameter parsing to handle DeploymentNodeType.CD and map it to DeploymentStageType.DEPLOY, removed extraneous blank line
EnvTriggerView.tsx Added scn-0 CSS class to deploy button icon for consistent styling

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

…onents for improved clarity and maintainability
@sonarqubecloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
B Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

@AbhishekA1509 AbhishekA1509 merged commit 4901765 into main Dec 12, 2025
9 of 10 checks passed
@AbhishekA1509 AbhishekA1509 deleted the feat/resource-conflict-main branch December 12, 2025 11:47
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