@@ -618,14 +618,29 @@ class ApiGateway {
618618 compilerApi . preAggregationsSchema
619619 ) ;
620620
621- const mergePartitionsAndVersionEntries = ( ) => ( { preAggregation, partitions, ...props } ) => ( {
622- ...props ,
621+ const checkExpand = ( path : string | RegExp ) => ! query . expand ||
622+ ( path instanceof RegExp
623+ ? query . expand . some ( ( p : string ) => path . test ( p ) )
624+ : query . expand . includes ( path ) ) ;
625+
626+ const mergePartitionsAndVersionEntries = ( ) => ( { errors, preAggregation, partitions, invalidateKeyQueries, timezones } ) => ( {
627+ errors,
628+ invalidateKeyQueries,
623629 preAggregation,
624- partitions : partitions . map ( partition => {
625- partition . versionEntries = versionEntriesResult ?. versionEntriesByTableName [ partition ?. tableName ] || [ ] ;
626- partition . structureVersion = versionEntriesResult ?. structureVersionsByTableName [ partition ?. tableName ] ;
627- return partition ;
628- } ) ,
630+ timezones,
631+ partitions : partitions . map ( partition => ( {
632+ ...( checkExpand ( 'partitions.details' ) ? partition : { } ) ,
633+ ...( checkExpand ( 'partitions.meta' ) ? {
634+ dataSource : partition . dataSource ,
635+ preAggregationId : partition . preAggregationId ,
636+ tableName : partition . tableName ,
637+ type : partition . type ,
638+ } : { } ) ,
639+ ...( checkExpand ( 'partitions.versions' ) ? {
640+ versionEntries : versionEntriesResult ?. versionEntriesByTableName [ partition ?. tableName ] || [ ] ,
641+ structureVersion : versionEntriesResult ?. structureVersionsByTableName [ partition ?. tableName ] || [ ] ,
642+ } : { } ) ,
643+ } ) ) ,
629644 } ) ;
630645
631646 res ( {
0 commit comments