@hestia-earth/ui-components 0.32.13 → 0.32.14

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

@@ -5812,7 +5812,10 @@ const nodeDataState = (node) =>
 node.aggregated && node?.['@type'] === NodeType.ImpactAssessment
     ? DataState.recalculated
     : DataState.original;
-const urlParams = (dataState, dataVersion) => [dataState !== DataState.original ? `dataState=${dataState}` : '', dataVersion ? `dataVersion=${dataVersion}` : '']
+const urlParams = (dataState, dataVersion) => [
+    !!dataState && dataState !== DataState.original ? `dataState=${dataState}` : '',
+    dataVersion ? `dataVersion=${dataVersion}` : ''
+]
     .filter(Boolean)
     .join('&');
 const nodeLink = (node, dataState, dataVersion) => [[node?.['@type']?.toLowerCase(), node?.['@id']].filter(Boolean).join('/'), urlParams(dataState, dataVersion)]
@@ -6056,7 +6059,7 @@ const groupLogsByModel = (data = '') => data
     .map(parseMessage)
     .filter(v => [hasValue(v?.model), hasValue(v?.term) || hasValue(v?.key)].every(Boolean))
     .reduce((group, log) => {
-    const subValue = subValueKeys.find(v => !!log[v]);
+    const subValue = subValueKeys.find(v => !!log[v] && log[v] != 'None');
     return subValue && !log.cycle ? groupLogSubValue(group, log, subValue) : groupLog(group, log);
 }, {});
 const asArray = (values) => (Array.isArray(values) ? values : []);
@@ -7700,6 +7703,9 @@ class NodeAggregatedQualityScoreComponent {
         this.searchService = inject(HeSearchService);
         this.nodeService = inject(HeNodeService);
         this.node = input.required();
+        /**
+         * Load and show info tooltip.
+         */
         this.showInfo = input(false);
         this.mode = input('tag');
         this.placement = input('bottom');
@@ -7707,13 +7713,14 @@ class NodeAggregatedQualityScoreComponent {
         this.countryName = computed(() => getCountryName(this.node()));
         this.countryResource = rxResource({
             request: () => ({
+                showInfo: this.showInfo(),
                 nodeCountry: this.nodeCountry(),
                 countryName: this.countryName(),
                 node: this.node()
             }),
-            loader: ({ request: { nodeCountry, countryName, node } }) => nodeCountry
+            loader: ({ request: { showInfo, nodeCountry, countryName, node } }) => nodeCountry
                 ? of(nodeCountry)
-                : countryName
+                : showInfo && countryName
                     ? this.searchService
                         .search$({
                         limit: 1,
@@ -7734,20 +7741,28 @@ class NodeAggregatedQualityScoreComponent {
         this.countryId = computed(() => this.countryResource.value()?.['@id']);
         this.aggregationId = computed(() => [!!this.node(), !!this.countryId()].every(Boolean) ? nodeToAggregationFilename(this.node(), this.countryId()) : null);
         this.logsResource = rxResource({
-            request: () => ({ node: this.node(), aggregationId: this.aggregationId() }),
-            loader: ({ request: { node, aggregationId } }) => this.nodeService
-                .getLog$({
-                '@type': node['@type'],
-                '@id': aggregationId,
-                aggregated: true
-            })
-                .pipe(map(value => (value ? parseLines(value) : [])), mergeAll(), filter(({ data: { message } }) => !!message), map(({ data: { message } }) => parseMessage$1(message)), filter(({ id }) => id === this.node()['@id']), reduce((a, b) => ({ ...a, ...b }), {}))
+            request: () => ({
+                showInfo: this.showInfo(),
+                node: this.node(),
+                aggregationId: this.aggregationId()
+            }),
+            loader: ({ request: { showInfo, node, aggregationId } }) => showInfo && aggregationId
+                ? this.nodeService
+                    .getLog$({
+                    '@type': node['@type'],
+                    '@id': aggregationId,
+                    aggregated: true
+                })
+                    .pipe(map(value => (value ? parseLines(value) : [])), mergeAll(), filter(({ data: { message } }) => !!message), map(({ data: { message } }) => parseMessage$1(message)), filter(({ id }) => id === this.node()['@id']), reduce((a, b) => ({ ...a, ...b }), {}))
+                : of({})
         });
         this.logs = computed(() => this.logsResource.value() ?? {});
         this.validScores = computed(() => Object.fromEntries(Object.entries(isScoreValid).map(([key, value]) => [key, value(this.logs())])));
         this.missingEmissionIds = computed(() => this.logs().missing_emissions?.split(';') ?? []);
         this.missingEmissionsResource = rxResource({
-            request: () => ({ missingEmissionIds: this.missingEmissionIds() }),
+            request: () => ({
+                missingEmissionIds: this.missingEmissionIds()
+            }),
             loader: ({ request: { missingEmissionIds } }) => missingEmissionIds?.length
                 ? this.searchService
                     .search$({
@@ -9229,10 +9244,15 @@ const propertyId = () => v4();
 const isGeojson = (schema) => schema.geojson;
 const propertyUrl = (node, key) => ['@id', 'id', 'name'].includes(key) && nodeLinkTypeEnabled(node['@type'] || node.type)
     ? node['@id'] ||
-        // handle links on Community Edition
+        // handle old links on Community Edition
         (isExternal() && node.id)
         ? {
-            url: `/${(node['@type'] || node.type).toLowerCase()}/${node['@id'] || node.id}`,
+            url: [
+                node['@type'] === SchemaType.Term ? baseUrl(false) : null,
+                nodeLink({ '@type': node['@type'] || node.type, '@id': node['@id'] || node.id })
+            ]
+                .filter(Boolean)
+                .join('/'),
             title: 'Open'
         }
         : node['@type'] === SchemaType.Term