@sumaris-net/ngx-components 2.9.6 → 2.9.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "2.9.6",
+  "version": "2.9.8",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",

package/public_api.d.ts

@@ -155,6 +155,8 @@ export * from './src/app/core/services/pipes/person-to-string.pipe';
 export * from './src/app/core/services/pipes/usage-mode.pipes';
 export * from './src/app/core/services/pipes/referential-to-string.pipe';
 export * from './src/app/core/services/pipes/pipes.module';
+export * from './src/app/core/services/base58';
+export * from './src/app/core/services/errors';
 export * from './src/app/core/services/platform.service';
 export * from './src/app/core/services/network.service';
 export * from './src/app/core/services/network.types';
@@ -164,7 +166,6 @@ export * from './src/app/core/services/local-settings.service';
 export * from './src/app/core/services/account.service';
 export * from './src/app/core/services/crypto.service';
 export * from './src/app/core/services/auth-guard.service';
-export * from './src/app/core/services/base58';
 export * from './src/app/core/services/base-graphql-service.class';
 export * from './src/app/core/services/base-entity-service.class';
 export * from './src/app/core/services/storage/entities-storage.service';
@@ -288,7 +289,6 @@ export * from './src/app/shared/audio/audio.testing.module';
 export * from './src/app/core/core.testing.module';
 export * from './src/app/core/services/testing/referential-filter.model';
 export * from './src/app/core/services/testing/referential.validator';
-export * from './src/app/core/services/errors';
 export * from './src/app/core/table/testing/table.testing.module';
 export * from './src/app/core/table/testing/table.testing';
 export * from './src/app/core/table/testing/table2.testing';

package/src/app/admin/services/filter/person.filter.d.ts

@@ -1,8 +1,8 @@
 import { EntityFilter } from '../../../core/services/model/filter.model';
 import { Person } from '../../../core/services/model/person.model';
-import { FilterFn } from '../../../shared/services/entity-service.class';
 import { EntityAsObjectOptions } from '../../../core/services/model/entity.model';
 import { StoreObject } from '@apollo/client/core';
+import { FilterFn } from '../../../shared/types';
 export declare class PersonFilter extends EntityFilter<PersonFilter, Person> {
     static fromObject: (source: any, opts?: any) => PersonFilter;
     static searchFilter(source: any): FilterFn<Person>;

package/src/app/core/form/entity/entity-editor-modal.class.d.ts

@@ -6,10 +6,10 @@ import { Entity } from '../../services/model/entity.model';
 import { UsageMode } from '../../services/model/settings.model';
 import { FormGroup } from '@angular/forms';
 import { AppTabEditor, AppTabEditorOptions } from './tab-editor.class';
+import { AppErrorWithDetails } from '../../services/errors';
 import { DateFormatService } from '../../../shared/pipes/date-format.pipe';
 import { WaitForOptions } from '../../../shared/observables';
 import { FormErrorTranslator } from '../../../shared/validator/form-error-adapter.class';
-import { AppErrorWithDetails } from './entity-editor.class';
 import * as i0 from "@angular/core";
 export interface IEntityEditorModalOptions<T extends Entity<T, ID> = Entity<any, any>, ID = number> {
     isNew: boolean;

package/src/app/core/form/entity/entity-editor.class.d.ts

@@ -6,13 +6,13 @@ import { Entity } from '../../services/model/entity.model';
 import { UsageMode } from '../../services/model/settings.model';
 import { FormGroup } from '@angular/forms';
 import { AppTabEditor, AppTabEditorOptions, IAppTabEditor } from './tab-editor.class';
+import { AppErrorWithDetails } from '../../services/errors';
 import { EntityServiceLoadOptions, IEntityService } from '../../../shared/services/entity-service.class';
 import { DateFormatService } from '../../../shared/pipes/date-format.pipe';
 import { Environment } from '../../../../environments/environment.class';
 import { HistoryPageReference } from '../../services/model/history.model';
 import { WaitForOptions } from '../../../shared/observables';
 import { FormErrorTranslator } from '../../../shared/validator/form-error-adapter.class';
-import { FormErrors } from '../../../shared/forms';
 import * as i0 from "@angular/core";
 export interface IAppEntityEditor<T> extends IAppTabEditor<T> {
     usageMode: UsageMode;
@@ -34,15 +34,6 @@ export declare class AppEditorOptions extends AppTabEditorOptions {
     autoOpenNextTab?: boolean;
     i18nPrefix?: string;
 }
-export interface AppError {
-    code?: number;
-    message?: string;
-}
-export interface AppErrorWithDetails extends AppError {
-    details: AppError & {
-        errors?: FormErrors;
-    };
-}
 export declare abstract class AppEntityEditor<T extends Entity<T, ID>, S extends IEntityService<T, ID> = IEntityService<T, any>, ID = number, LO extends EntityServiceLoadOptions = EntityServiceLoadOptions> extends AppTabEditor<T, ID, LO> implements OnInit, OnDestroy, AfterViewInit, IAppEntityEditor<T> {
     protected dataType: new () => T;
     protected dataService?: S;

package/src/app/core/form/form.utils.d.ts

@@ -2,7 +2,8 @@ import { AbstractControl, AbstractControlOptions, UntypedFormArray, UntypedFormB
 import { Entity } from '../services/model/entity.model';
 import { filterNumberInput, selectInputContent } from '../../shared/inputs';
 import { WaitForOptions } from '../../shared/observables';
-import { addValueInArray, clearValueInArray, copyEntity2Form, disableControls, getControlFromPath, getFormErrors, getFormValueFromEntity, logFormErrors, markAllAsTouched, markAsUntouched, removeValueInArray, resizeArray, updateValueAndValidity, waitIdle, waitWhilePending } from '../../shared/forms';
+import { addValueInArray, clearValueInArray, copyEntity2Form, disableControls, FormErrors, getControlFromPath, getFormErrors, getFormValueFromEntity, logFormErrors, markAllAsTouched, markAsUntouched, removeValueInArray, resizeArray, updateValueAndValidity, waitIdle, waitWhilePending } from '../../shared/forms';
+import { Predicate } from '@angular/core';
 export declare type IAppFormGetter = () => IAppForm;
 export declare interface OnReady {
     ngOnReady(): any;
@@ -321,6 +322,9 @@ export declare class AppFormArray<T extends Entity<T>, C extends AbstractControl
     removeAllEmpty(): void;
     protected setAllowEmptyArray(value: boolean): void;
 }
+/**
+ * Helper class, for angular forms
+ */
 export declare class AppFormUtils {
     static copyEntity2Form: typeof copyEntity2Form;
     static getFormValueFromEntity: typeof getFormValueFromEntity;
@@ -354,6 +358,8 @@ export declare class AppFormUtils {
     static isControlHasInput: typeof isControlHasInput;
     static setCalculatedValue: typeof setCalculatedValue;
     static resetCalculatedValue: typeof resetCalculatedValue;
+    static filterErrorsByPrefix: typeof filterErrorsByPrefix;
+    static filterErrorsByPath: typeof filterErrorsByPath;
 }
 export declare function isControlHasInput(controls: {
     [key: string]: AbstractControl;
@@ -364,3 +370,6 @@ export declare function setCalculatedValue(controls: {
 export declare function resetCalculatedValue(controls: {
     [key: string]: AbstractControl;
 }, controlName: string): void;
+export declare function filterErrorsByPrefix(errors: FormErrors, ...prefixes: string[]): FormErrors;
+export declare function filterErrorsByPath(errors: FormErrors, filter: Predicate<string>): FormErrors;
+export declare function filterErrors(errors: FormErrors, filter: Predicate<[string, any]>): FormErrors;

package/src/app/core/form/properties/properties.table.d.ts

@@ -4,11 +4,10 @@ import { Entity, EntityAsObjectOptions } from '../../services/model/entity.model
 import { AppValidatorService } from '../../services/validator/base.validator.class';
 import { AbstractControl, UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { FormFieldDefinition, FormFieldDefinitionMap } from '../../../shared/form/field.model';
-import { FilterFn } from '../../../shared/services/entity-service.class';
 import { Environment } from '../../../../environments/environment.class';
 import { TableElement } from '@e-is/ngx-material-table';
 import { EntityFilter } from '../../services/model/filter.model';
-import { ObjectMap } from '../../../shared/types';
+import { FilterFn, ObjectMap } from '../../../shared/types';
 import { MatExpansionPanel } from '@angular/material/expansion';
 import * as i0 from "@angular/core";
 interface TranslatedFormFieldDefinition extends FormFieldDefinition {

package/src/app/core/services/errors.d.ts

@@ -1,3 +1,13 @@
+import { FormErrors } from '../../shared/forms';
+export interface AppError {
+    code?: number;
+    message?: string;
+}
+export interface AppErrorWithDetails extends AppError {
+    details: AppError & {
+        errors?: FormErrors;
+    };
+}
 export declare interface ServiceError {
     code: number;
     message: string;

package/src/app/core/services/model/entity.model.d.ts

@@ -1,7 +1,6 @@
 import { Moment } from 'moment';
 import { getPropertyByPath } from '../../../shared/functions';
-import { FilterFn } from '../../../shared/services/entity-service.class';
-import { ObjectMap, ObjectMapEntry, PropertiesArray, PropertiesMap } from '../../../shared/types';
+import { FilterFn, ObjectMap, ObjectMapEntry, PropertiesArray, PropertiesMap } from '../../../shared/types';
 import { StoreObject } from '@apollo/client/core';
 import { TreeItemEntityUtils } from './tree-item-entity.model';
 import { SortDirection } from '@angular/material/sort';

package/src/app/core/services/model/filter.model.d.ts

@@ -1,5 +1,5 @@
 import { Entity, EntityAsObjectOptions, IEntity } from './entity.model';
-import { FilterFn } from '../../../shared/services/entity-service.class';
+import { FilterFn } from '../../../shared/types';
 export interface IEntityFilter<F extends IEntityFilter<F, T, ID, AO, FO>, T extends IEntity<T, any>, ID = number, AO extends EntityAsObjectOptions = EntityAsObjectOptions, FO = any> extends IEntity<F, ID, AO, FO> {
     asPodObject(): any;
     asFilterFn(): FilterFn<T>;

package/src/app/core/services/model/tree-item-entity.model.d.ts

@@ -1,6 +1,6 @@
 import { IEntity } from './entity.model';
-import { FilterFn } from '../../../shared/services/entity-service.class';
 import { EntityFilter } from './filter.model';
+import { FilterFn } from '../../../shared/types';
 export declare interface ITreeItemEntity<T extends IEntity<T, ID>, ID = number> {
     parentId: ID;
     parent: T;

package/src/app/core/services/testing/referential-filter.model.d.ts

@@ -1,6 +1,6 @@
 import { EntityFilter } from '../model/filter.model';
 import { Referential } from '../model/referential.model';
-import { FilterFn } from '../../../shared/services/entity-service.class';
+import { FilterFn } from '../../../shared/types';
 export declare class ReferentialFilter extends EntityFilter<ReferentialFilter, Referential> {
     static fromObject: (source: any, opts?: any) => ReferentialFilter;
     searchText: string;

package/src/app/shared/services/entity-service.class.d.ts

@@ -22,8 +22,6 @@ export declare type SuggestFn<T, F> = (value: any, filter?: F, sortBy?: string |
 export declare interface SuggestService<T, F> {
     suggest: SuggestFn<T, F>;
 }
-export declare type FilterFn<T> = (data: T) => boolean;
-export declare type FilterFnFactory<T, F> = (filter: F) => FilterFn<T>;
 export declare interface EntityServiceLoadOptions {
     fetchPolicy?: FetchPolicy;
     trash?: boolean;

package/src/app/shared/services/memory-entity-service.class.d.ts

@@ -1,10 +1,11 @@
 import { BehaviorSubject, Observable } from 'rxjs';
-import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, FilterFn, FilterFnFactory, IEntitiesService, LoadResult } from './entity-service.class';
+import { EntitiesServiceLoadOptions, EntitiesServiceWatchOptions, IEntitiesService, LoadResult } from './entity-service.class';
 import { SortDirection } from '@angular/material/sort';
 import { OnDestroy } from '@angular/core';
 import { IEntity } from '../../core/services/model/entity.model';
 import { WaitForOptions } from '../observables';
 import { StartableObservableService } from './startable-observable-service.class';
+import { FilterFn, FilterFnFactory } from '../types';
 import * as i0 from "@angular/core";
 export interface InMemoryEntitiesServiceOptions<T, F> {
     onSort?: (data: T[], sortBy?: string, sortDirection?: SortDirection) => T[];

package/src/app/shared/types.d.ts

@@ -1,5 +1,6 @@
 import { ThemePalette } from '@angular/material/core';
 import { PredefinedColors } from '@ionic/core';
+import { Predicate } from '@angular/core';
 export declare type KeyType = string | number;
 export declare type KeyValueType<T> = {
     [key in KeyType]: T;
@@ -24,3 +25,5 @@ export declare interface IconRef {
     matSvgIcon?: string;
     color?: AppColors;
 }
+export declare type FilterFn<T> = Predicate<T>;
+export declare type FilterFnFactory<T, F> = (filter: F) => FilterFn<T>;

package/src/app/social/message/message.model.d.ts

@@ -1,9 +1,9 @@
 import { Entity, EntityAsObjectOptions } from '../../core/services/model/entity.model';
 import { StoreObject } from '@apollo/client/core';
 import { EntityFilter } from '../../core/services/model/filter.model';
-import { FilterFn } from '../../shared/services/entity-service.class';
 import { Person } from '../../core/services/model/person.model';
 import { PersonFilter } from '../../admin/services/filter/person.filter';
+import { FilterFn } from '../../shared/types';
 export declare const MessageTypes: {
     INBOX_MESSAGE: string;
     EMAIL: string;

package/src/app/social/user-event/testing/user-event.testing.model.d.ts

@@ -1,9 +1,8 @@
 import { Entity, EntityAsObjectOptions } from '../../../core/services/model/entity.model';
 import { Moment } from 'moment';
-import { IconRef } from '../../../shared/types';
-import { EventLevel, IUserEvent, IUserEventFilter, IUserEventAction } from '../user-event.model';
+import { FilterFn, IconRef } from '../../../shared/types';
+import { EventLevel, IUserEvent, IUserEventAction, IUserEventFilter } from '../user-event.model';
 import { EntityFilter } from '../../../core/services/model/filter.model';
-import { FilterFn } from '../../../shared/services/entity-service.class';
 import { StoreObject } from '@apollo/client/core';
 export declare class UserEventTest extends Entity<UserEventTest> implements IUserEvent<UserEventTest> {
     static fromObject: (source: any, opts?: any) => UserEventTest;

package/src/assets/manifest.json

@@ -2,7 +2,7 @@
   "name": "ngx-sumaris-components",
   "short_name": "ngx-sumaris-components",
   "manifest_version": 1,
-  "version": "2.9.6",
+  "version": "2.9.8",
   "default_locale": "fr",
   "description": "Angular components for building beautiful and responsive Apps",
   "icons": [{

package/src/theme/_ngx-components.forms.scss

@@ -191,25 +191,64 @@ ion-grid.form-container {
     padding: 0;
 
     & > ion-col {
-
       // No top/bottom padding between grid cell
       padding-bottom: 0;
       padding-top: 0;
 
       & > ion-label {
         color: var(--ion-color-primary100);
-        padding-inline-end: 5px;
-        line-height: 1rem;
       }
 
-      & > ion-label[text-wrap] {
+      & > ion-label[text-wrap],
+      & > ion-label.ion-text-wrap {
         word-wrap: normal;
         white-space: normal;
+        line-height: 1rem !important;
       }
     }
   }
 }
 
+
+// --------------------------------------------------
+// Forms
+// --------------------------------------------------
+// On small screen, align label on left
+@media screen and (max-width: $screen-sm-max) {
+  form.form-container > ion-grid,
+  ion-grid.form-container {
+    ion-col > ion-label.ion-float-center,
+    ion-col > ion-label.ion-float-end {
+      display: block;
+      width: 100%;
+      text-align: start !important;
+      line-height: 37px;
+      min-height: 37px;
+      margin-top: 0;
+      margin-bottom: 0;
+      margin-right: 0;
+    }
+  }
+}
+
+// On large screen, align label on right
+@media screen and (min-width: $screen-md) {
+
+  form.form-container > ion-grid,
+  ion-grid.form-container {
+   ion-col > ion-label.ion-float-center,
+   ion-col > ion-label.ion-float-end {
+      display: block;
+      text-align: end !important;
+      min-height: var(--mat-form-field-container-height, 45px);
+      margin-top: 11px;
+      margin-bottom: 11px;
+      padding-inline-end: 5px;
+    }
+  }
+}
+
+
 // TODO: activer ce code et tester les mat-select en dark mode
 //html {
 //  div.mat-mdc-select-panel {

package/src/theme/_responsive.scss

@@ -326,37 +326,6 @@ body {
   }
 }
 
-// --------------------------------------------------
-// Forms
-// --------------------------------------------------
-// On small screen, align label on left
-@media screen and (max-width: $screen-sm-max) {
-  form ion-col>ion-label.ion-float-center,
-  form ion-col>ion-label.ion-float-end {
-    display: block;
-    width: 100%;
-    text-align: start !important;
-    line-height: 37px;
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-right: 0;
-    //padding-left: var(--ion-label-padding, 11px);
-    //background-color: var(--ion-color-light);
-  }
-}
-
-// On large screen, align label on right
-@media screen and (min-width: $screen-md) {
-  form ion-col > ion-label.ion-float-center,
-  form ion-col > ion-label.ion-float-end {
-    display: block;
-    text-align: end !important;
-    line-height: 37px;
-    margin-top: 11px;
-    margin-bottom: 11px;
-  }
-}
-
 // --------------------------------------------------
 // Modals
 // --------------------------------------------------