@ajf/material 18.5.3 → 18.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/form-builder/form-builder-service.mjs +17 -2
- package/esm2022/form-builder/node-properties.mjs +2 -2
- package/esm2022/forms/field-row.mjs +3 -2
- package/fesm2022/ajf-material-form-builder.mjs +17 -2
- package/fesm2022/ajf-material-form-builder.mjs.map +1 -1
- package/fesm2022/ajf-material-forms.mjs +2 -1
- package/fesm2022/ajf-material-forms.mjs.map +1 -1
- package/package.json +2 -2
|
@@ -98,7 +98,8 @@ export class AjfFieldRow {
|
|
|
98
98
|
return this.instance?.node.fieldType === AjfFieldType.Empty;
|
|
99
99
|
}
|
|
100
100
|
get required() {
|
|
101
|
-
|
|
101
|
+
// `notEmpty` is `true` or a validation object when set; `false` is a valid way to unset it.
|
|
102
|
+
return !!this.instance?.node.validation?.notEmpty;
|
|
102
103
|
}
|
|
103
104
|
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: AjfFieldRow, deps: [{ token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component }); }
|
|
104
105
|
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.13", type: AjfFieldRow, selector: "ajf-field-row", inputs: { instance: "instance", readonly: "readonly" }, host: { properties: { "class.ajf-hidden-row": "this.hidden" } }, ngImport: i0, template: "<div\n *ngIf=\"!hidden\"\n class=\"ajf-field-row\"\n [class.ajf-invalid]=\"!instance.valid\"\n [class.ajf-readonly]=\"readonly\"\n [class.ajf-note-row]=\"isNote\"\n [ngClass]=\"'ajf-' + instance.node.size + ' ajf-field-type-' + instance.node.fieldType\"\n>\n <div class=\"ajf-field-label\">\n <span class=\"ajf-field-label-line\">\n <label [attr.id]=\"instance.node.name\" [innerHTML]=\"instance.node.label | transloco\"></label>\n <span class=\"ajf-required\" *ngIf=\"required\" aria-hidden=\"true\">*</span>\n <mat-icon\n class=\"ajf-hint-icon\"\n *ngIf=\"instance.node.hint as hint\"\n [matTooltip]=\"hint | transloco\"\n matTooltipPosition=\"right\"\n >{{ instance.node.hintIcon || 'help' }}</mat-icon\n >\n </span>\n <!-- A note carries prose, not a value, so naming its type says nothing. -->\n <ng-container *ngIf=\"!isNote\">\n <span class=\"ajf-field-type-name\" *ngIf=\"instance | ajfFieldTypeLabel as type\"\n >{{ type.name | transloco }}<ng-container *ngIf=\"type.detailValue\"> ·\n {{ type.detailValue }}<ng-container *ngIf=\"type.detailUnit\">\n {{ type.detailUnit | transloco }}</ng-container\n ></ng-container\n ></span\n >\n </ng-container>\n </div>\n\n <div class=\"ajf-field-control\">\n <ajf-field\n [instance]=\"instance\"\n [readonly]=\"readonly\"\n [id]=\"'field_entry_' + instance.node.id\"\n ></ajf-field>\n </div>\n\n <div class=\"ajf-field-side\">\n <span class=\"ajf-field-error-message\" *ngIf=\"!instance.valid\">{{\n instance | ajfAsFieldInstanceErrors | transloco\n }}</span>\n <span class=\"ajf-field-hint-text\" *ngIf=\"instance.valid && instance.node.description\">{{\n instance.node.description | transloco\n }}</span>\n </div>\n</div>\n", styles: ["ajf-field-row{display:block}ajf-field-row.ajf-hidden-row{display:none}ajf-field-row .ajf-field-row{display:flex;flex-wrap:nowrap;align-items:flex-start;gap:var(--ajf-gap);box-sizing:border-box;padding:10px 20px;border-bottom:1px solid var(--ajf-border);background:var(--ajf-surface);font-family:var(--ajf-font-sans)}ajf-field-row .ajf-field-label{display:flex;flex:0 0 var(--ajf-label-col);flex-direction:column;justify-content:center;gap:2px;min-height:var(--ajf-control-h);max-width:var(--ajf-label-col)}ajf-field-row .ajf-field-label .ajf-field-label-line{display:flex;align-items:center;gap:6px}ajf-field-row .ajf-field-label label{color:var(--ajf-text);font-size:14px;font-weight:500;line-height:1.35}ajf-field-row .ajf-field-label .ajf-field-type-name{color:var(--ajf-text-muted);font-size:12px;line-height:1.3}ajf-field-row .ajf-field-label .ajf-required{color:var(--ajf-danger);font-weight:600}ajf-field-row .ajf-field-label .ajf-hint-icon{display:inline-flex;align-items:center;justify-content:center;width:16px;height:16px;color:var(--ajf-text-muted);font-size:16px;line-height:1;cursor:help}ajf-field-row .ajf-field-control{display:flex;flex:1 1 auto;flex-wrap:wrap;align-items:center;gap:8px;min-width:0}ajf-field-row .ajf-field-control>ajf-field{flex:1 1 auto;min-width:0}ajf-field-row .ajf-field-side{display:flex;flex:0 0 var(--ajf-side-col);align-items:center;min-height:var(--ajf-control-h);max-width:var(--ajf-side-col)}ajf-field-row .ajf-field-side .ajf-field-hint-text{color:var(--ajf-text-muted);font-size:13px}ajf-field-row .ajf-field-side .ajf-field-error-message{color:var(--ajf-danger);font-size:13px}ajf-field-row .ajf-normal .ajf-field-control{max-width:none}ajf-field-row .ajf-small .ajf-field-control{max-width:420px}ajf-field-row .ajf-smaller .ajf-field-control{max-width:320px}ajf-field-row .ajf-tiny .ajf-field-control{max-width:220px}ajf-field-row .ajf-mini .ajf-field-control{max-width:140px}ajf-field-row .ajf-field-row.ajf-invalid{background:color-mix(in srgb,var(--ajf-danger-bg) 45%,var(--ajf-surface))}ajf-field-row .ajf-field-row.ajf-invalid .ajf-control,ajf-field-row .ajf-field-row.ajf-invalid input.ajf-control,ajf-field-row .ajf-field-row.ajf-invalid .mat-mdc-select-trigger{border-color:var(--ajf-danger)}ajf-field-row .ajf-field-row.ajf-readonly .ajf-field-side{flex-basis:auto}ajf-field-row .ajf-note-row .ajf-field-control,ajf-field-row .ajf-field-type-1 .ajf-field-control,ajf-field-row .ajf-field-type-11 .ajf-field-control{max-width:none}@media (width <= 900px){ajf-field-row .ajf-field-row{flex-wrap:wrap;padding:12px 16px}ajf-field-row .ajf-field-label,ajf-field-row .ajf-field-side{flex-basis:100%;max-width:none;min-height:0}ajf-field-row .ajf-field-control{flex-basis:100%}}\n"], dependencies: [{ kind: "directive", type: i1.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "directive", type: i3.MatTooltip, selector: "[matTooltip]", inputs: ["matTooltipPosition", "matTooltipPositionAtOrigin", "matTooltipDisabled", "matTooltipShowDelay", "matTooltipHideDelay", "matTooltipTouchGestures", "matTooltip", "matTooltipClass"], exportAs: ["matTooltip"] }, { kind: "component", type: i4.AjfFormField, selector: "ajf-field,ajf-form-field" }, { kind: "pipe", type: i5.TranslocoPipe, name: "transloco" }, { kind: "pipe", type: i6.AjfAsFieldInstanceErrorsPipe, name: "ajfAsFieldInstanceErrors" }, { kind: "pipe", type: i6.AjfFieldTypeLabelPipe, name: "ajfFieldTypeLabel" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
|
|
@@ -114,4 +115,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
|
|
|
114
115
|
type: HostBinding,
|
|
115
116
|
args: ['class.ajf-hidden-row']
|
|
116
117
|
}] } });
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"field-row.js","sourceRoot":"","sources":["../../../../projects/material/forms/src/field-row.ts","../../../../projects/material/forms/src/field-row.html"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAkC,YAAY,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAe,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EACL,uBAAuB,EAEvB,SAAS,EACT,WAAW,EACX,KAAK,EAEL,iBAAiB,GAClB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,MAAM,MAAM,CAAC;;;;;;;;AAElC;;;;;;;GAOG;AAQH,MAAM,OAAO,WAAW;IACtB,IACI,QAAQ,CAAC,QAA0B;QACrC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,sEAAsE;QACtE,0EAA0E;QAC1E,uBAAuB;QACvB,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,QAAQ;YAC1B,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC/D,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC;IACzB,CAAC;IACD,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAID,YAAoB,IAAuB;QAAvB,SAAI,GAAJ,IAAI,CAAmB;QAFnC,iBAAY,GAAiB,YAAY,CAAC,KAAK,CAAC;QAehD,cAAS,GAAG,KAAK,CAAC;IAboB,CAAC;IAE/C,WAAW;QACT,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,IACI,QAAQ,CAAC,QAAiB;QAC5B,IAAI,CAAC,SAAS,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAGD;;;;;;;;;;OAUG;IACH,IACI,MAAM;QACR,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QACjC,6EAA6E;QAC7E,0EAA0E;QAC1E,gDAAgD;QAChD,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,KAAK,YAAY,CAAC,KAAK,EAAE,CAAC;YAC1C,OAAO,CAAE,IAAsB,CAAC,IAAI,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,KAAK,YAAY,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC;IACtE,CAAC;IAED,6EAA6E;IAC7E,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,KAAK,YAAY,CAAC,KAAK,CAAC;IAC9D,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,IAAI,IAAI,CAAC;IAC1D,CAAC;+GArEU,WAAW;mGAAX,WAAW,8KClDxB,o0DAiDA;;4FDCa,WAAW;kBAPvB,SAAS;+BACE,eAAe,mBAGR,uBAAuB,CAAC,MAAM,iBAChC,iBAAiB,CAAC,IAAI;sFAIjC,QAAQ;sBADX,KAAK;gBAwBF,QAAQ;sBADX,KAAK;gBAqBF,MAAM;sBADT,WAAW;uBAAC,sBAAsB","sourcesContent":["/**\n * @license\n * Copyright (C) Gnucoop soc. coop.\n *\n * This file is part of the Advanced JSON forms (ajf).\n *\n * Advanced JSON forms (ajf) is free software: you can redistribute it and/or\n * modify it under the terms of the GNU Affero General Public License as\n * published by the Free Software Foundation, either version 3 of the License,\n * or (at your option) any later version.\n *\n * Advanced JSON forms (ajf) is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero\n * General Public License for more details.\n *\n * You should have received a copy of the GNU Affero General Public License\n * along with Advanced JSON forms (ajf).\n * If not, see http://www.gnu.org/licenses/.\n *\n */\n\nimport {AjfEmptyField, AjfFieldInstance, AjfFieldType, AjfNodeType} from '@ajf/core/forms';\nimport {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';\nimport {\n  ChangeDetectionStrategy,\n  ChangeDetectorRef,\n  Component,\n  HostBinding,\n  Input,\n  OnDestroy,\n  ViewEncapsulation,\n} from '@angular/core';\nimport {Subscription} from 'rxjs';\n\n/**\n * One field of a slide, laid out as a row: type badge, label, control, and a\n * right-hand column carrying either the field description or its validation\n * error.\n *\n * Both the plain and the repeating slide branches of the renderer render through\n * this component, so the row layout is defined in exactly one place.\n */\n@Component({\n  selector: 'ajf-field-row',\n  templateUrl: 'field-row.html',\n  styleUrls: ['field-row.scss'],\n  changeDetection: ChangeDetectionStrategy.OnPush,\n  encapsulation: ViewEncapsulation.None,\n})\nexport class AjfFieldRow implements OnDestroy {\n  @Input()\n  set instance(instance: AjfFieldInstance) {\n    this._instance = instance;\n    // Validity, visibility and the error list are mutated in place on the\n    // instance, so the row has to be told to re-check itself the same way the\n    // field components do.\n    this._instanceSub.unsubscribe();\n    this._instanceSub = instance\n      ? instance.updatedEvt.subscribe(() => this._cdr.markForCheck())\n      : Subscription.EMPTY;\n  }\n  get instance(): AjfFieldInstance {\n    return this._instance;\n  }\n  private _instance!: AjfFieldInstance;\n  private _instanceSub: Subscription = Subscription.EMPTY;\n\n  constructor(private _cdr: ChangeDetectorRef) {}\n\n  ngOnDestroy(): void {\n    this._instanceSub.unsubscribe();\n  }\n\n  @Input()\n  set readonly(readonly: boolean) {\n    this._readonly = coerceBooleanProperty(readonly);\n  }\n  get readonly(): boolean {\n    return this._readonly;\n  }\n  private _readonly = false;\n\n  /**\n   * Rows drop out on the host element rather than inside it, so that a hidden\n   * field leaves no empty cell behind when rows are laid out in columns.\n   *\n   * Three kinds of node carry no information of their own and are kept out of\n   * the layout: a container node, which is only a bracket around the fields it\n   * holds and has no fieldType to render; a formula field with no label, which\n   * only feeds other fields; and a note with no body -- the renderer synthesises\n   * one of those to carry a node group's label, and a group is meant to show\n   * nothing of itself.\n   */\n  @HostBinding('class.ajf-hidden-row')\n  get hidden(): boolean {\n    const node = this.instance?.node;\n    // Truthy, not `=== false`: a visibility condition is an arbitrary expression\n    // and the renderer stores whatever it returns, so an unanswered field can\n    // leave `visible` at null rather than at false.\n    if (node == null || !this.instance.visible) {\n      return true;\n    }\n    if (node.nodeType !== AjfNodeType.AjfField) {\n      return true;\n    }\n    if (node.fieldType === AjfFieldType.Empty) {\n      return !(node as AjfEmptyField).HTML;\n    }\n    return node.fieldType === AjfFieldType.Formula && node.label === '';\n  }\n\n  /** Notes render their own block and never get a control border around it. */\n  get isNote(): boolean {\n    return this.instance?.node.fieldType === AjfFieldType.Empty;\n  }\n\n  get required(): boolean {\n    return this.instance?.node.validation?.notEmpty != null;\n  }\n\n  static ngAcceptInputType_readonly: BooleanInput;\n}\n","<div\n  *ngIf=\"!hidden\"\n  class=\"ajf-field-row\"\n  [class.ajf-invalid]=\"!instance.valid\"\n  [class.ajf-readonly]=\"readonly\"\n  [class.ajf-note-row]=\"isNote\"\n  [ngClass]=\"'ajf-' + instance.node.size + ' ajf-field-type-' + instance.node.fieldType\"\n>\n  <div class=\"ajf-field-label\">\n    <span class=\"ajf-field-label-line\">\n      <label [attr.id]=\"instance.node.name\" [innerHTML]=\"instance.node.label | transloco\"></label>\n      <span class=\"ajf-required\" *ngIf=\"required\" aria-hidden=\"true\">*</span>\n      <mat-icon\n        class=\"ajf-hint-icon\"\n        *ngIf=\"instance.node.hint as hint\"\n        [matTooltip]=\"hint | transloco\"\n        matTooltipPosition=\"right\"\n        >{{ instance.node.hintIcon || 'help' }}</mat-icon\n      >\n    </span>\n    <!-- A note carries prose, not a value, so naming its type says nothing. -->\n    <ng-container *ngIf=\"!isNote\">\n      <span class=\"ajf-field-type-name\" *ngIf=\"instance | ajfFieldTypeLabel as type\"\n        >{{ type.name | transloco }}<ng-container *ngIf=\"type.detailValue\"> &middot;\n          {{ type.detailValue }}<ng-container *ngIf=\"type.detailUnit\">\n            {{ type.detailUnit | transloco }}</ng-container\n          ></ng-container\n        ></span\n      >\n    </ng-container>\n  </div>\n\n  <div class=\"ajf-field-control\">\n    <ajf-field\n      [instance]=\"instance\"\n      [readonly]=\"readonly\"\n      [id]=\"'field_entry_' + instance.node.id\"\n    ></ajf-field>\n  </div>\n\n  <div class=\"ajf-field-side\">\n    <span class=\"ajf-field-error-message\" *ngIf=\"!instance.valid\">{{\n      instance | ajfAsFieldInstanceErrors | transloco\n    }}</span>\n    <span class=\"ajf-field-hint-text\" *ngIf=\"instance.valid && instance.node.description\">{{\n      instance.node.description | transloco\n    }}</span>\n  </div>\n</div>\n"]}
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"field-row.js","sourceRoot":"","sources":["../../../../projects/material/forms/src/field-row.ts","../../../../projects/material/forms/src/field-row.html"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAkC,YAAY,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAe,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EACL,uBAAuB,EAEvB,SAAS,EACT,WAAW,EACX,KAAK,EAEL,iBAAiB,GAClB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,YAAY,EAAC,MAAM,MAAM,CAAC;;;;;;;;AAElC;;;;;;;GAOG;AAQH,MAAM,OAAO,WAAW;IACtB,IACI,QAAQ,CAAC,QAA0B;QACrC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,sEAAsE;QACtE,0EAA0E;QAC1E,uBAAuB;QACvB,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,YAAY,GAAG,QAAQ;YAC1B,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC/D,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC;IACzB,CAAC;IACD,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAID,YAAoB,IAAuB;QAAvB,SAAI,GAAJ,IAAI,CAAmB;QAFnC,iBAAY,GAAiB,YAAY,CAAC,KAAK,CAAC;QAehD,cAAS,GAAG,KAAK,CAAC;IAboB,CAAC;IAE/C,WAAW;QACT,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,IACI,QAAQ,CAAC,QAAiB;QAC5B,IAAI,CAAC,SAAS,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAGD;;;;;;;;;;OAUG;IACH,IACI,MAAM;QACR,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QACjC,6EAA6E;QAC7E,0EAA0E;QAC1E,gDAAgD;QAChD,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,KAAK,YAAY,CAAC,KAAK,EAAE,CAAC;YAC1C,OAAO,CAAE,IAAsB,CAAC,IAAI,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,KAAK,YAAY,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC;IACtE,CAAC;IAED,6EAA6E;IAC7E,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,KAAK,YAAY,CAAC,KAAK,CAAC;IAC9D,CAAC;IAED,IAAI,QAAQ;QACV,4FAA4F;QAC5F,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC;IACpD,CAAC;+GAtEU,WAAW;mGAAX,WAAW,8KClDxB,o0DAiDA;;4FDCa,WAAW;kBAPvB,SAAS;+BACE,eAAe,mBAGR,uBAAuB,CAAC,MAAM,iBAChC,iBAAiB,CAAC,IAAI;sFAIjC,QAAQ;sBADX,KAAK;gBAwBF,QAAQ;sBADX,KAAK;gBAqBF,MAAM;sBADT,WAAW;uBAAC,sBAAsB","sourcesContent":["/**\n * @license\n * Copyright (C) Gnucoop soc. coop.\n *\n * This file is part of the Advanced JSON forms (ajf).\n *\n * Advanced JSON forms (ajf) is free software: you can redistribute it and/or\n * modify it under the terms of the GNU Affero General Public License as\n * published by the Free Software Foundation, either version 3 of the License,\n * or (at your option) any later version.\n *\n * Advanced JSON forms (ajf) is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero\n * General Public License for more details.\n *\n * You should have received a copy of the GNU Affero General Public License\n * along with Advanced JSON forms (ajf).\n * If not, see http://www.gnu.org/licenses/.\n *\n */\n\nimport {AjfEmptyField, AjfFieldInstance, AjfFieldType, AjfNodeType} from '@ajf/core/forms';\nimport {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';\nimport {\n  ChangeDetectionStrategy,\n  ChangeDetectorRef,\n  Component,\n  HostBinding,\n  Input,\n  OnDestroy,\n  ViewEncapsulation,\n} from '@angular/core';\nimport {Subscription} from 'rxjs';\n\n/**\n * One field of a slide, laid out as a row: type badge, label, control, and a\n * right-hand column carrying either the field description or its validation\n * error.\n *\n * Both the plain and the repeating slide branches of the renderer render through\n * this component, so the row layout is defined in exactly one place.\n */\n@Component({\n  selector: 'ajf-field-row',\n  templateUrl: 'field-row.html',\n  styleUrls: ['field-row.scss'],\n  changeDetection: ChangeDetectionStrategy.OnPush,\n  encapsulation: ViewEncapsulation.None,\n})\nexport class AjfFieldRow implements OnDestroy {\n  @Input()\n  set instance(instance: AjfFieldInstance) {\n    this._instance = instance;\n    // Validity, visibility and the error list are mutated in place on the\n    // instance, so the row has to be told to re-check itself the same way the\n    // field components do.\n    this._instanceSub.unsubscribe();\n    this._instanceSub = instance\n      ? instance.updatedEvt.subscribe(() => this._cdr.markForCheck())\n      : Subscription.EMPTY;\n  }\n  get instance(): AjfFieldInstance {\n    return this._instance;\n  }\n  private _instance!: AjfFieldInstance;\n  private _instanceSub: Subscription = Subscription.EMPTY;\n\n  constructor(private _cdr: ChangeDetectorRef) {}\n\n  ngOnDestroy(): void {\n    this._instanceSub.unsubscribe();\n  }\n\n  @Input()\n  set readonly(readonly: boolean) {\n    this._readonly = coerceBooleanProperty(readonly);\n  }\n  get readonly(): boolean {\n    return this._readonly;\n  }\n  private _readonly = false;\n\n  /**\n   * Rows drop out on the host element rather than inside it, so that a hidden\n   * field leaves no empty cell behind when rows are laid out in columns.\n   *\n   * Three kinds of node carry no information of their own and are kept out of\n   * the layout: a container node, which is only a bracket around the fields it\n   * holds and has no fieldType to render; a formula field with no label, which\n   * only feeds other fields; and a note with no body -- the renderer synthesises\n   * one of those to carry a node group's label, and a group is meant to show\n   * nothing of itself.\n   */\n  @HostBinding('class.ajf-hidden-row')\n  get hidden(): boolean {\n    const node = this.instance?.node;\n    // Truthy, not `=== false`: a visibility condition is an arbitrary expression\n    // and the renderer stores whatever it returns, so an unanswered field can\n    // leave `visible` at null rather than at false.\n    if (node == null || !this.instance.visible) {\n      return true;\n    }\n    if (node.nodeType !== AjfNodeType.AjfField) {\n      return true;\n    }\n    if (node.fieldType === AjfFieldType.Empty) {\n      return !(node as AjfEmptyField).HTML;\n    }\n    return node.fieldType === AjfFieldType.Formula && node.label === '';\n  }\n\n  /** Notes render their own block and never get a control border around it. */\n  get isNote(): boolean {\n    return this.instance?.node.fieldType === AjfFieldType.Empty;\n  }\n\n  get required(): boolean {\n    // `notEmpty` is `true` or a validation object when set; `false` is a valid way to unset it.\n    return !!this.instance?.node.validation?.notEmpty;\n  }\n\n  static ngAcceptInputType_readonly: BooleanInput;\n}\n","<div\n  *ngIf=\"!hidden\"\n  class=\"ajf-field-row\"\n  [class.ajf-invalid]=\"!instance.valid\"\n  [class.ajf-readonly]=\"readonly\"\n  [class.ajf-note-row]=\"isNote\"\n  [ngClass]=\"'ajf-' + instance.node.size + ' ajf-field-type-' + instance.node.fieldType\"\n>\n  <div class=\"ajf-field-label\">\n    <span class=\"ajf-field-label-line\">\n      <label [attr.id]=\"instance.node.name\" [innerHTML]=\"instance.node.label | transloco\"></label>\n      <span class=\"ajf-required\" *ngIf=\"required\" aria-hidden=\"true\">*</span>\n      <mat-icon\n        class=\"ajf-hint-icon\"\n        *ngIf=\"instance.node.hint as hint\"\n        [matTooltip]=\"hint | transloco\"\n        matTooltipPosition=\"right\"\n        >{{ instance.node.hintIcon || 'help' }}</mat-icon\n      >\n    </span>\n    <!-- A note carries prose, not a value, so naming its type says nothing. -->\n    <ng-container *ngIf=\"!isNote\">\n      <span class=\"ajf-field-type-name\" *ngIf=\"instance | ajfFieldTypeLabel as type\"\n        >{{ type.name | transloco }}<ng-container *ngIf=\"type.detailValue\"> &middot;\n          {{ type.detailValue }}<ng-container *ngIf=\"type.detailUnit\">\n            {{ type.detailUnit | transloco }}</ng-container\n          ></ng-container\n        ></span\n      >\n    </ng-container>\n  </div>\n\n  <div class=\"ajf-field-control\">\n    <ajf-field\n      [instance]=\"instance\"\n      [readonly]=\"readonly\"\n      [id]=\"'field_entry_' + instance.node.id\"\n    ></ajf-field>\n  </div>\n\n  <div class=\"ajf-field-side\">\n    <span class=\"ajf-field-error-message\" *ngIf=\"!instance.valid\">{{\n      instance | ajfAsFieldInstanceErrors | transloco\n    }}</span>\n    <span class=\"ajf-field-hint-text\" *ngIf=\"instance.valid && instance.node.description\">{{\n      instance.node.description | transloco\n    }}</span>\n  </div>\n</div>\n"]}
|
|
@@ -1303,7 +1303,22 @@ class AjfFormBuilderService {
|
|
|
1303
1303
|
maxDigits != null) {
|
|
1304
1304
|
const validation = node.validation || createValidationGroup({});
|
|
1305
1305
|
validation.forceValue = forceValue;
|
|
1306
|
-
|
|
1306
|
+
if (notEmpty) {
|
|
1307
|
+
// A custom message of the old `notEmpty` validation object moves to
|
|
1308
|
+
// `notEmptyMessage`, the field the boolean form reads.
|
|
1309
|
+
const previous = validation.notEmpty;
|
|
1310
|
+
if (validation.notEmptyMessage == null &&
|
|
1311
|
+
typeof previous === 'object' &&
|
|
1312
|
+
previous.errorMessage &&
|
|
1313
|
+
previous.errorMessage !== notEmptyValidation().errorMessage) {
|
|
1314
|
+
validation.notEmptyMessage = previous.errorMessage;
|
|
1315
|
+
}
|
|
1316
|
+
validation.notEmpty = true;
|
|
1317
|
+
}
|
|
1318
|
+
else {
|
|
1319
|
+
validation.notEmpty = undefined;
|
|
1320
|
+
validation.notEmptyMessage = undefined;
|
|
1321
|
+
}
|
|
1307
1322
|
validation.minValue = minValue != null ? minValidation(minValue) : undefined;
|
|
1308
1323
|
validation.maxValue = maxValue != null ? maxValidation(maxValue) : undefined;
|
|
1309
1324
|
validation.minDigits = minDigits != null ? minDigitsValidation(minDigits) : undefined;
|
|
@@ -2599,7 +2614,7 @@ class AjfFbNodeProperties {
|
|
|
2599
2614
|
if (node.validation.forceValue != null) {
|
|
2600
2615
|
forceValue = node.validation.forceValue.condition;
|
|
2601
2616
|
}
|
|
2602
|
-
notEmpty = node.validation.notEmpty
|
|
2617
|
+
notEmpty = !!node.validation.notEmpty;
|
|
2603
2618
|
validationConditions = (node.validation.conditions || []).map(c => {
|
|
2604
2619
|
return { condition: c.condition, errorMessage: c.errorMessage };
|
|
2605
2620
|
});
|