@hestia-earth/ui-components 0.41.40 → 0.41.41

package/fesm2022/hestia-earth-ui-components.mjs

@@ -6,7 +6,7 @@ import { FormsModule, NG_VALUE_ACCESSOR, UntypedFormBuilder, Validators, Reactiv
 import { NgClass, DecimalPipe, NgTemplateOutlet, KeyValuePipe, DOCUMENT, PlatformLocation, NgStyle, UpperCasePipe, JsonPipe, DatePipe, AsyncPipe, formatDate as formatDate$1 } from '@angular/common';
 import * as i1$1 from '@ng-bootstrap/ng-bootstrap';
 import { NgbTooltip, NgbDropdown, NgbDropdownMenu, NgbDropdownToggle, NgbActiveModal, NgbHighlight, NgbModal, NgbDropdownItem, NgbTypeahead, NgbPopover, NgbTooltipModule, NgbDropdownModule, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap';
-import { ReplaySubject, of, mergeMap, shareReplay, delay, map, catchError, distinctUntilChanged, timer, take, first, Subject, combineLatest, filter, tap, pipe, fromEvent, startWith, merge, skip, switchMap, EMPTY, throttleTime, animationFrameScheduler, debounceTime, lastValueFrom, skipUntil, zip, mergeAll, groupBy, toArray, forkJoin, from, reduce, firstValueFrom, distinct } from 'rxjs';
+import { ReplaySubject, of, mergeMap, shareReplay, delay, map, catchError, distinctUntilChanged, timer, take, first, Subject, combineLatest, filter, tap, pipe, fromEvent, startWith, merge, skip, switchMap, EMPTY, throttleTime, animationFrameScheduler, debounceTime, lastValueFrom, skipUntil, zip, mergeAll, reduce, forkJoin, from, firstValueFrom, toArray, distinct, groupBy } from 'rxjs';
 import { HttpClient } from '@angular/common/http';
 import get from 'lodash.get';
 import { SCHEMA_VERSION, SchemaType, NodeType, TermTermType, productTermTermType, nestedSearchableKeys, SiteSiteType, EmissionMethodTier, isExpandable, sortKeysByType, isTypeNode, BlankNodesKey, impactAssessmentTermTermType, measurementTermTermType, emissionTermTermType, inputTermTermType, CycleFunctionalUnit, NonBlankNodesKey, jsonldPath, isTypeValid, isTypeBlankNode, typeToSchemaType, infrastructureTermTermType, managementTermTermType } from '@hestia-earth/schema';
@@ -7012,6 +7012,15 @@ class RelatedNodeResult {
         this.results = [];
     }
 }
+const findIndicatorIndexFromLog = (indicators, log) => (indicators || []).findIndex(v => v.term['@id'] === log.blankNodeTermId && v.value === log.value);
+const keysFromLog = (impactAssessment, log) => {
+    const emission = findIndicatorIndexFromLog(impactAssessment.emissionsResourceUse, log);
+    const isEmission = emission >= 0;
+    const impact = isEmission ? -1 : findIndicatorIndexFromLog(impactAssessment.impacts, log);
+    const contributionKey = isEmission ? 'emissionsResourceUse' : 'impacts';
+    const contributionIndex = (isEmission ? emission : impact).toString();
+    return { contributionKey, contributionIndex };
+};
 class HeNodeService {
     constructor() {
         this.http = inject(HttpClient);
@@ -7066,41 +7075,20 @@ class HeNodeService {
             modelId: data.model,
             impactTermId: data['key/term'] || data.term || data.indicator,
             blankNodeTermId: data.node,
-            coefficient: +data.coefficient
-        })), filter(log => !!log.impactTermId && !!log.blankNodeTermId && !isNaN(log.coefficient)), groupBy(log => [log.impactTermId, log.blankNodeTermId, log.modelId].join('/')), mergeMap(group => group.pipe(toArray())), map((logs) => {
-            const log = logs[0];
-            const coefficient = sum(logs.map(l => l.coefficient));
-            return {
-                ...log,
-                coefficient
-            };
-        }), toArray(), map((logs) => {
-            const emissionsResourceUse = impactAssessment.emissionsResourceUse || [];
-            const impacts = impactAssessment.impacts || [];
-            const result = {
-                emissionsResourceUse: {},
-                impacts: {}
-            };
-            logs.forEach(log => {
-                emissionsResourceUse.forEach((entry, index) => {
-                    if (entry.term?.['@id'] === log.blankNodeTermId) {
-                        const key = index.toString();
-                        result.emissionsResourceUse[key] = result.emissionsResourceUse[key] || {};
-                        result.emissionsResourceUse[key][log.impactTermId] =
-                            result.emissionsResourceUse[key][log.impactTermId] || {};
-                        result.emissionsResourceUse[key][log.impactTermId][log.modelId] = toPrecision((entry.value || 0) * log.coefficient, 5);
-                    }
-                });
-                impacts.forEach((entry, index) => {
-                    if (entry.term?.['@id'] === log.blankNodeTermId) {
-                        const key = index.toString();
-                        result.impacts[key] = result.impacts[key] || {};
-                        result.impacts[key][log.impactTermId] = result.impacts[key][log.impactTermId] || {};
-                        result.impacts[key][log.impactTermId][log.modelId] = toPrecision((entry.value || 0) * log.coefficient, 5);
-                    }
-                });
-            });
-            return result;
+            coefficient: +data.coefficient,
+            value: +data.value
+        })), filter(log => !!log.impactTermId && !!log.blankNodeTermId && !isNaN(log.coefficient)), 
+        // match each `emissionsResourceUse`/`impacts` with the logs with the id and value
+        reduce((prev, log) => {
+            const { contributionKey, contributionIndex } = keysFromLog(impactAssessment, log);
+            prev[contributionKey][contributionIndex] = prev[contributionKey][contributionIndex] || {};
+            prev[contributionKey][contributionIndex][log.impactTermId] =
+                prev[contributionKey][contributionIndex][log.impactTermId] || {};
+            prev[contributionKey][contributionIndex][log.impactTermId][log.modelId] = toPrecision((log.value || 0) * log.coefficient, 5);
+            return prev;
+        }, {
+            emissionsResourceUse: {},
+            impacts: {}
         }));
     }
     getErrorLog$({ dataState, aggregated, ...node }) {
@@ -14198,9 +14186,7 @@ class ImpactAssessmentsIndicatorBreakdownChartComponent {
                 .getContributions$(impactAssessment)
                 .pipe(map(contributions => parseContributions(impactAssessment, contributions)))
         });
-        this.logs = computed(() => (this.logsResource.value() ?? [])
-            .filter(({ impactTermId, modelId }) => impactTermId === this.selectedTermId() && (!this.selectedMethodId() || modelId === this.selectedMethodId()))
-            .sort((a, b) => b.value - a.value), ...(ngDevMode ? [{ debugName: "logs" }] : []));
+        this.logs = computed(() => (this.logsResource.value() ?? []).filter(({ impactTermId, modelId }) => impactTermId === this.selectedTermId() && (!this.selectedMethodId() || modelId === this.selectedMethodId())), ...(ngDevMode ? [{ debugName: "logs" }] : []));
         this.nonZeroLogs = computed(() => groupLogsById(this.logs()).filter(log => log.value !== 0), ...(ngDevMode ? [{ debugName: "nonZeroLogs" }] : []));
         this.emissions = toSignal(this.searchService
             .search$({
@@ -14248,7 +14234,7 @@ class ImpactAssessmentsIndicatorBreakdownChartComponent {
         }, {}), ...(ngDevMode ? [{ debugName: "groupedValues" }] : []));
         this.chartData = computed(() => {
             const groupedValues = this.groupedValues();
-            return Object.keys(groupedValues).length === 1
+            return (Object.keys(groupedValues).length === 1
                 ? this.values().map(value => ({
                     label: value.name,
                     count: value.value,
@@ -14263,7 +14249,7 @@ class ImpactAssessmentsIndicatorBreakdownChartComponent {
                         count: value.value,
                         backgroundColor: value.color
                     }))
-                }));
+                }))).sort((a, b) => b.count - a.count);
         }, ...(ngDevMode ? [{ debugName: "chartData" }] : []));
         this.chartTooltipFn = ({ includedItems, index }) => {
             const { label, count: value } = this.chartData()[index] || { count: undefined };