@hestia-earth/ui-components 0.41.8 → 0.41.9

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

@@ -506,6 +506,15 @@ const ignoreTermTypes = [
     TermTermType.characterisedIndicator
 ];
 const isTermTypeAllowed = (termType) => !termType || !ignoreTermTypes.includes(termType);
+const transformFormula = (text) => text
+    .replace(/([A-Z]+[\d]+)([\d]{1}[-+])/g, '$1<sup>$2</sup>')
+    .replace(/([A-Z]+)([\d]{1})([-+])/g, '$1<sub>$2</sub><sup>$3</sup>')
+    .replace(/([A-LN-Za-ln-z])(\d+)/g, '$1<sub>$2</sub>')
+    .replace(/([A-L])([-+])/g, '$1<sup>$2</sup>')
+    .replace(/(Ox)([^A-Za-z]|$)/g, 'O<sub>x</sub>$2')
+    // handle m2, m3, etc.
+    .replace(/([m])([\d]{1})\s/g, '$1<sup>$2</sup> ')
+    .replace(/([m])([\d]{1})$/g, '$1<sup>$2</sup>');
 /**
  * Handles <sup> and <sub> html tags for compounds.
  *
@@ -513,18 +522,20 @@ const isTermTypeAllowed = (termType) => !termType || !ignoreTermTypes.includes(t
  * @param termType Optionally use a `TermType` to restrict the conversion further.
  * @returns HTML version with subscript and superscript tags.
  */
-const compoundToHtml = (value, termType) => isTermTypeAllowed(termType) && !ignoreCompounds(value)
-    ? (value || '')
+const compoundToHtml = (value, termType) => !isTermTypeAllowed(termType) || ignoreCompounds(value)
+    ? value
+    : (value || '')
         .trim()
-        .replace(/([A-Z]+[\d]+)([\d]{1}[-+])/g, '$1<sup>$2</sup>')
-        .replace(/([A-Z]+)([\d]{1})([-+])/g, '$1<sub>$2</sub><sup>$3</sup>')
-        .replace(/([A-LN-Za-ln-z])(\d+)/g, '$1<sub>$2</sub>')
-        .replace(/([A-L])([-+])/g, '$1<sup>$2</sup>')
-        .replace(/(Ox)([^A-Za-z]|$)/g, 'O<sub>x</sub>$2')
-        // handle m2, m3, etc.
-        .replace(/([m])([\d]{1})\s/g, '$1<sup>$2</sup> ')
-        .replace(/([m])([\d]{1})$/g, '$1<sup>$2</sup>')
-    : value;
+        .split(/(\[[^\]]+\]\([^)]+\))/)
+        .map(part => {
+        const match = part.match(/\[([^\]]+)\]\(([^)]+)\)/);
+        if (match) {
+            const [, linkText, url] = match;
+            return `[${transformFormula(linkText)}](${url})`;
+        }
+        return transformFormula(part);
+    })
+        .join('');
 
 class ControlValueAccessor {
     constructor() {
@@ -1842,11 +1853,11 @@ class ClipboardComponent {
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: ClipboardComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.0.6", type: ClipboardComponent, isStandalone: true, selector: "he-clipboard", inputs: { icon: { classPropertyName: "icon", publicName: "icon", isSignal: true, isRequired: false, transformFunction: null }, value: { classPropertyName: "value", publicName: "value", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: false, transformFunction: null }, hideText: { classPropertyName: "hideText", publicName: "hideText", isSignal: true, isRequired: false, transformFunction: null }, hideIcon: { classPropertyName: "hideIcon", publicName: "hideIcon", isSignal: true, isRequired: false, transformFunction: null }, size: { classPropertyName: "size", publicName: "size", isSignal: true, isRequired: false, transformFunction: null }, clipboardClass: { classPropertyName: "clipboardClass", publicName: "clipboardClass", isSignal: true, isRequired: false, transformFunction: null }, tooltipPlacement: { classPropertyName: "tooltipPlacement", publicName: "tooltipPlacement", isSignal: true, isRequired: false, transformFunction: null } }, host: { listeners: { "window:copy": "onCopy($event)" } }, viewQueries: [{ propertyName: "valueNode", first: true, predicate: ["valueNode"], descendants: true, isSignal: true }, { propertyName: "tooltip", first: true, predicate: ["t"], descendants: true, isSignal: true }], ngImport: i0, template: "<div\n  class=\"is-inline-block\"\n  [class.is-clickable]=\"!disabled()\"\n  (click)=\"onClick($event)\"\n  ngbTooltip=\"Copied!\"\n  triggers=\"manual\"\n  [placement]=\"tooltipPlacement()\"\n  container=\"body\"\n  #t=\"ngbTooltip\">\n  <span #valueNode [class.is-hidden]=\"hideText()\">{{ value() }}</span>\n\n  @if (!hideIcon()) {\n    <he-svg-icon [name]=\"icon()\" [size]=\"size()\" [class]=\"clipboardClass()\" />\n  }\n</div>\n", styles: [":host{display:inline-block}.is-small he-svg-icon{height:16px!important;width:16px!important}\n"], dependencies: [{ kind: "directive", type: NgbTooltip, selector: "[ngbTooltip]", inputs: ["animation", "autoClose", "placement", "popperOptions", "triggers", "positionTarget", "container", "disableTooltip", "tooltipClass", "tooltipContext", "openDelay", "closeDelay", "ngbTooltip"], outputs: ["shown", "hidden"], exportAs: ["ngbTooltip"] }, { kind: "component", type: HESvgIconComponent, selector: "he-svg-icon", inputs: ["name", "size", "animation"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.0.6", type: ClipboardComponent, isStandalone: true, selector: "he-clipboard", inputs: { icon: { classPropertyName: "icon", publicName: "icon", isSignal: true, isRequired: false, transformFunction: null }, value: { classPropertyName: "value", publicName: "value", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: false, transformFunction: null }, hideText: { classPropertyName: "hideText", publicName: "hideText", isSignal: true, isRequired: false, transformFunction: null }, hideIcon: { classPropertyName: "hideIcon", publicName: "hideIcon", isSignal: true, isRequired: false, transformFunction: null }, size: { classPropertyName: "size", publicName: "size", isSignal: true, isRequired: false, transformFunction: null }, clipboardClass: { classPropertyName: "clipboardClass", publicName: "clipboardClass", isSignal: true, isRequired: false, transformFunction: null }, tooltipPlacement: { classPropertyName: "tooltipPlacement", publicName: "tooltipPlacement", isSignal: true, isRequired: false, transformFunction: null } }, host: { listeners: { "window:copy": "onCopy($event)" } }, viewQueries: [{ propertyName: "valueNode", first: true, predicate: ["valueNode"], descendants: true, isSignal: true }, { propertyName: "tooltip", first: true, predicate: ["t"], descendants: true, isSignal: true }], ngImport: i0, template: "<div\n  class=\"is-inline-block\"\n  [class.is-clickable]=\"!disabled()\"\n  (click)=\"onClick($event)\"\n  ngbTooltip=\"Copied!\"\n  triggers=\"manual\"\n  [placement]=\"tooltipPlacement()\"\n  container=\"body\"\n  #t=\"ngbTooltip\">\n  <span #valueNode [class.is-hidden]=\"hideText()\">{{ value() }}</span>\n\n  @if (!hideIcon()) {\n    <span [class]=\"clipboardClass()\">\n      <he-svg-icon [name]=\"icon()\" [size]=\"size()\" />\n    </span>\n  }\n</div>\n", styles: [":host{display:inline-block}.is-small he-svg-icon{height:16px!important;width:16px!important}\n"], dependencies: [{ kind: "directive", type: NgbTooltip, selector: "[ngbTooltip]", inputs: ["animation", "autoClose", "placement", "popperOptions", "triggers", "positionTarget", "container", "disableTooltip", "tooltipClass", "tooltipContext", "openDelay", "closeDelay", "ngbTooltip"], outputs: ["shown", "hidden"], exportAs: ["ngbTooltip"] }, { kind: "component", type: HESvgIconComponent, selector: "he-svg-icon", inputs: ["name", "size", "animation"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.0.6", ngImport: i0, type: ClipboardComponent, decorators: [{
             type: Component$1,
-            args: [{ selector: 'he-clipboard', imports: [NgbTooltip, HESvgIconComponent], template: "<div\n  class=\"is-inline-block\"\n  [class.is-clickable]=\"!disabled()\"\n  (click)=\"onClick($event)\"\n  ngbTooltip=\"Copied!\"\n  triggers=\"manual\"\n  [placement]=\"tooltipPlacement()\"\n  container=\"body\"\n  #t=\"ngbTooltip\">\n  <span #valueNode [class.is-hidden]=\"hideText()\">{{ value() }}</span>\n\n  @if (!hideIcon()) {\n    <he-svg-icon [name]=\"icon()\" [size]=\"size()\" [class]=\"clipboardClass()\" />\n  }\n</div>\n", styles: [":host{display:inline-block}.is-small he-svg-icon{height:16px!important;width:16px!important}\n"] }]
+            args: [{ selector: 'he-clipboard', imports: [NgbTooltip, HESvgIconComponent], template: "<div\n  class=\"is-inline-block\"\n  [class.is-clickable]=\"!disabled()\"\n  (click)=\"onClick($event)\"\n  ngbTooltip=\"Copied!\"\n  triggers=\"manual\"\n  [placement]=\"tooltipPlacement()\"\n  container=\"body\"\n  #t=\"ngbTooltip\">\n  <span #valueNode [class.is-hidden]=\"hideText()\">{{ value() }}</span>\n\n  @if (!hideIcon()) {\n    <span [class]=\"clipboardClass()\">\n      <he-svg-icon [name]=\"icon()\" [size]=\"size()\" />\n    </span>\n  }\n</div>\n", styles: [":host{display:inline-block}.is-small he-svg-icon{height:16px!important;width:16px!important}\n"] }]
         }], propDecorators: { valueNode: [{ type: i0.ViewChild, args: ['valueNode', { isSignal: true }] }], tooltip: [{ type: i0.ViewChild, args: ['t', { isSignal: true }] }], icon: [{ type: i0.Input, args: [{ isSignal: true, alias: "icon", required: false }] }], value: [{ type: i0.Input, args: [{ isSignal: true, alias: "value", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: false }] }], hideText: [{ type: i0.Input, args: [{ isSignal: true, alias: "hideText", required: false }] }], hideIcon: [{ type: i0.Input, args: [{ isSignal: true, alias: "hideIcon", required: false }] }], size: [{ type: i0.Input, args: [{ isSignal: true, alias: "size", required: false }] }], clipboardClass: [{ type: i0.Input, args: [{ isSignal: true, alias: "clipboardClass", required: false }] }], tooltipPlacement: [{ type: i0.Input, args: [{ isSignal: true, alias: "tooltipPlacement", required: false }] }], onCopy: [{
                 type: HostListener,
                 args: ['window:copy', ['$event']]
@@ -8135,14 +8146,13 @@ class NodeLogsModelsComponent {
             params: () => ({
                 ids: unique(this.cycle()
                     ?.inputs?.filter((value) => inputGroupsTermTypes.includes(value?.term?.termType))
-                    ?.map(v => v.term['@id'])
-                    ?.filter(Boolean) ?? [])
+                    ?.map(v => v.term['@id']) ?? []).filter(Boolean)
             }),
             stream: ({ params: { ids } }) => from(ids).pipe(mergeMap((id) => this.nodeService.get$({ '@type': NodeType.Term, '@id': id })), mergeMap(term => term.defaultProperties?.map(v => ({ id: v.key?.['@id'], group: term['@id'] }))), filter(v => !!v.id), reduce((prev, curr) => {
                 prev[curr.id] = prev[curr.id] || [];
                 prev[curr.id].push(curr.group);
                 return prev;
-            }, {}))
+            }, {}), catchError(() => of({})))
         });
         this.animalGroups = computed(() => (this.cycle()?.animals?.flatMap(animal => animal.inputs?.map(input => ({ id: input.term['@id'], group: animal.animalId }))) ?? [])
             .filter(Boolean)
@@ -8166,7 +8176,7 @@ class NodeLogsModelsComponent {
                 ? this.searchTerms({
                     bool: {
                         must: [matchType(NodeType.Term)],
-                        should: values.map(matchId),
+                        should: values.filter(Boolean).map(matchId),
                         minimum_should_match: 1
                     }
                 })
@@ -8226,7 +8236,7 @@ class NodeLogsModelsComponent {
                 ? this.searchTerms({
                     bool: {
                         must: [matchType(NodeType.Term)],
-                        should: ids.map(id => matchExactQuery('@id', id)),
+                        should: ids.filter(Boolean).map(matchId),
                         minimum_should_match: 1
                     }
                 }).pipe(map(groupTerms))
@@ -10083,7 +10093,7 @@ class EngineOrchestratorEditComponent {
                 query: {
                     bool: {
                         must: [matchType(NodeType.Term)],
-                        should: ids.map(matchId),
+                        should: ids.filter(Boolean).map(matchId),
                         minimum_should_match: 1
                     }
                 }
@@ -10723,6 +10733,11 @@ const customErrorMessage = {
         If it is more than 7305 days, consider using the term ${code('Other natural vegetation')} instead.`,
     'must not add the feed input to the Cycle as well': ({ params: { term } = {} }) => `You have added the animal feed Input ${code(term['@id'])} to the Cycle inputs as well, which might lead to double counting.
     If you do not know the amount of ${code(term['@id'])} given to each Animal, please add the Input to the Cycle only.`,
+    'must provide value or min and max': ({ params }) => `You have provided only a ${code('max')} without a ${code('min')} or a ${code('value')}${params.term ? ` for ${termLink(params.term)}` : ''}.
+    ${params?.term?.termType === TermTermType.measurement
+        ? `This Measurement has additional restrictions and needs either a ${code('value')} or both a ${code('min')} and ${code('max')} specified.
+          Please consider adding both the ${code('min')} and the ${code('max')}, or delete the Measurement.`
+        : ''}`,
     'must specify water type for ponds': ({ params }) => `For Sites with ${schemaLink('Site#siteType', 'siteType')} = ${code('pond')}, you must specify the ${externalNodeLink({
         '@type': NodeType.Term,
         '@id': 'waterSalinity',