Merge branch 'main' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/animate-segmented-bar

arunjaindev · arunjaindev · commit 2f8d4e7d87e7 · 2025-01-31T17:58:40.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiffCompare.tsx b/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiffCompare.tsx
@@ -70,7 +70,9 @@ export const DeploymentHistoryConfigDiffCompare = ({
         // Set fullscreen for comparing deployment history config
         setFullScreenView(true)
         // Set default initial sorting
-        handleSorting(DEPLOYMENT_CONFIG_DIFF_SORT_KEY)
+        if (sortBy !== DEPLOYMENT_CONFIG_DIFF_SORT_KEY) {
+            handleSorting(DEPLOYMENT_CONFIG_DIFF_SORT_KEY)
+        }
 
         return () => {
             setConvertVariables(false)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@devtron-labs/devtron-fe-common-lib",`
`3`		`- "version": "1.6.1",`
	`3`	`+ "version": "1.6.2",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`