Merge branch 'release-candidate-v0.27.0' into fix/security-card-threats

Author: vivek-devtron

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiff.tsx

@@ -47,9 +47,10 @@ export const DeploymentHistoryConfigDiff = ({
     const isPreviousDeploymentConfigAvailable = !!previousWfrId
 
     // URL FILTERS
-    const { compareWfrId } = useUrlFilters<string, DeploymentHistoryConfigDiffQueryParams>({
+    const urlFilters = useUrlFilters<string, DeploymentHistoryConfigDiffQueryParams>({
         parseSearchParams: parseDeploymentHistoryDiffSearchParams(previousWfrId),
     })
+    const { compareWfrId, sortBy, sortOrder } = urlFilters
 
     // STATES
     const [convertVariables, setConvertVariables] = useState(false)
@@ -125,12 +126,20 @@ export const DeploymentHistoryConfigDiff = ({
                 compareList,
                 getNavItemHref,
                 convertVariables,
+                sortingConfig: { sortBy, sortOrder },
             })
             return configData
         }
 
         return null
-    }, [isPreviousDeploymentConfigAvailable, compareDeploymentConfigLoader, compareDeploymentConfig, convertVariables])
+    }, [
+        isPreviousDeploymentConfigAvailable,
+        compareDeploymentConfigLoader,
+        compareDeploymentConfig,
+        convertVariables,
+        sortBy,
+        sortOrder,
+    ])
 
     const compareDeploymentConfigErr = useMemo(
         () =>
@@ -180,7 +189,7 @@ export const DeploymentHistoryConfigDiff = ({
                     errorConfig={errorConfig}
                     envName={envName}
                     wfrId={wfrId}
-                    previousWfrId={previousWfrId}
+                    urlFilters={urlFilters}
                     pipelineDeployments={pipelineDeployments}
                     setFullScreenView={setFullScreenView}
                     convertVariables={convertVariables}

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryConfigDiffCompare.tsx

@@ -6,8 +6,7 @@ import {
     DeploymentConfigDiff,
     DeploymentConfigDiffProps,
 } from '@Shared/Components/DeploymentConfigDiff'
-import { DEFAULT_BASE_PAGE_SIZE } from '@Common/Constants'
-import { useUrlFilters } from '@Common/Hooks'
+import { DEFAULT_BASE_PAGE_SIZE, SortingOrder } from '@Common/Constants'
 import {
     getSelectPickerOptionByValue,
     SelectPickerOptionType,
@@ -16,20 +15,16 @@ import {
 import { ComponentSizeType } from '@Shared/constants'
 import { Button, ButtonVariantType } from '@Shared/Components/Button'
 
-import {
-    DeploymentHistoryDiffDetailedProps,
-    DeploymentHistoryConfigDiffQueryParams,
-    DeploymentHistoryConfigDiffRouteParams,
-} from './types'
-import { getPipelineDeployments, getPipelineDeploymentsOptions, parseDeploymentHistoryDiffSearchParams } from './utils'
+import { DeploymentHistoryDiffDetailedProps, DeploymentHistoryConfigDiffRouteParams } from './types'
+import { getPipelineDeployments, getPipelineDeploymentsOptions } from './utils'
 import { getTriggerHistory } from '../service'
 
 export const DeploymentHistoryConfigDiffCompare = ({
     envName,
     setFullScreenView,
     pipelineDeployments: initialPipelineDeployments,
     wfrId,
-    previousWfrId,
+    urlFilters,
     convertVariables,
     setConvertVariables,
     triggerHistory: initialTriggerHistory,
@@ -43,13 +38,7 @@ export const DeploymentHistoryConfigDiffCompare = ({
     const { resourceType, resourceName, appId, envId } = params
 
     // URL FILTERS
-    const { compareWfrId, updateSearchParams, sortBy, sortOrder, handleSorting } = useUrlFilters<
-        string,
-        DeploymentHistoryConfigDiffQueryParams
-    >({
-        initialSortKey: DEPLOYMENT_CONFIG_DIFF_SORT_KEY,
-        parseSearchParams: parseDeploymentHistoryDiffSearchParams(previousWfrId),
-    })
+    const { compareWfrId, updateSearchParams, sortBy, sortOrder, handleSorting } = urlFilters
 
     // STATES
     const [triggerHistory, setTriggerHistory] = useState({
@@ -64,6 +53,8 @@ export const DeploymentHistoryConfigDiffCompare = ({
         updateSearchParams({ compareWfrId })
         // Set fullscreen for comparing deployment history config
         setFullScreenView(true)
+        // Set default initial sorting
+        handleSorting(DEPLOYMENT_CONFIG_DIFF_SORT_KEY)
 
         return () => {
             setConvertVariables(false)
@@ -175,7 +166,7 @@ export const DeploymentHistoryConfigDiffCompare = ({
         return null
     }
 
-    const onSorting = () => handleSorting(DEPLOYMENT_CONFIG_DIFF_SORT_KEY)
+    const onSorting = () => handleSorting(sortOrder !== SortingOrder.DESC ? DEPLOYMENT_CONFIG_DIFF_SORT_KEY : '')
 
     const sortingConfig: DeploymentConfigDiffProps['sortingConfig'] = {
         handleSorting: onSorting,

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx

@@ -17,7 +17,6 @@
 import { useParams } from 'react-router-dom'
 import { useMemo, useState } from 'react'
 import Tippy from '@tippyjs/react'
-import { yamlComparatorBySortOrder } from '@Shared/Helpers'
 import { DiffViewer } from '@Shared/Components/DiffViewer'
 import { renderDiffViewNoDifferenceState } from '@Shared/Components/DeploymentConfigDiff'
 import { MODES, Toggle, YAMLStringify } from '../../../../Common'
@@ -36,11 +35,9 @@ const DeploymentHistoryDiffView = ({
     isUnpublished,
     isDeleteDraft,
     rootClassName,
-    sortingConfig,
     codeEditorKey,
 }: DeploymentTemplateHistoryType) => {
     const { historyComponent, historyComponentName } = useParams<DeploymentHistoryParamsType>()
-    const { sortBy, sortOrder } = sortingConfig ?? { sortBy: '', sortOrder: null }
 
     const [convertVariables, setConvertVariables] = useState(false)
 
@@ -68,10 +65,8 @@ const DeploymentHistoryDiffView = ({
             ? baseTemplateConfiguration?.codeEditorValue?.resolvedValue
             : baseTemplateConfiguration?.codeEditorValue?.value
 
-        return YAMLStringify(JSON.parse(editorValue), {
-            sortMapEntries: sortBy ? (a, b) => yamlComparatorBySortOrder(a, b, sortOrder) : null,
-        })
-    }, [convertVariables, baseTemplateConfiguration, sortOrder, isDeleteDraft])
+        return YAMLStringify(JSON.parse(editorValue))
+    }, [convertVariables, baseTemplateConfiguration, isDeleteDraft])
 
     const editorValuesLHS = useMemo(() => {
         if (!currentConfiguration?.codeEditorValue?.value || isUnpublished) {
@@ -82,10 +77,8 @@ const DeploymentHistoryDiffView = ({
             ? currentConfiguration?.codeEditorValue?.resolvedValue
             : currentConfiguration?.codeEditorValue?.value
 
-        return YAMLStringify(JSON.parse(editorValue), {
-            sortMapEntries: sortBy ? (a, b) => yamlComparatorBySortOrder(a, b, sortOrder) : null,
-        })
-    }, [convertVariables, currentConfiguration, sortOrder, isUnpublished])
+        return YAMLStringify(JSON.parse(editorValue))
+    }, [convertVariables, currentConfiguration, isUnpublished])
 
     const renderDeploymentDiffViaCodeEditor = () =>
         previousConfigAvailable ? (

src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/types.ts

@@ -3,8 +3,13 @@ import { Dispatch, SetStateAction } from 'react'
 import { DeploymentConfigDiffProps } from '@Shared/Components/DeploymentConfigDiff'
 import { EnvResourceType } from '@Shared/Services'
 
+import { UseUrlFiltersReturnType } from '@Common/Hooks'
 import { History, HistoryLogsProps } from '../types'
 
+export interface DeploymentHistoryConfigDiffQueryParams {
+    compareWfrId: number
+}
+
 export interface DeploymentHistoryConfigDiffProps
     extends Required<Pick<HistoryLogsProps, 'renderRunSource' | 'resourceId'>> {
     appName: string
@@ -26,16 +31,12 @@ export type DeploymentHistoryDiffDetailedProps = Pick<
         >
     > & {
         pipelineDeployments: History[]
-        previousWfrId: number
         convertVariables: boolean
         setConvertVariables: Dispatch<SetStateAction<boolean>>
         isCompareDeploymentConfigNotAvailable?: boolean
+        urlFilters: UseUrlFiltersReturnType<string, DeploymentHistoryConfigDiffQueryParams>
     }
 
-export interface DeploymentHistoryConfigDiffQueryParams {
-    compareWfrId: number
-}
-
 export interface DeploymentHistoryConfigDiffRouteParams {
     appId: string
     envId: string

src/Shared/Components/CICDHistory/types.tsx

@@ -27,7 +27,6 @@ import {
     ResponseType,
     PaginationProps,
     useScrollable,
-    SortingOrder,
 } from '../../../Common'
 import { DeploymentStageType } from '../../constants'
 import { AggregationKeys, GitTriggers, Node, NodeType, ResourceKindType, ResourceVersionType } from '../../types'
@@ -489,10 +488,6 @@ export interface DeploymentTemplateHistoryType {
     isDeleteDraft?: boolean
     rootClassName?: string
     codeEditorKey?: React.Key
-    sortingConfig?: {
-        sortBy: string
-        sortOrder: SortingOrder
-    }
 }
 export interface DeploymentHistoryDetailRes extends ResponseType {
     result?: DeploymentHistoryDetail

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.types.ts

@@ -156,12 +156,14 @@ export type AppEnvDeploymentConfigListParams<IsManifestView> = (IsManifestView e
           compareList: ManifestTemplateDTO
           compareToTemplateOptions?: never
           compareWithTemplateOptions?: never
+          sortingConfig?: never
       }
     : {
           currentList: AppEnvDeploymentConfigDTO
           compareList: AppEnvDeploymentConfigDTO
           compareToTemplateOptions?: TemplateListDTO[]
           compareWithTemplateOptions?: TemplateListDTO[]
+          sortingConfig?: Pick<DeploymentConfigDiffProps['sortingConfig'], 'sortBy' | 'sortOrder'>
       }) & {
     getNavItemHref: (resourceType: EnvResourceType, resourceName: string) => string
     isManifestView?: IsManifestView