@energycap/components 0.39.20-ECAP-25651-popover-utility-classes.20240723-1028 → 0.39.21-ECAP-25650-file-upload-validation-support.20240802-1011

package/fesm2020/energycap-components.mjs

@@ -7,7 +7,7 @@ import { DOCUMENT, CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Component, HostBinding, Input, Output, ViewChild, Directive, Host, Pipe, HostListener, Inject, ElementRef, ViewEncapsulation, ContentChild, TemplateRef, ViewContainerRef, ContentChildren, NgModule, Injector } from '@angular/core';
 import * as i4 from '@angular/forms';
-import { Validators, UntypedFormControl, FormControlDirective, UntypedFormGroup, UntypedFormArray, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { Validators, UntypedFormControl, FormControlDirective, UntypedFormGroup, UntypedFormArray, FormGroup, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import * as i1$2 from '@angular/router';
 import { NavigationEnd, convertToParamMap, NavigationStart, Router, RouterModule, ActivatedRoute } from '@angular/router';
 import * as i2 from '@ngx-translate/core';
@@ -734,6 +734,9 @@ class ValidationMessageService {
                     case 'domain':
                         translationObservables.push(this.translate.get('DomainValidationMessage_SC'));
                         break;
+                    case 'invalidFile':
+                        translationObservables.push(this.translate.get('is invalid'));
+                        break;
                     default:
                         break;
                 }
@@ -4104,11 +4107,11 @@ const FileTypeExtensions = {
 class FileUploadComponent extends FormControlBase {
     // static class to create the form group from a parent component
     static getFormModel(validators, disabled = false) {
-        let formGroup = new UntypedFormGroup({
-            file: new UntypedFormControl({ value: null, disabled: disabled }, validators),
-            name: new UntypedFormControl({ value: null, disabled: disabled }, validators),
-            base64FileString: new UntypedFormControl(null),
-            uploadResult: new UntypedFormControl(null),
+        let formGroup = new FormGroup({
+            file: new FormControl({ value: null, disabled: disabled }, validators),
+            name: new FormControl({ value: null, disabled: disabled }, validators),
+            base64FileString: new FormControl(null),
+            uploadResult: new FormControl(null),
         });
         if (disabled) {
             formGroup.disable();
@@ -4202,7 +4205,13 @@ class FileUploadComponent extends FormControlBase {
      * @param base64FileString Optional: Will have a value provided if the fileOutput is set to base64
      */
     async processFile(file, base64FileString) {
-        if (this.onFileSelected) {
+        this.patchFileResult(file, base64FileString);
+        // If we have any async validators pending we need to wait for them to complete before we know if the form is valid
+        if (this.formModel.pending) {
+            await this.formModel.statusChanges.pipe(filter(status => status !== 'PENDING'), take(1), takeUntil(this.componentDestroyed)).toPromise();
+        }
+        // Only call the onFileSelected callback to upload the file if the form is valid
+        if (this.onFileSelected && this.formModel.valid) {
             try {
                 let result = await this.onFileSelected(file);
                 this.patchFileResult(file, base64FileString, result);
@@ -4212,9 +4221,6 @@ class FileUploadComponent extends FormControlBase {
                 // We are not patching any of the result so any existing information remains
             }
         }
-        else {
-            this.patchFileResult(file, base64FileString);
-        }
     }
     /**
      * Based on the fileOutput return whether this component is expected to deliver a base64 output
@@ -4273,11 +4279,13 @@ class FileUploadComponent extends FormControlBase {
     }
 }
 FileUploadComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: FileUploadComponent, deps: [{ token: ValidationMessageService }, { token: FormGroupHelper }], target: i0.ɵɵFactoryTarget.Component });
-FileUploadComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: FileUploadComponent, selector: "ec-file-upload", inputs: { placeholder: "placeholder", fileType: "fileType", fileOutput: "fileOutput", customExtensions: "customExtensions", onFileSelected: "onFileSelected", onMultipleFilesSelected: "onMultipleFilesSelected", displayType: "displayType", buttonLabel: "buttonLabel", buttonType: "buttonType", multiSelect: "multiSelect" }, viewQueries: [{ propertyName: "fileInput", first: true, predicate: ["fileInput"], descendants: true, read: ElementRef, static: true }], usesInheritance: true, usesOnChanges: true, ngImport: i0, template: "<ec-form-group [label]=\"label\"\r\n               [formGroup]=\"formModel\"\r\n               [helpPopover]=\"helpPopover\"\r\n               [helpPopoverPosition]=\"helpPopoverPosition\"\r\n               class=\"mb-0\">\r\n  <div class=\"d-flex control-group\">\r\n    <div class=\"d-flex flex-grow position-relative\">\r\n      <input #fileInput\r\n             id=\"{{inputId}}_input\"\r\n             type=\"file\"\r\n             tabindex=\"-1\"\r\n             [attr.accept]=\"fileTypeAccept\"\r\n             (change)=\"fileChange($event.target.files)\"\r\n             [class.has-value]=\"displayType === 'file' ? formModel?.get('name').value : undefined\"\r\n             [attr.multiple]=\"multiSelect ? 'multiple' : undefined\">\r\n            <ec-form-control *ngIf=\"displayType === 'file'\"\r\n                       id=\"{{inputId}}_formControl\"\r\n                       class=\"text-truncate\"\r\n                       [required]=\"required\"\r\n                       [pending]=\"pending\">\r\n        <input id=\"{{inputId}}_name\"\r\n               [formControl]=\"formModel?.get('name')\"\r\n               type=\"text\"\r\n               [placeholder]=\"placeholder\"\r\n               [tabindex]=\"-1\">\r\n      </ec-form-control>\r\n    </div>\r\n    <ec-button *ngIf=\"displayType === 'file'\"\r\n               #browseBtn\r\n               id=\"{{inputId}}_browseBtn\"\r\n               (clicked)=\"fileInput.click()\"\r\n               type=\"secondary\"\r\n               [tabindex]=\"tabindex\"\r\n               [disabled]=\"formModel?.get('name').disabled\"\r\n               label=\"Browse\"\r\n               [autofocus]=\"autofocus\">\r\n    </ec-button>\r\n  </div>\r\n  <ec-button *ngIf=\"displayType === 'button'\"\r\n             id=\"{{inputId}}_btn\"\r\n             [pending]=\"pending\"\r\n             [type]=\"buttonType\"\r\n             [label]=\"buttonLabel ?? 'Browse_TC' | translate\"\r\n             (clicked)=\"fileInput.click()\"\r\n             style=\"width: 100%;\">\r\n  </ec-button>\r\n</ec-form-group>", styles: [":host{display:block;margin-bottom:1rem}ec-form-control{margin-bottom:0}ec-form-control ::ng-deep>.ec-focus-ring{display:none!important}input[type=file]{opacity:0;display:block;position:absolute;top:0;left:0;width:100%;height:100%;z-index:1;cursor:pointer}input[type=file].has-value{width:calc(100% - 1.5rem)}ec-button{--ec-button-border-color-secondary: var(--ec-form-control-border-color);--ec-button-color-icon-secondary: var(--ec-color-icon)}\n"], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i4.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i4.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "directive", type: i4.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "component", type: ButtonComponent, selector: "ec-button", inputs: ["id", "disabled", "icon", "label", "badge", "tabindex", "type", "pending", "pendingIcon", "customTemplate", "isSubmit", "autofocus"], outputs: ["clicked"] }, { kind: "component", type: FormControlComponent, selector: "ec-form-control", inputs: ["id", "icon", "actionIcon", "showClear", "pending", "required", "readonly"], outputs: ["actionClicked"] }, { kind: "component", type: FormGroupComponent, selector: "ec-form-group", inputs: ["id", "label", "formGroup", "labelPosition", "overrideValidationError", "hideValidationMessage", "helpPopover", "helpPopoverPosition"] }, { kind: "pipe", type: i2.TranslatePipe, name: "translate" }] });
+FileUploadComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: FileUploadComponent, selector: "ec-file-upload", inputs: { formModel: "formModel", placeholder: "placeholder", fileType: "fileType", fileOutput: "fileOutput", customExtensions: "customExtensions", onFileSelected: "onFileSelected", onMultipleFilesSelected: "onMultipleFilesSelected", displayType: "displayType", buttonLabel: "buttonLabel", buttonType: "buttonType", multiSelect: "multiSelect" }, viewQueries: [{ propertyName: "fileInput", first: true, predicate: ["fileInput"], descendants: true, read: ElementRef, static: true }], usesInheritance: true, usesOnChanges: true, ngImport: i0, template: "<ec-form-group [label]=\"label\"\r\n               [formGroup]=\"formModel\"\r\n               [helpPopover]=\"helpPopover\"\r\n               [helpPopoverPosition]=\"helpPopoverPosition\"\r\n               class=\"mb-0\">\r\n  <div class=\"d-flex control-group\">\r\n    <div class=\"d-flex flex-grow position-relative\">\r\n      <input #fileInput\r\n             id=\"{{inputId}}_input\"\r\n             type=\"file\"\r\n             tabindex=\"-1\"\r\n             [attr.accept]=\"fileTypeAccept\"\r\n             (change)=\"fileChange($event.target.files)\"\r\n             [class.has-value]=\"displayType === 'file' ? formModel?.get('name').value : undefined\"\r\n             [attr.multiple]=\"multiSelect ? 'multiple' : undefined\">\r\n            <ec-form-control *ngIf=\"displayType === 'file'\"\r\n                       id=\"{{inputId}}_formControl\"\r\n                       class=\"text-truncate\"\r\n                       [required]=\"required\"\r\n                       [pending]=\"pending\">\r\n        <input id=\"{{inputId}}_name\"\r\n               [formControl]=\"formModel?.get('name')\"\r\n               type=\"text\"\r\n               [placeholder]=\"placeholder\"\r\n               [tabindex]=\"-1\">\r\n      </ec-form-control>\r\n    </div>\r\n    <ec-button *ngIf=\"displayType === 'file'\"\r\n               #browseBtn\r\n               id=\"{{inputId}}_browseBtn\"\r\n               (clicked)=\"fileInput.click()\"\r\n               type=\"secondary\"\r\n               [tabindex]=\"tabindex\"\r\n               [disabled]=\"formModel?.get('name').disabled\"\r\n               label=\"Browse\"\r\n               [autofocus]=\"autofocus\">\r\n    </ec-button>\r\n  </div>\r\n  <ec-button *ngIf=\"displayType === 'button'\"\r\n             id=\"{{inputId}}_btn\"\r\n             [pending]=\"pending\"\r\n             [type]=\"buttonType\"\r\n             [label]=\"buttonLabel ?? 'Browse_TC' | translate\"\r\n             (clicked)=\"fileInput.click()\"\r\n             style=\"width: 100%;\">\r\n  </ec-button>\r\n</ec-form-group>", styles: [":host{display:block;margin-bottom:1rem}ec-form-control{margin-bottom:0}ec-form-control ::ng-deep>.ec-focus-ring{display:none!important}input[type=file]{opacity:0;display:block;position:absolute;top:0;left:0;width:100%;height:100%;z-index:1;cursor:pointer}input[type=file].has-value{width:calc(100% - 1.5rem)}ec-button{--ec-button-border-color-secondary: var(--ec-form-control-border-color);--ec-button-color-icon-secondary: var(--ec-color-icon)}\n"], dependencies: [{ kind: "directive", type: i1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i4.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i4.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "directive", type: i4.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "component", type: ButtonComponent, selector: "ec-button", inputs: ["id", "disabled", "icon", "label", "badge", "tabindex", "type", "pending", "pendingIcon", "customTemplate", "isSubmit", "autofocus"], outputs: ["clicked"] }, { kind: "component", type: FormControlComponent, selector: "ec-form-control", inputs: ["id", "icon", "actionIcon", "showClear", "pending", "required", "readonly"], outputs: ["actionClicked"] }, { kind: "component", type: FormGroupComponent, selector: "ec-form-group", inputs: ["id", "label", "formGroup", "labelPosition", "overrideValidationError", "hideValidationMessage", "helpPopover", "helpPopoverPosition"] }, { kind: "pipe", type: i2.TranslatePipe, name: "translate" }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: FileUploadComponent, decorators: [{
             type: Component,
             args: [{ selector: "ec-file-upload", template: "<ec-form-group [label]=\"label\"\r\n               [formGroup]=\"formModel\"\r\n               [helpPopover]=\"helpPopover\"\r\n               [helpPopoverPosition]=\"helpPopoverPosition\"\r\n               class=\"mb-0\">\r\n  <div class=\"d-flex control-group\">\r\n    <div class=\"d-flex flex-grow position-relative\">\r\n      <input #fileInput\r\n             id=\"{{inputId}}_input\"\r\n             type=\"file\"\r\n             tabindex=\"-1\"\r\n             [attr.accept]=\"fileTypeAccept\"\r\n             (change)=\"fileChange($event.target.files)\"\r\n             [class.has-value]=\"displayType === 'file' ? formModel?.get('name').value : undefined\"\r\n             [attr.multiple]=\"multiSelect ? 'multiple' : undefined\">\r\n            <ec-form-control *ngIf=\"displayType === 'file'\"\r\n                       id=\"{{inputId}}_formControl\"\r\n                       class=\"text-truncate\"\r\n                       [required]=\"required\"\r\n                       [pending]=\"pending\">\r\n        <input id=\"{{inputId}}_name\"\r\n               [formControl]=\"formModel?.get('name')\"\r\n               type=\"text\"\r\n               [placeholder]=\"placeholder\"\r\n               [tabindex]=\"-1\">\r\n      </ec-form-control>\r\n    </div>\r\n    <ec-button *ngIf=\"displayType === 'file'\"\r\n               #browseBtn\r\n               id=\"{{inputId}}_browseBtn\"\r\n               (clicked)=\"fileInput.click()\"\r\n               type=\"secondary\"\r\n               [tabindex]=\"tabindex\"\r\n               [disabled]=\"formModel?.get('name').disabled\"\r\n               label=\"Browse\"\r\n               [autofocus]=\"autofocus\">\r\n    </ec-button>\r\n  </div>\r\n  <ec-button *ngIf=\"displayType === 'button'\"\r\n             id=\"{{inputId}}_btn\"\r\n             [pending]=\"pending\"\r\n             [type]=\"buttonType\"\r\n             [label]=\"buttonLabel ?? 'Browse_TC' | translate\"\r\n             (clicked)=\"fileInput.click()\"\r\n             style=\"width: 100%;\">\r\n  </ec-button>\r\n</ec-form-group>", styles: [":host{display:block;margin-bottom:1rem}ec-form-control{margin-bottom:0}ec-form-control ::ng-deep>.ec-focus-ring{display:none!important}input[type=file]{opacity:0;display:block;position:absolute;top:0;left:0;width:100%;height:100%;z-index:1;cursor:pointer}input[type=file].has-value{width:calc(100% - 1.5rem)}ec-button{--ec-button-border-color-secondary: var(--ec-form-control-border-color);--ec-button-color-icon-secondary: var(--ec-color-icon)}\n"] }]
-        }], ctorParameters: function () { return [{ type: ValidationMessageService }, { type: FormGroupHelper }]; }, propDecorators: { placeholder: [{
+        }], ctorParameters: function () { return [{ type: ValidationMessageService }, { type: FormGroupHelper }]; }, propDecorators: { formModel: [{
+                type: Input
+            }], placeholder: [{
                 type: Input
             }], fileType: [{
                 type: Input
@@ -10579,6 +10587,10 @@ class PageBaseComponent {
      */
     async onSave(event) {
         this.formGroup.markAllAsTouched();
+        // If the form has pending async validators, wait for it them to complete before proceeding
+        if (this.formGroup.pending) {
+            await this.formGroup.statusChanges.pipe(filter(status => status !== 'PENDING'), take(1), takeUntil(this.destroyed)).toPromise();
+        }
         if (this.formGroup.valid) {
             await this.save();
         }