@ajf/material 18.0.1 → 18.0.3

package/form-builder/choices-origin-editor-dialog.d.ts

@@ -30,6 +30,7 @@ export declare class AjfFbChoicesOriginEditorDialog {
     private _choicesOrigin;
     get choicesOrigin(): Observable<AjfChoicesOrigin<any>>;
     constructor(_service: AjfFormBuilderService);
+    disableSave(): boolean;
     saveChoicesOrigin(): void;
     cancelChoicesOriginEdit(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<AjfFbChoicesOriginEditorDialog, never>;

package/form-builder/form-builder-service.d.ts

@@ -37,6 +37,15 @@ export interface AjfFormBuilderNodeEntry {
     children: AjfFormBuilderNodeEntry[];
     content: AjfFormBuilderNodeEntry[];
 }
+export interface FormBuilderFieldValidation {
+    isValid: boolean;
+    errors: {
+        [key: string]: any;
+    } | null;
+}
+export interface AjfFormBuilderValidation {
+    [key: string]: FormBuilderFieldValidation | null;
+}
 export interface AjfFormBuilderEmptySlot {
     parent: AjfNode;
     parentNode: number;
@@ -113,12 +122,19 @@ export declare class AjfFormBuilderService {
     private _editedNodeEntry;
     private _editedNodeEntryObs;
     get editedNodeEntry(): Observable<AjfFormBuilderNodeEntry | null>;
+    /**
+     * New field or node just added in tree
+     */
+    private _newNodeEntry;
     private _editedCondition;
     private _editedConditionObs;
     get editedCondition(): Observable<AjfCondition | null>;
     private _editedChoicesOrigin;
     private _editedChoicesOriginObs;
     get editedChoicesOrigin(): Observable<AjfChoicesOrigin<any> | null>;
+    private _editedNodesValidation;
+    private _editedNodesValidationObs;
+    get editedNodesValidation(): Observable<AjfFormBuilderValidation | null>;
     private _beforeNodesUpdate;
     private _beforeNodesUpdateObs;
     get beforeNodesUpdate(): Observable<void>;
@@ -154,6 +170,21 @@ export declare class AjfFormBuilderService {
      */
     setForm(form: AjfForm | null): void;
     editNodeEntry(nodeEntry: AjfFormBuilderNodeEntry): void;
+    /**
+     * Add a node validation entry
+     * @param fbNodeValidation
+     */
+    editNodeValidation(fbNodeValidation: AjfFormBuilderValidation): void;
+    /**
+     * Return if a node is valid
+     * @param nodeName
+     */
+    isNodeValid(nodeName: string): boolean;
+    /**
+     * Clean node validation entries when a node is deleted
+     * @param fbNodeValidation the deleted node
+     */
+    cleanNodeValidation(fbNodeName: string): void;
     editCondition(condition: AjfCondition): void;
     saveCurrentCondition(condition: string): void;
     cancelConditionEdit(): void;
@@ -217,6 +248,13 @@ export declare class AjfFormBuilderService {
      */
     private _updateChoicesOriginRefInNodes;
     private _buildFormBuilderNodesTree;
+    /**
+     * Find an ajfNode in AjfFormBuilderNodeEntry tree, by node name
+     * @param tree
+     * @param node
+     * @returns the AjfFormBuilderNodeEntry node
+     */
+    private _findNodeInTree;
     /**
      * Adds the id of a dropList to be connected with the FormBuilder source list.
      * @param listId The id of the list to connect.

package/form-builder/form-builder.d.ts

@@ -25,7 +25,7 @@ import { AfterContentInit, AfterViewChecked, ElementRef, OnDestroy } from '@angu
 import { MatDialog } from '@angular/material/dialog';
 import { MatSlideToggleChange } from '@angular/material/slide-toggle';
 import { Observable } from 'rxjs';
-import { AjfFormBuilderNodeEntry, AjfFormBuilderNodeTypeEntry, AjfFormBuilderService } from './form-builder-service';
+import { AjfFormBuilderNodeEntry, AjfFormBuilderNodeTypeEntry, AjfFormBuilderService, AjfFormBuilderValidation } from './form-builder-service';
 import * as i0 from "@angular/core";
 export declare class AjfFormBuilder implements AfterViewChecked, AfterContentInit, OnDestroy {
     private _service;
@@ -34,6 +34,11 @@ export declare class AjfFormBuilder implements AfterViewChecked, AfterContentIni
     private _form;
     get form(): AjfForm | undefined;
     set form(form: AjfForm | undefined);
+    /**
+     * Called to set form builder validation errors
+     */
+    private _formBuilderValidation;
+    readonly formBuilderValidation: Observable<AjfFormBuilderValidation>;
     private _nodeTypes;
     get nodeTypes(): AjfFormBuilderNodeTypeEntry[];
     private _nodeEntriesTree;
@@ -51,6 +56,7 @@ export declare class AjfFormBuilder implements AfterViewChecked, AfterContentIni
     private _editConditionDialog;
     private _beforeNodesUpdateSub;
     private _editChoicesOriginSub;
+    private _editNodesValidationSub;
     private _editChoicesOriginDialog;
     private _stringIdentifierDialog;
     private _stringIdentifierSub;
@@ -75,5 +81,5 @@ export declare class AjfFormBuilder implements AfterViewChecked, AfterContentIni
     expandToggle(evt: MatSlideToggleChange): void;
     private _setCurrentForm;
     static ɵfac: i0.ɵɵFactoryDeclaration<AjfFormBuilder, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<AjfFormBuilder, "ajf-form-builder", never, { "form": { "alias": "form"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<AjfFormBuilder, "ajf-form-builder", never, { "form": { "alias": "form"; "required": false; }; }, { "formBuilderValidation": "formBuilderValidation"; }, never, never, false, never>;
 }

package/form-builder/node-entry.d.ts

@@ -69,6 +69,7 @@ export declare class AjfFbNodeEntry implements AfterViewInit, OnDestroy {
     onResize(): void;
     edit(evt: Event): void;
     delete(evt: Event): void;
+    isInvalid(node: AjfNode): boolean;
     isLastNode(): boolean;
     isSlide(node: AjfNode): boolean;
     isExpanded(): Observable<boolean>;

package/form-builder/node-properties.d.ts

@@ -20,7 +20,7 @@
  *
  */
 import { AjfChoicesOrigin, AjfFieldWithChoices, AjfNode, AjfNumberField, AjfRangeField, AjfTableField } from '@ajf/core/forms';
-import { ChangeDetectorRef, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { Observable } from 'rxjs';
@@ -36,7 +36,7 @@ export interface WarningCondition {
     condition: string;
     warningMessage: string;
 }
-export declare class AjfFbNodeProperties implements OnDestroy {
+export declare class AjfFbNodeProperties implements OnDestroy, OnInit {
     private _cdr;
     private _service;
     private _dialog;
@@ -130,7 +130,10 @@ export declare class AjfFbNodeProperties implements OnDestroy {
     private _removeTriggerConditionSub;
     private _saveEvt;
     private _saveSub;
+    private _isNodeValidSub;
+    private _nodeNameChangedSub;
     constructor(_cdr: ChangeDetectorRef, _service: AjfFormBuilderService, _dialog: MatDialog, _fb: UntypedFormBuilder, _nodeNameValidator: AjfNodePropertiesNameMatchValidator);
+    ngOnInit(): void;
     editVisibility(): void;
     editConditionalBranch(idx: number): void;
     editFormulaReps(): void;
@@ -156,7 +159,19 @@ export declare class AjfFbNodeProperties implements OnDestroy {
     forceCheckbox(checked: boolean, checkbox: MatCheckbox): void;
     save(): void;
     cancel(): void;
+    /**
+     * Return error message for the form control
+     * @param formControl
+     * @param fieldName
+     * @returns
+     */
     fieldErrorMessage(formControl: AbstractControl | null, fieldName: string): string | null;
+    /**
+     * Return all form error messages
+     * @param formGroup
+     * @returns
+     */
+    allErrorMessages(formGroup: UntypedFormGroup | null): string | null;
     ngOnDestroy(): void;
     private _initSave;
     private _initForm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ajf/material",
-  "version": "18.0.1",
+  "version": "18.0.3",
   "description": "",
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "homepage": "https://github.com/gnucoop/ajf#readme",
   "peerDependencies": {
-    "@ajf/core": "18.0.1",
+    "@ajf/core": "18.0.3",
     "@angular/animations": "^18.2.13",
     "@angular/cdk": "^18.2.14",
     "@angular/common": "^18.2.13",