@@ -70,14 +70,14 @@ export default function ExternalArgoList({
70
70
init ( )
71
71
}
72
72
}
73
- } , [ payloadParsedFromUrl ] )
73
+ } , [ payloadParsedFromUrl , dataStateType , clusterIdsCsv ] )
74
74
75
- // Mount on data rendering first time
75
+ // when external app data comes
76
76
useEffect ( ( ) => {
77
77
if ( dataStateType == AppListViewType . LIST ) {
78
78
handleFilteration ( )
79
79
}
80
- } , [ dataStateType ] )
80
+ } , [ argoAppsList ] )
81
81
82
82
useEffect ( ( ) => {
83
83
updateDataSyncing ( true )
@@ -86,7 +86,6 @@ export default function ExternalArgoList({
86
86
. then ( ( argoAppsListResponse ) => {
87
87
setArgoAppsList ( argoAppsListResponse . result )
88
88
setDataStateType ( AppListViewType . LIST )
89
- _getExternalHelmApps ( )
90
89
} )
91
90
. catch ( ( errors : ServerErrors ) => {
92
91
showError ( errors )
@@ -97,7 +96,7 @@ export default function ExternalArgoList({
97
96
updateDataSyncing ( false )
98
97
setFetchingExternalAppsState ( false )
99
98
} )
100
- } , [ clusterIdsCsv , appStatus , syncListData ] )
99
+ } , [ clusterIdsCsv ] )
101
100
102
101
// reset data
103
102
function init ( ) {
@@ -109,12 +108,6 @@ export default function ExternalArgoList({
109
108
setFetchingExternalAppsState ( false )
110
109
}
111
110
112
- function _getExternalHelmApps ( ) {
113
- if ( clusterIdsCsv ) {
114
- setFetchingExternalAppsState ( true )
115
- }
116
- }
117
-
118
111
function _getClusterIdsFromRequestUrl ( ) {
119
112
return [ ...buildClusterVsNamespace ( payloadParsedFromUrl . namespaces . join ( ',' ) ) . keys ( ) ] . join ( ',' )
120
113
}
@@ -225,7 +218,7 @@ export default function ExternalArgoList({
225
218
226
219
const renderArgoListRow = ( app : ArgoAppListResult ) : JSX . Element => {
227
220
return (
228
- < Link key = { app . appName } to = { _buildAppDetailUrl ( app ) } className = "app-list__row" data-testid = "app-list-row" >
221
+ < Link to = { _buildAppDetailUrl ( app ) } className = "app-list__row" data-testid = "app-list-row" >
229
222
< div className = "app-list__cell--icon" >
230
223
< LazyImage
231
224
className = "dc__chart-grid-item__icon icon-dim-24"
@@ -267,9 +260,12 @@ export default function ExternalArgoList({
267
260
return (
268
261
< div data-testid = "external-argo-list-container" >
269
262
{ renderHeaders ( ) }
263
+ { filteredArgoAppsList . length }
270
264
{ filteredArgoAppsList
271
265
. slice ( payloadParsedFromUrl . hOffset , payloadParsedFromUrl . hOffset + payloadParsedFromUrl . size )
272
- . map ( ( app ) => renderArgoListRow ( app ) ) }
266
+ . map ( ( app , index ) => (
267
+ < div key = { `${ app . appName } -${ index } ` } > { renderArgoListRow ( app ) } </ div >
268
+ ) ) }
273
269
</ div >
274
270
)
275
271
}
@@ -392,7 +388,6 @@ export default function ExternalArgoList({
392
388
)
393
389
)
394
390
}
395
-
396
391
return (
397
392
< >
398
393
{ dataStateType === AppListViewType . LOADING && (
0 commit comments