@sumaris-net/ngx-components 2.0.0-rc3 → 2.0.0-rc4

package/package.json

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

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

@@ -88,6 +88,7 @@ export declare abstract class AppEditor<T = any, ID = number, O = any> implement
     get error(): string;
     set error(error: string);
     get saving(): boolean;
+    get destroyed(): boolean;
     toolbar: ToolbarToken | null;
     formButtonsBar: FormButtonsBarToken | null;
     content: IonContent;

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

@@ -13,11 +13,12 @@ import { FormErrorTranslator } from '../../shared/validator/form-error-adapter.c
 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> {
-    usageMode: UsageMode;
+    isNew: boolean;
     data: T;
     disabled: boolean;
     onAfterModalInit?: <M extends AppEntityEditorModal<T, ID>>(modal: M) => void | Promise<void>;
     onDelete?: (event: Event, data: T) => Promise<boolean>;
+    usageMode: UsageMode;
     mobile: boolean;
     i18nSuffix?: string;
 }
@@ -28,7 +29,7 @@ export declare abstract class AppEntityEditorModal<T extends Entity<T, ID>, ID =
     protected dataType: new () => T;
     private _usageMode;
     protected _logPrefix: any;
-    protected _isNewData: boolean;
+    protected _isNew: boolean;
     protected readonly dateFormat: DateFormatPipe;
     protected readonly cd: ChangeDetectorRef;
     protected readonly settings: LocalSettingsService;
@@ -43,8 +44,16 @@ export declare abstract class AppEntityEditorModal<T extends Entity<T, ID>, ID =
     onAfterModalInit: <M extends AppEntityEditorModal<T, ID>>(modal: M) => void | Promise<void>;
     onDelete: (event: Event, data: T) => Promise<boolean>;
     i18nSuffix: string;
-    set isNewData(value: boolean);
+    set isNew(value: boolean);
+    get isNew(): boolean;
+    /**
+     * @deprecated use isNew instead
+     */
     get isNewData(): boolean;
+    /**
+     * @deprecated use isNew instead
+     */
+    set isNewData(value: boolean);
     set disabled(value: boolean);
     get disabled(): boolean;
     get isOnFieldMode(): boolean;
@@ -118,5 +127,5 @@ export declare abstract class AppEntityEditorModal<T extends Entity<T, ID>, ID =
      */
     private openFirstInvalidTab;
     static ɵfac: i0.ɵɵFactoryDeclaration<AppEntityEditorModal<any, any, any>, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<AppEntityEditorModal<any, any, any>, never, never, { "data": "data"; "mobile": "mobile"; "usageMode": "usageMode"; "onAfterModalInit": "onAfterModalInit"; "onDelete": "onDelete"; "i18nSuffix": "i18nSuffix"; "isNewData": "isNewData"; "disabled": "disabled"; }, {}, never, never, false>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<AppEntityEditorModal<any, any, any>, never, never, { "data": "data"; "mobile": "mobile"; "usageMode": "usageMode"; "onAfterModalInit": "onAfterModalInit"; "onDelete": "onDelete"; "i18nSuffix": "i18nSuffix"; "isNew": "isNew"; "isNewData": "isNewData"; "disabled": "disabled"; }, {}, never, never, false>;
 }

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

@@ -63,6 +63,7 @@ export declare abstract class AppForm<T> implements IAppForm, OnInit, OnDestroy,
         onlySelf?: boolean;
         emitEvent?: boolean;
     }): void;
+    get destroyed(): boolean;
     debug: boolean;
     tabindex: number;
     errorTranslatorOptions: FormErrorTranslatorOptions;

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

@@ -2,7 +2,7 @@ import { AbstractControl, UntypedFormArray, UntypedFormBuilder, UntypedFormGroup
 import { Entity } from '../services/model/entity.model';
 import { filterNumberInput, selectInputContent } from '../../shared/inputs';
 import { WaitForOptions } from '../../shared/observables';
-import { pushValueInArray, clearValueInArray, copyEntity2Form, disableControls, getControlFromPath, getFormErrors, getFormValueFromEntity, logFormErrors, markAllAsTouched, markAsUntouched, removeValueInArray, resizeArray, updateValueAndValidity, waitIdle, waitWhilePending } from '../../shared/forms';
+import { clearValueInArray, copyEntity2Form, disableControls, getControlFromPath, getFormErrors, getFormValueFromEntity, logFormErrors, markAllAsTouched, markAsUntouched, pushValueInArray, removeValueInArray, resizeArray, updateValueAndValidity, waitIdle, waitWhilePending } from '../../shared/forms';
 export declare type IAppFormGetter = () => IAppForm;
 export declare interface OnReady {
     ngOnReady(): any;
@@ -258,7 +258,7 @@ export declare class AppFormUtils {
     static updateValueAndValidity: typeof updateValueAndValidity;
     static getFormErrors: typeof getFormErrors;
     static isForm(object: any): object is IAppForm;
-    static addValueInArray: typeof pushValueInArray;
+    static pushValueInArray: typeof pushValueInArray;
     static removeValueInArray: typeof removeValueInArray;
     static resizeArray: typeof resizeArray;
     static clearValueInArray: typeof clearValueInArray;

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

@@ -1,5 +1,6 @@
 import { Moment } from 'moment';
 import { Entity, EntityAsObjectOptions, IEntity } from './entity.model';
+import { IconRef } from '../../../shared/types';
 export declare function referentialToString(obj: Referential | any, properties?: string[]): string | undefined;
 export declare function referentialsToString(values: Referential[], properties?: string[], separator?: string): string;
 export declare interface IStatus {
@@ -8,7 +9,7 @@ export declare interface IStatus {
     label: string;
 }
 export declare const StatusList: Readonly<IStatus[]>;
-export declare const StatusById: Readonly<import("@sumaris-net/ngx-components").KeyValueType<IStatus>>;
+export declare const StatusById: Readonly<import("../../../shared/types").KeyValueType<IStatus>>;
 export declare interface IReferentialRef<T extends IEntity<T, ID> = IEntity<any, any>, ID = number> extends IEntity<T, ID> {
     label: string;
     name: string;
@@ -16,6 +17,7 @@ export declare interface IReferentialRef<T extends IEntity<T, ID> = IEntity<any,
     levelId?: number;
     statusId: number;
     entityName: string;
+    icon?: IconRef;
 }
 export declare abstract class BaseReferential<T extends BaseReferential<T, ID, AO>, ID = number, AO extends ReferentialAsObjectOptions = ReferentialAsObjectOptions, FO = any> extends Entity<T, ID, AO, FO> implements IReferentialRef<T, ID> {
     label: string;
@@ -28,6 +30,7 @@ export declare abstract class BaseReferential<T extends BaseReferential<T, ID, A
     levelId: number;
     parentId: number;
     entityName: string;
+    icon?: IconRef;
     constructor(__typename?: string);
     asObject(opts?: AO): any;
     fromObject(source: any, opts?: FO): void;
@@ -44,6 +47,7 @@ export declare class ReferentialUtils {
 }
 export interface ReferentialAsObjectOptions extends EntityAsObjectOptions {
     keepEntityName?: boolean;
+    keepIcon?: boolean;
 }
 /**
  * Used to store an entity locally
@@ -61,6 +65,7 @@ export declare class ReferentialRef<T extends ReferentialRef<any, ID> = Referent
     statusId: number;
     levelId: number;
     entityName: string;
+    icon?: IconRef;
     constructor();
     asObject(opts?: O): any;
     fromObject(source: any, opts?: FO): void;

package/src/app/core/table/table.class.d.ts

@@ -14,13 +14,13 @@ import { Location } from '@angular/common';
 import { IAppForm } from '../form/form.utils';
 import { LocalSettingsService } from '../services/local-settings.service';
 import { TranslateService } from '@ngx-translate/core';
+import { MatAutocompleteConfigHolder, MatAutocompleteFieldAddOptions, MatAutocompleteFieldConfig } from '../../shared/material/autocomplete/material.autocomplete.config';
 import { CompletableEvent } from '../../shared/events';
 import { WaitForOptions } from '../../shared/observables';
 import { ShowToastOptions } from '../../shared/toast/toasts';
 import { CdkColumnDef } from '@angular/cdk/table';
 import { LoadResult } from '../../shared/services/entity-service.class';
 import { FormErrorTranslator, FormErrorTranslatorOptions, IFormControlPathTranslator } from '../../shared/validator/form-error-adapter.class';
-import { MatAutocompleteConfigHolder, MatAutocompleteFieldAddOptions, MatAutocompleteFieldConfig } from '../../shared/material/autocomplete/material.autocomplete.config';
 import * as i0 from "@angular/core";
 export declare const SETTINGS_DISPLAY_COLUMNS = "displayColumns";
 export declare const SETTINGS_SORTED_COLUMN = "sortedColumn";
@@ -41,7 +41,7 @@ export interface IModalDetailOptions<T = any> {
     isNew: boolean;
     data: T;
     disabled: boolean;
-    onDelete?: (event: Event, data: T) => Promise<boolean>;
+    onDelete?: (event: UIEvent, data: T) => Promise<boolean>;
 }
 export declare type SaveActionType = 'delete' | 'sort' | 'filter';
 export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = number> implements OnInit, OnDestroy, AfterViewInit, IAppForm, IFormControlPathTranslator {
@@ -126,6 +126,10 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     get filter(): F;
     get empty(): boolean;
     onRefresh: EventEmitter<any>;
+    onOpenIdAndRow: EventEmitter<{
+        id: ID;
+        row: TableElement<T>;
+    }>;
     onOpenRow: EventEmitter<TableElement<T>>;
     onNewRow: EventEmitter<any>;
     onStartEditingRow: EventEmitter<TableElement<T>>;
@@ -215,6 +219,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     private _paginator;
     set paginator(value: MatPaginator);
     get paginator(): MatPaginator;
+    get destroyed(): boolean;
     table: MatTable<T>;
     childPaginator: MatPaginator;
     sort: MatSort;
@@ -232,20 +237,20 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     setFilter(filter: F, opts?: {
         emitEvent?: boolean;
     }): void;
-    confirmAndAdd(event?: Event, row?: TableElement<T>): Promise<boolean>;
-    confirmAndBackward(event?: Event, row?: TableElement<T>): Promise<boolean>;
-    confirmAndForward(event?: Event, row?: TableElement<T>): Promise<boolean>;
+    confirmAndAdd(event?: Event, row?: TableElement<T>): boolean | Promise<boolean>;
+    confirmAndBackward(event?: Event, row?: TableElement<T>): boolean;
+    confirmAndForward(event?: Event, row?: TableElement<T>): boolean | Promise<boolean>;
     /**
      * Confirm the creation of the given row, or if not specified the currently edited row
      *
      * @param event
      * @param row
      */
-    confirmEditCreate(event?: Event, row?: TableElement<T>): Promise<boolean>;
-    cancelOrDelete(event: Event | undefined, row: TableElement<T>, opts?: {
+    confirmEditCreate(event?: Event, row?: TableElement<T>): boolean;
+    cancelOrDelete(event: Event, row: TableElement<T>, opts?: {
         interactive?: boolean;
         keepEditing?: boolean;
-    }): Promise<boolean>;
+    }): void;
     addRow(event?: Event, insertAt?: number, opts?: {
         focusColumn?: string;
         editing?: boolean;
@@ -255,7 +260,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     }): Promise<boolean>;
     cancel(event?: Event, opts?: {
         interactive?: boolean;
-    }): Promise<boolean>;
+    }): void;
     duplicateRow(event?: Event, row?: TableElement<T>, opts?: {
         skipProperties?: string[];
     }): Promise<boolean>;
@@ -263,7 +268,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     isAllSelected(): boolean;
     /** Selects all rows if they are not all selected; otherwise clear selection. */
     masterToggle(): Promise<void>;
-    deleteSelection(event: Event): Promise<number>;
+    deleteSelection(event: UIEvent): Promise<number>;
     /**
      *
      * @param event
@@ -271,7 +276,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
      * @param opts Use interactive=false to avoid user interaction (e.g. user confirmation)
      *  And to force deletion even if table is busy
      */
-    deleteRow(event: Event | null, row: TableElement<T>, opts?: {
+    deleteRow(event: UIEvent | null, row: TableElement<T>, opts?: {
         interactive?: boolean;
     }): Promise<boolean>;
     /**
@@ -281,7 +286,7 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
      * @param opts Use interactive=false to avoid user interaction (e.g. user confirmation)
      *    And to force deletion even if table is busy
      */
-    deleteRows(event: Event | null, rows: TableElement<T>[], opts?: {
+    deleteRows(event: UIEvent | null, rows: TableElement<T>[], opts?: {
         interactive?: boolean;
     }): Promise<number>;
     selectRowById(id: number): Promise<boolean>;
@@ -290,19 +295,19 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
      * @param data
      */
     selectRowByData(data: T): Promise<boolean>;
-    clickRow(event: Event | undefined, row: TableElement<T>): Promise<boolean>;
-    moveRow(id: number, direction: number): Promise<boolean>;
+    clickRow(event: UIEvent | undefined, row: TableElement<T>): boolean;
+    moveRow(id: number, direction: number): void;
     ready(opts?: WaitForOptions): Promise<void>;
     waitIdle(opts?: WaitForOptions): Promise<void>;
     openSelectColumnsModal(event?: Event): Promise<any>;
     trackByFn(index: number, row: TableElement<T>): number;
     doRefresh(event?: CompletableEvent): void;
     getCurrentColumns(): ColumnItem[];
-    escapeEditingRow(event?: Event, row?: TableElement<T>): Promise<boolean>;
+    escapeEditingRow(event?: Event, row?: TableElement<T>): void;
     translateControlPath(path: string): string;
-    protected startEditRow(event: Event | undefined, row: TableElement<T>, opts?: {
+    protected editRow(event: Event | undefined, row: TableElement<T>, opts?: {
         focusColumn?: string;
-    }): Promise<boolean>;
+    }): boolean;
     /**
      * Try to select row, by row.id, or by data. WIll use EntityUtils.equals()
      * @param id
@@ -328,8 +333,8 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
      * @param row
      * @protected
      */
-    protected openRowDetail(row: TableElement<T>): Promise<boolean>;
-    protected openNewRowDetail(event?: Event): Promise<boolean>;
+    protected openRow(id: ID, row: TableElement<T>): Promise<boolean>;
+    protected openNewRowDetail(event?: any): Promise<boolean>;
     protected getRequiredColumns(): string[];
     protected getUserColumns(): string[];
     protected getSortedColumn(): MatSortable;
@@ -346,11 +351,11 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     protected registerAutocompleteField<E = any, EF = any>(fieldName: string, options?: MatAutocompleteFieldAddOptions<E, EF>): MatAutocompleteFieldConfig<E, EF>;
     protected getI18nColumnName(columnName: string): string;
     protected generateTableId(): string;
-    protected createNewRow(insertAt?: number, opts?: {
+    protected addRowToTable(insertAt?: number, opts?: {
         focusColumn?: string;
         editing?: boolean;
         emitEvent?: boolean;
-    }): Promise<TableElement<T>>;
+    }): Promise<TableElement<T> | undefined>;
     protected registerCellValueChanges(name: string, formPath?: string, emitInitialValue?: boolean): Observable<any>;
     protected setShowColumn(columnName: string, show: boolean, opts?: {
         emitEvent?: boolean;
@@ -358,9 +363,9 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     protected getShowColumn(columnName: string): boolean;
     protected startsWithUpperCase(input: string, search: string): boolean;
     protected markForCheck(): void;
-    protected askDeleteConfirmation(event?: Event, rows?: TableElement<T>[]): Promise<boolean>;
-    protected askCancelConfirmation(event?: Event, rows?: TableElement<T>[]): Promise<boolean>;
-    protected askRestoreConfirmation(event?: Event): Promise<boolean>;
+    protected askDeleteConfirmation(event?: UIEvent, rows?: TableElement<T>[]): Promise<boolean>;
+    protected askCancelConfirmation(event?: UIEvent, rows?: TableElement<T>[]): Promise<boolean>;
+    protected askRestoreConfirmation(event?: UIEvent): Promise<boolean>;
     protected showToast(opts: ShowToastOptions): Promise<import("@ionic/core").OverlayEventDetail<any>>;
     protected resetError(opts?: {
         emitEvent?: boolean;
@@ -382,30 +387,12 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
         onlySelf?: boolean;
         emitEVent?: boolean;
     }): void;
-    /**
-     * @deprecated Use startEditRow instead
-     */
-    protected editRow(event: Event | undefined, row: TableElement<T>, opts?: {
-        focusColumn?: string;
-    }): Promise<boolean>;
-    /**
-     * @deprecated use openRowDetail() instead)
-     */
-    protected openRow(id: ID, row: TableElement<T>): Promise<boolean>;
-    /**
-     * @deprecated use createNewRow() instead
-     */
-    protected addRowToTable(insertAt?: number, opts?: {
-        focusColumn?: string;
-        editing?: boolean;
-        emitEvent?: boolean;
-    }): Promise<TableElement<T>>;
     private listenSortAndPaginationEvents;
-    private startEditRowById;
+    private editRowById;
     private setLoading;
-    private deleteNew;
-    private deleteExisting;
-    private cancelExisting;
+    private deleteNewRow;
+    private deleteExistingRow;
+    private cancelExistingRow;
     private checkIfRowPristine;
     private checkIfPristine;
     private applyFilter;
@@ -413,5 +400,5 @@ export declare abstract class AppTable<T extends IEntity<T, ID>, F = any, ID = n
     private startCellValueChanges;
     private stopCellValueChanges;
     static ɵfac: i0.ɵɵFactoryDeclaration<AppTable<any, any, any>, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<AppTable<any, any, any>, never, never, { "settingsId": "settingsId"; "debug": "debug"; "i18nColumnPrefix": "i18nColumnPrefix"; "i18nColumnSuffix": "i18nColumnSuffix"; "autoLoad": "autoLoad"; "readOnly": "readOnly"; "inlineEdition": "inlineEdition"; "focusFirstColumn": "focusFirstColumn"; "confirmBeforeDelete": "confirmBeforeDelete"; "confirmBeforeCancel": "confirmBeforeCancel"; "undoableDeletion": "undoableDeletion"; "saveBeforeDelete": "saveBeforeDelete"; "keepEditedRowOnSave": "keepEditedRowOnSave"; "saveBeforeSort": "saveBeforeSort"; "saveBeforeFilter": "saveBeforeFilter"; "propagateRowError": "propagateRowError"; "defaultSortBy": "defaultSortBy"; "defaultSortDirection": "defaultSortDirection"; "defaultPageSize": "defaultPageSize"; "defaultPageSizeOptions": "defaultPageSizeOptions"; "focusColumn": "focusColumn"; "dataSource": "dataSource"; "filter": "filter"; "disabled": "disabled"; "paginator": "paginator"; }, { "onRefresh": "onRefresh"; "onOpenRow": "onOpenRow"; "onNewRow": "onNewRow"; "onStartEditingRow": "onStartEditingRow"; "onConfirmEditCreateRow": "onConfirmEditCreateRow"; "onCancelOrDeleteRow": "onCancelOrDeleteRow"; "onBeforeDeleteRows": "onBeforeDeleteRows"; "onBeforeCancelRows": "onBeforeCancelRows"; "onBeforeSave": "onBeforeSave"; "onAfterDeletedRows": "onAfterDeletedRows"; "onSort": "onSort"; "onDirty": "onDirty"; "onError": "onError"; }, never, never, false>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<AppTable<any, any, any>, never, never, { "settingsId": "settingsId"; "debug": "debug"; "i18nColumnPrefix": "i18nColumnPrefix"; "i18nColumnSuffix": "i18nColumnSuffix"; "autoLoad": "autoLoad"; "readOnly": "readOnly"; "inlineEdition": "inlineEdition"; "focusFirstColumn": "focusFirstColumn"; "confirmBeforeDelete": "confirmBeforeDelete"; "confirmBeforeCancel": "confirmBeforeCancel"; "undoableDeletion": "undoableDeletion"; "saveBeforeDelete": "saveBeforeDelete"; "keepEditedRowOnSave": "keepEditedRowOnSave"; "saveBeforeSort": "saveBeforeSort"; "saveBeforeFilter": "saveBeforeFilter"; "propagateRowError": "propagateRowError"; "defaultSortBy": "defaultSortBy"; "defaultSortDirection": "defaultSortDirection"; "defaultPageSize": "defaultPageSize"; "defaultPageSizeOptions": "defaultPageSizeOptions"; "focusColumn": "focusColumn"; "dataSource": "dataSource"; "filter": "filter"; "disabled": "disabled"; "paginator": "paginator"; }, { "onRefresh": "onRefresh"; "onOpenIdAndRow": "onOpenIdAndRow"; "onOpenRow": "onOpenRow"; "onNewRow": "onNewRow"; "onStartEditingRow": "onStartEditingRow"; "onConfirmEditCreateRow": "onConfirmEditCreateRow"; "onCancelOrDeleteRow": "onCancelOrDeleteRow"; "onBeforeDeleteRows": "onBeforeDeleteRows"; "onBeforeCancelRows": "onBeforeCancelRows"; "onBeforeSave": "onBeforeSave"; "onAfterDeletedRows": "onAfterDeletedRows"; "onSort": "onSort"; "onDirty": "onDirty"; "onError": "onError"; }, never, never, false>;
 }

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

@@ -1,11 +1,11 @@
 import { EventEmitter } from '@angular/core';
 import { Observable } from 'rxjs';
-export interface PromiseEventPayload<T = any> {
-    success: (T: any) => void;
+export interface PromiseEventPayload<R = any> {
+    success: (R: any) => void;
     error: (err: any) => void;
 }
-export declare type PromiseEvent<T = any, D = void> = CustomEvent<PromiseEventPayload<T> & D>;
-export declare function createPromiseEventEmitter<T = any, D = void>(): EventEmitter<PromiseEvent<T, D>>;
+export declare type PromiseEvent<R = any, D = void> = CustomEvent<PromiseEventPayload<R> & D>;
+export declare function createPromiseEventEmitter<R = any, D = void>(): EventEmitter<PromiseEvent<R, D>>;
 export declare function createPromiseEvent<T = void, D = void>(eventType: string, promise: PromiseEventPayload<T>, initArg?: CustomEventInit<D>): PromiseEvent<T, D>;
 export declare function emitPromiseEvent<T = any, D = void>(emitter: EventEmitter<PromiseEvent<T, D>>, eventType: string, initArg?: CustomEventInit<D>): Promise<T>;
 export interface CompletableEvent extends Event {

package/src/app/shared/graph/graph-colors.d.ts

@@ -20,21 +20,20 @@ export declare class Color {
     rgba(opacity?: number): string;
 }
 export declare interface ColorGradientOptions {
-    opacity?: number;
     startColor?: number[];
     mainColor?: number[];
     mainColorIndex?: number;
     endColor?: number[];
-    format?: 'rgb' | 'hex' | 'array';
 }
 export declare interface ColorScaleOptions extends ColorGradientOptions {
+    opacity?: number;
     min?: number;
     max?: number;
     upperMax?: boolean;
 }
 export declare interface ColorScaleLegendItem {
-    label: string;
-    color: string;
+    label: string | number[];
+    color: Color;
 }
 export declare interface ColorScaleLegend {
     items: ColorScaleLegendItem[];
@@ -43,7 +42,6 @@ export declare interface ColorScaleLegend {
  * Helper class for colors scale
  */
 export declare class ColorScale {
-    private colorArray;
     static custom: (count: number, options?: ColorScaleOptions) => ColorScale;
     static default(): ColorScale;
     /**
@@ -56,8 +54,10 @@ export declare class ColorScale {
     private _legendItems;
     get min(): number;
     get max(): number;
-    constructor(colorArray: string[], options?: ColorScaleOptions);
+    constructor(colorArray: number[][], options?: ColorScaleOptions);
     get legend(): ColorScaleLegend;
-    getValueColor(value: number): string;
-    protected computeLegend(): ColorScaleLegendItem[];
+    getValueColor(value: number): Color;
+    getLegendForValue(value: number): ColorScaleLegendItem;
+    getLegendAtIndex(index: number): ColorScaleLegendItem;
+    protected computeLegendItems(colorArray: number[][]): ColorScaleLegendItem[];
 }

package/src/app/shared/material/material.testing.module.d.ts

@@ -8,16 +8,17 @@ import * as i5 from "./numpad/testing/numpad.test";
 import * as i6 from "./swipe/testing/swipe.test";
 import * as i7 from "./chips/testing/chips.test";
 import * as i8 from "./badge/badge.test";
-import * as i9 from "@angular/common";
-import * as i10 from "@ionic/angular";
-import * as i11 from "@angular/forms";
-import * as i12 from "./material.module";
-import * as i13 from "@ngx-translate/core";
-import * as i14 from "@angular/router";
-import * as i15 from "../pipes/pipes.module";
+import * as i9 from "../testing/observable.test";
+import * as i10 from "@angular/common";
+import * as i11 from "@ionic/angular";
+import * as i12 from "@angular/forms";
+import * as i13 from "./material.module";
+import * as i14 from "@ngx-translate/core";
+import * as i15 from "@angular/router";
+import * as i16 from "../pipes/pipes.module";
 export declare const SHARED_MATERIAL_TESTING_PAGES: TestingPage[];
 export declare class MaterialTestingModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MaterialTestingModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MaterialTestingModule, [typeof i1.DateTimeTestPage, typeof i2.DateTestPage, typeof i3.AutocompleteTestPage, typeof i4.LatLongTestPage, typeof i5.NumpadTestPage, typeof i6.SwipeTestPage, typeof i7.ChipsTestPage, typeof i8.MatBadgeTestPage], [typeof i9.CommonModule, typeof i10.IonicModule, typeof i11.ReactiveFormsModule, typeof i12.SharedMaterialModule, typeof i13.TranslateModule, typeof i14.RouterModule, typeof i15.SharedPipesModule], [typeof i12.SharedMaterialModule, typeof i14.RouterModule, typeof i1.DateTimeTestPage, typeof i2.DateTestPage, typeof i3.AutocompleteTestPage, typeof i4.LatLongTestPage, typeof i5.NumpadTestPage, typeof i6.SwipeTestPage, typeof i7.ChipsTestPage]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MaterialTestingModule, [typeof i1.DateTimeTestPage, typeof i2.DateTestPage, typeof i3.AutocompleteTestPage, typeof i4.LatLongTestPage, typeof i5.NumpadTestPage, typeof i6.SwipeTestPage, typeof i7.ChipsTestPage, typeof i8.MatBadgeTestPage, typeof i9.ObservableTestPage], [typeof i10.CommonModule, typeof i11.IonicModule, typeof i12.ReactiveFormsModule, typeof i13.SharedMaterialModule, typeof i14.TranslateModule, typeof i15.RouterModule, typeof i16.SharedPipesModule], [typeof i13.SharedMaterialModule, typeof i15.RouterModule, typeof i1.DateTimeTestPage, typeof i2.DateTestPage, typeof i3.AutocompleteTestPage, typeof i4.LatLongTestPage, typeof i5.NumpadTestPage, typeof i6.SwipeTestPage, typeof i7.ChipsTestPage, typeof i9.ObservableTestPage]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<MaterialTestingModule>;
 }

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

@@ -3,7 +3,7 @@ import { Predicate } from '@angular/core';
 export declare interface FirstOptions {
     timeout?: number;
     stop?: Observable<any>;
-    stopError?: boolean;
+    stopError?: boolean | string | Error;
 }
 export declare interface WaitForOptions extends FirstOptions {
     dueTime?: number;

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

@@ -51,6 +51,11 @@ export declare class InMemoryEntitiesService<T extends IEntity<T, ID>, F = any,
      * Count data stored by the service (without hidden data).
      * @param opts
      */
+    /**
+     * Count data stored by the service (without hidden data).
+     * @param opts
+     * @deprecated TODO Please rename this getter into visibleCount (and create count = hiddenCount + visibleCount)
+     */
     get count(): number;
     get hiddenCount(): number;
     waitIdle(opts?: WaitForOptions): Promise<void>;

package/src/app/shared/testing/observable.test.d.ts

@@ -0,0 +1,25 @@
+import { ElementRef, OnDestroy } from '@angular/core';
+import { FirstOptions, WaitForOptions } from '../observables';
+import { Observable, Subject } from 'rxjs';
+import * as i0 from "@angular/core";
+export declare class ObservableTestPage implements OnDestroy {
+    _stopSubject: Subject<void>;
+    $value: Subject<any>;
+    runningTaskCount: number;
+    taskId: number;
+    options: Partial<FirstOptions>;
+    resultDiv: ElementRef;
+    constructor();
+    ngOnDestroy(): void;
+    setOptions(opts: any): void;
+    setOptionsError(errorMessage: any): void;
+    firstNotNilPromise(opts?: FirstOptions): Promise<void>;
+    waitForTrue(opts?: WaitForOptions): Promise<void>;
+    execute<T, O extends WaitForOptions = WaitForOptions>(fn: (o: Observable<any>, opts: O) => Promise<T>, opts?: O, logPrefix?: string): Promise<void>;
+    emit(value: any): void;
+    stop(): void;
+    log(message: string, ...args: any): void;
+    appendLog(message: string): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ObservableTestPage, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ObservableTestPage, "app-observable-test", never, {}, {}, never, never, false>;
+}

package/src/theme/_ionic.globals.scss

@@ -75,6 +75,10 @@ $ion-grid-padding: 16px !default;
 $ion-padding: 16px !default;
 $ion-margin: 16px !default;
 
+// Default height
+// --------------------------------------------------
+$ion-toolbar-height: 56px !default;
+
 // --------------------------------------------------
 // Default General Colors
 // --------------------------------------------------

package/src/theme/_material.globals.scss

@@ -66,7 +66,9 @@ $candy-app-warn: mat.define-palette(mat.$red-palette);
 $candy-app-theme: mat.define-light-theme($candy-app-primary, $candy-app-accent, $candy-app-warn);
 
 
-// Expose some existing variables
+// Expose some variables
 $mat-tab-link-height: 48px !default;
 $mat-tab-bar-height: 48px !default;
 $mat-tab-animation-duration: 200ms !default;
+$mat-mat-toolbar-height-desktop: 64px !default;
+$mat-mat-toolbar-height-mobile: 56px !default;

package/src/theme/_mixins.scss

@@ -102,9 +102,9 @@
   --expansion-panel-padding: var(--ion-padding);
   --expansion-panel-header-padding: var(--ion-padding);
 
-  --mat-toolbar-height: #{64px};
+  --mat-toolbar-height: #{$mat-mat-toolbar-height-desktop};
   --mat-paginator-height: mat.$paginator-height;
-  --ion-toolbar-height: #{56px};
+  --ion-toolbar-height: #{$ion-toolbar-height};
 
   --app-table-header-height: #{$app-table-header-height};
   --app-toolbar-height: #{$app-toolbar-height};
@@ -116,7 +116,7 @@
 }
 
 @mixin css-variables-to-root-mobile() {
-  --mat-toolbar-height: #{56px};
+  --mat-toolbar-height: #{$mat-mat-toolbar-height-mobile};
 
   // Disable form footer, in mobile
   --app-form-buttons-bar-height: 0px;