@@ -70,14 +70,14 @@ export default function ExternalArgoList({
7070 init ( )
7171 }
7272 }
73- } , [ payloadParsedFromUrl ] )
73+ } , [ payloadParsedFromUrl , dataStateType , clusterIdsCsv ] )
7474
75- // Mount on data rendering first time
75+ // when external app data comes
7676 useEffect ( ( ) => {
7777 if ( dataStateType == AppListViewType . LIST ) {
7878 handleFilteration ( )
7979 }
80- } , [ dataStateType ] )
80+ } , [ argoAppsList ] )
8181
8282 useEffect ( ( ) => {
8383 updateDataSyncing ( true )
@@ -86,7 +86,6 @@ export default function ExternalArgoList({
8686 . then ( ( argoAppsListResponse ) => {
8787 setArgoAppsList ( argoAppsListResponse . result )
8888 setDataStateType ( AppListViewType . LIST )
89- _getExternalHelmApps ( )
9089 } )
9190 . catch ( ( errors : ServerErrors ) => {
9291 showError ( errors )
@@ -97,7 +96,7 @@ export default function ExternalArgoList({
9796 updateDataSyncing ( false )
9897 setFetchingExternalAppsState ( false )
9998 } )
100- } , [ clusterIdsCsv , appStatus , syncListData ] )
99+ } , [ clusterIdsCsv ] )
101100
102101 // reset data
103102 function init ( ) {
@@ -109,12 +108,6 @@ export default function ExternalArgoList({
109108 setFetchingExternalAppsState ( false )
110109 }
111110
112- function _getExternalHelmApps ( ) {
113- if ( clusterIdsCsv ) {
114- setFetchingExternalAppsState ( true )
115- }
116- }
117-
118111 function _getClusterIdsFromRequestUrl ( ) {
119112 return [ ...buildClusterVsNamespace ( payloadParsedFromUrl . namespaces . join ( ',' ) ) . keys ( ) ] . join ( ',' )
120113 }
@@ -225,7 +218,7 @@ export default function ExternalArgoList({
225218
226219 const renderArgoListRow = ( app : ArgoAppListResult ) : JSX . Element => {
227220 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" >
229222 < div className = "app-list__cell--icon" >
230223 < LazyImage
231224 className = "dc__chart-grid-item__icon icon-dim-24"
@@ -267,9 +260,12 @@ export default function ExternalArgoList({
267260 return (
268261 < div data-testid = "external-argo-list-container" >
269262 { renderHeaders ( ) }
263+ { filteredArgoAppsList . length }
270264 { filteredArgoAppsList
271265 . 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+ ) ) }
273269 </ div >
274270 )
275271 }
@@ -392,7 +388,6 @@ export default function ExternalArgoList({
392388 )
393389 )
394390 }
395-
396391 return (
397392 < >
398393 { dataStateType === AppListViewType . LOADING && (
0 commit comments