Merge branch 'main' into update-explain-feature

Signed-off-by: Joseph Cook <33655003+jmcook1186@users.noreply.github.com>
Green-Software-Foundation · Oct 31, 2024 · c2bb2ac · c2bb2ac
2 parents 50fe84e + f4259da
commit c2bb2ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/if-run/lib/initialize.ts b/src/if-run/lib/initialize.ts
@@ -3,6 +3,8 @@ import * as path from 'node:path';
 import {ERRORS} from '@grnsft/if-core/utils';
 import {PluginInterface} from '@grnsft/if-core/types';
 
+import {storeAggregationMetrics} from './aggregate';
+
 import {logger} from '../../common/util/logger';
 import {memoizedLog} from '../util/log-memoize';
 import {pluginStorage} from '../util/plugin-storage';
@@ -11,7 +13,6 @@ import {CONFIG, STRINGS} from '../config';
 
 import {Context, PluginOptions} from '../../common/types/manifest';
 import {PluginStorageInterface} from '../types/plugin-storage';
-import {storeAggregationMetrics} from './aggregate';
 
 const {
   PluginInitializationError,

diff --git a/src/if-run/util/aggregation-helper.ts b/src/if-run/util/aggregation-helper.ts
@@ -39,12 +39,12 @@ export const aggregateOutputsIntoOne = (
         const aggregationType = isTemporal ? 'component' : 'time';
 
         if (aggregationParams[aggregationType] === 'none') {
-          return acc;
+          continue;
         }
 
         if (aggregationParams[aggregationType] === 'copy') {
           acc[metric] = output[metric];
-          return acc;
+          continue;
         }
 
         acc[metric] = acc[metric] ?? 0;