feat: resource conflict#976

Merged

AbhishekA1509 merged 15 commits into

mainfrom

feat/resource-conflict-main

Dec 12, 2025

Commits on Dec 8, 2025

feat: add ResourceConflictDeployDialog for handling resource ownership conflicts during redeployments
AbhishekA1509
committed
feat: implement ResourceConflictDetailsModal and ConflictedResourcesTable for managing resource conflicts
AbhishekA1509
committed
feat: enhance resource conflict handling with redeploy functionality and UI improvements
AbhishekA1509
committed
feat: add resource conflict management components and enhance related functionality
AbhishekA1509
committed
feat: enhance ConflictedResourcesTable styling and improve resource conflict details fetching
AbhishekA1509
committed
fix: update alignment of content in ResourceConflictDetailsModal
AbhishekA1509
committed
fix: disable deploy button when no resource conflict details are available
AbhishekA1509
committed
fix: rename wfrId to wfrIdForDeploymentWithSpecificTrigger in redeploy payload
AbhishekA1509
committed
fix: remove toast notifications from redeploy functions and update artifactId handling
AbhishekA1509
committed

Commits on Dec 10, 2025

fix: update resource conflict routes and payload structure for redeployment
AbhishekA1509
committed

Commits on Dec 11, 2025

fix: update version to 1.21.0-beta-4 in package.json and package-lock.json
AbhishekA1509
committed