@@ -90,7 +90,6 @@ import { abortEarlierRequests, getInitialState } from './cdMaterials.utils'
90
90
import { getLastExecutionByArtifactAppEnv } from '../../../../services/service'
91
91
import AnnouncementBanner from '../../../common/AnnouncementBanner'
92
92
import { useRouteMatch } from 'react-router-dom'
93
- import { get } from 'http'
94
93
95
94
const ApprovalInfoTippy = importComponentFromFELibrary ( 'ApprovalInfoTippy' )
96
95
const ExpireApproval = importComponentFromFELibrary ( 'ExpireApproval' )
@@ -132,7 +131,6 @@ export default function CDMaterial({
132
131
const { searchParams } = useSearchString ( )
133
132
// Add dep here
134
133
const { isSuperAdmin } = useSuperAdmin ( )
135
- const match = useRouteMatch ( )
136
134
137
135
const searchImageTag = searchParams . search
138
136
@@ -271,18 +269,6 @@ export default function CDMaterial({
271
269
} )
272
270
}
273
271
274
- const setInitialModeParams = ( modeParamValue : string ) => {
275
- const newParams = {
276
- ...searchParams ,
277
- mode : modeParamValue ,
278
- config : DEPLOYMENT_CONFIGURATION_NAV_MAP . DEPLOYMENT_TEMPLATE . key ,
279
- deploy : searchParams . deploy ? searchParams . deploy : DeploymentWithConfigType . LAST_SAVED_CONFIG
280
- }
281
- history . push ( {
282
- search : new URLSearchParams ( newParams ) . toString ( ) ,
283
- } )
284
- }
285
-
286
272
/* ------------ UseEffects ------------*/
287
273
useEffect ( ( ) => {
288
274
if ( ! loadingMaterials && materialsResult ) {
@@ -768,9 +754,22 @@ const getInitialSelectedConfigToDeploy = () => {
768
754
isConfigPresent ( ) ) ) ||
769
755
! state . recentDeploymentConfig
770
756
771
- const reviewConfig = ( modeParamValue : string ) => {
757
+ const onClickSetInitialParams = ( modeParamValue : string ) => {
772
758
if ( canReviewConfig ( ) ) {
773
- setInitialModeParams ( modeParamValue )
759
+ const newParams = {
760
+ ...searchParams ,
761
+ mode : modeParamValue ,
762
+ config : DEPLOYMENT_CONFIGURATION_NAV_MAP . DEPLOYMENT_TEMPLATE . key ,
763
+ deploy : searchParams . deploy
764
+ ? searchParams . deploy
765
+ : materialType === MATERIAL_TYPE . rollbackMaterialList
766
+ ? DeploymentWithConfigType . SPECIFIC_TRIGGER_CONFIG
767
+ : DeploymentWithConfigType . LAST_SAVED_CONFIG ,
768
+ }
769
+
770
+ history . push ( {
771
+ search : new URLSearchParams ( newParams ) . toString ( ) ,
772
+ } )
774
773
}
775
774
}
776
775
@@ -1955,7 +1954,7 @@ const getInitialSelectedConfigToDeploy = () => {
1955
1954
} ${ isLastDeployedOption ? 'pt-10 pb-10' : 'pt-7 pb-7' } `}
1956
1955
disabled = { state . checkingDiff }
1957
1956
type = "button"
1958
- onClick = { ( ) => reviewConfig ( 'review-config' ) }
1957
+ onClick = { ( ) => onClickSetInitialParams ( 'review-config' ) }
1959
1958
>
1960
1959
{ ! isLastDeployedOption && ( state . recentDeploymentConfig !== null || state . checkingDiff ) && (
1961
1960
< div
@@ -2148,7 +2147,7 @@ const getInitialSelectedConfigToDeploy = () => {
2148
2147
< div className = "trigger-modal__header" >
2149
2148
{ showConfigDiffView ? (
2150
2149
< div className = "flex left" >
2151
- < button type = "button" className = "dc__transparent icon-dim-24" onClick = { ( ) => reviewConfig ( 'list' ) } >
2150
+ < button type = "button" className = "dc__transparent icon-dim-24" onClick = { ( ) => onClickSetInitialParams ( 'list' ) } >
2152
2151
< BackIcon />
2153
2152
</ button >
2154
2153
< div className = "flex column left ml-16" >
0 commit comments