@@ -575,32 +575,27 @@ export const attachLiveConnectors = async (
575575 }
576576
577577 ConnectorRegistry . hasMany ( ConnectorInstances , { foreignKey : 'connector_id' } ) ;
578- const connectorRegistry : any = await ConnectorRegistry . findAll ( {
579- include : [
580- {
581- model : ConnectorInstances ,
582- attributes : [ 'dataset_id' , 'connector_id' ] ,
583- required : true
584- } ,
585- ] ,
578+ const connectorRegistry = await ConnectorRegistry . findAll ( {
579+ include : [ {
580+ model : ConnectorInstances ,
581+ attributes : [ 'dataset_id' , 'connector_id' ] ,
582+ required : true
583+ } ] ,
586584 raw : true ,
587585 attributes : [ 'id' , 'name' , 'category' , 'type' ]
588586 } ) ;
589587
588+ const filterArray = connectorFilter === 'all' ? null : _ . castArray ( connectorFilter ) ;
589+
590590 return liveDatasetList . map ( ( dataset : Record < string , any > ) => {
591591 const datasetId = dataset . dataset_id ;
592- let matchedConnectors = connectorRegistry . filter ( ( connector : any ) =>
593- connector [ 'connector_instances.dataset_id' ] === datasetId
594- ) ;
595592
596- if ( connectorFilter !== 'all' ) {
597- const filterArray = _ . castArray ( connectorFilter ) ; // Normalize to array
598- matchedConnectors = matchedConnectors . filter ( ( connector : any ) =>
599- filterArray . includes ( String ( connector . id ) )
600- ) ;
601- }
593+ const filteredConnectors = connectorRegistry . filter ( ( connector : any ) =>
594+ connector [ 'connector_instances.dataset_id' ] === datasetId &&
595+ ( ! filterArray || filterArray . includes ( String ( connector . id ) ) )
596+ ) ;
602597
603- const enrichedConnectors = matchedConnectors . map ( ( connector : any ) => ( {
598+ const enrichedConnectors = filteredConnectors . map ( ( connector : any ) => ( {
604599 connector_id : connector . id ,
605600 name : connector . name ,
606601 category : connector . category ,
0 commit comments