@sumaris-net/ngx-components 18.0.0 → 18.0.1-0.alpha1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sumaris-net/ngx-components",
   "description": "SUMARiS Angular components",
-  "version": "18.0.0",
+  "version": "18.0.10.alpha1",
   "author": "contact@e-is.pro",
   "license": "AGPL-3.0",
   "readmeFilename": "README.md",
@@ -58,7 +58,10 @@
     "clovelced-plugin-audiomanagement": "~1.0.2",
     "cordova-sqlite-storage": "~6.0.0",
     "integrator-cordova-plugin-downloader": "~1.1.0",
-    "localforage-cordovasqlitedriver": "~1.8.0"
+    "localforage-cordovasqlitedriver": "~1.8.0",
+    "clipboard": "^2.0.11",
+    "emoji-toolkit": ">= 8.0.0 < 10.0.0",
+    "prismjs": "^1.28.0"
   },
   "repository": {
     "type": "git",

package/public_api.d.ts

@@ -3,7 +3,8 @@ export * from './src/environments/environment.loader';
 export * from './src/app/shared/constants';
 export * from './src/app/shared/shared.module';
 export { SharedRoutingModule } from './src/app/shared/shared-routing.module';
-export { RxStateModule } from './src/app/shared/rx-state.module';
+export { RxStateModule } from './src/app/shared/rx-state/rx-state.module';
+export * from './src/app/shared/rx-state/rx-state.decorators';
 export * from './src/app/shared/material/material.module';
 export * from './src/app/shared/material/material.config';
 export * from './src/app/shared/material/material.animations';
@@ -87,6 +88,7 @@ export * from './src/app/shared/pipes/maskito.pipe';
 export * from './src/app/shared/pipes/selection.pipes';
 export * from './src/app/shared/pipes/badge.pipes';
 export * from './src/app/shared/pipes/html.pipes';
+export * from './src/app/shared/pipes/display-with.pipe';
 export * from './src/app/shared/services';
 export * from './src/app/shared/audio/audio';
 export * from './src/app/shared/file/file.service';

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

@@ -11,6 +11,7 @@ export declare class PersonFilter extends EntityFilter<PersonFilter, Person> {
     searchText: string;
     statusIds: number[];
     userProfiles: string[];
+    includedIds: number[];
     excludedIds: number[];
     searchAttribute: string;
     searchAttributes: string[];

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

@@ -5,7 +5,7 @@ import { NetworkService } from '../../core/services/network.service';
 import { EntitiesStorage } from '../../core/services/storage/entities-storage.service';
 import { Person } from '../../core/services/model/person.model';
 import { SortDirection } from '@angular/material/sort';
-import { LoadResult, SuggestService } from '../../shared/services/entity-service.class';
+import { EntitiesServiceLoadOptions, LoadResult, SuggestService } from '../../shared/services/entity-service.class';
 import { PlatformService } from '../../core/services/platform.service';
 import { PersonFilter } from './filter/person.filter';
 import { BaseEntityService } from '../../core/services/base-entity-service.class';
@@ -19,12 +19,9 @@ export declare class PersonService extends BaseEntityService<Person, PersonFilte
     protected network: NetworkService;
     protected entities: EntitiesStorage;
     constructor(graphql: GraphqlService, platform: PlatformService, network: NetworkService, entities: EntitiesStorage);
-    loadAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<PersonFilter>, opts?: {
+    loadAll(offset: number, size: number, sortBy?: keyof Person | string, sortDirection?: SortDirection, filter?: Partial<PersonFilter>, opts?: EntitiesServiceLoadOptions & {
         [key: string]: any;
-        fetchPolicy?: FetchPolicy;
         debug?: boolean;
-        withTotal?: boolean;
-        toEntity?: boolean;
     }): Promise<LoadResult<Person>>;
     loadAllLocally(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<PersonFilter>, opts?: {
         [key: string]: any;
@@ -33,11 +30,16 @@ export declare class PersonService extends BaseEntityService<Person, PersonFilte
         withTotal?: boolean;
         toEntity?: boolean;
     }): Promise<LoadResult<Person>>;
-    suggest(value: any, filter?: PersonFilter, sortBy?: string, sortDirection?: SortDirection): Promise<LoadResult<Person>>;
+    suggest(value: any, filter?: Partial<PersonFilter>, sortBy?: keyof Person | string, sortDirection?: SortDirection, opts?: EntitiesServiceLoadOptions): Promise<LoadResult<Person>>;
     executeImport(filter: Partial<PersonFilter>, opts: {
         progression?: BehaviorSubject<number>;
         maxProgression?: number;
     }): Promise<void>;
+    loadById(id: number, opts?: {
+        [key: string]: any;
+        fetchPolicy?: FetchPolicy;
+        toEntity?: boolean;
+    }): Promise<Person>;
     loadByPubkey(pubkey: string, opts?: {
         [key: string]: any;
         fetchPolicy?: FetchPolicy;

package/src/app/core/about/about.modal.d.ts

@@ -18,8 +18,8 @@ export declare class AboutModal implements OnDestroy {
     readonly name: string;
     readonly version: string;
     readonly sourceUrl: string;
-    readonly reportIssueUrl: string;
     readonly config$: Observable<Configuration>;
+    reportIssueUrl: string;
     forumUrl: string;
     helpUrl: string;
     private readonly _subscription;

package/src/app/core/about/about.module.d.ts

@@ -3,8 +3,9 @@ import * as i1 from "./about.modal";
 import * as i2 from "../../shared/shared.module";
 import * as i3 from "@ionic/angular";
 import * as i4 from "@ngx-translate/core";
+import * as i5 from "ngx-markdown";
 export declare class AppAboutModalModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AppAboutModalModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<AppAboutModalModule, [typeof i1.AboutModal], [typeof i2.SharedModule, typeof i3.IonicModule, typeof i4.TranslateModule], [typeof i4.TranslateModule, typeof i1.AboutModal]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<AppAboutModalModule, [typeof i1.AboutModal], [typeof i2.SharedModule, typeof i3.IonicModule, typeof i4.TranslateModule, typeof i5.MarkdownModule], [typeof i4.TranslateModule, typeof i1.AboutModal]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<AppAboutModalModule>;
 }

package/src/app/core/account/token.table.d.ts

@@ -8,10 +8,10 @@ import { Configuration } from '../services/model/config.model';
 import * as i0 from "@angular/core";
 export declare class UserTokenTable extends AppInMemoryTable<UserToken> implements OnInit {
     protected configService: ConfigService;
-    protected tokenScopes: TokenScope[];
     useSticky: boolean;
     protected showScopes: boolean;
     protected defaultScope: string;
+    protected tokenScopes: TokenScope[];
     constructor(injector: Injector, validatorService: ValidatorService, configService: ConfigService, environment: Environment, tokenScopes: TokenScope[]);
     ngOnInit(): void;
     get value(): UserToken[];

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

@@ -4,28 +4,38 @@ import { FormFieldDefinition, FormFieldDefinitionMap } from '../../../shared/for
 import { DateAdapter, ThemePalette } from '@angular/material/core';
 import { Moment } from 'moment';
 import { AppForm } from '../form.class';
-import { Property } from '../../../shared/types';
+import { Property, PropertyMap } from '../../../shared/types';
 import { PropertyValidator } from './property.validator';
 import { PredefinedColors } from '@ionic/core';
 import { FormArrayHelper, FormArrayHelperOptions } from '../array/form-array';
 import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
 import { MatAutocompleteFieldConfig } from '../../../shared/material/autocomplete/material.autocomplete.config';
 import { LoadResult } from '../../../shared/services/entity-service.class';
+import { RxState } from '@rx-angular/state';
 import * as i0 from "@angular/core";
-export declare class AppPropertiesForm<T = Property> extends AppForm<T[]> implements OnInit {
+export interface AppPropertiesFormState {
+    definitions: FormFieldDefinition[];
+    definitionKeys: Property[];
+}
+export declare class AppPropertiesForm<O = any, T extends Property<O> = Property<O>, S extends AppPropertiesFormState = AppPropertiesFormState> extends AppForm<T[]> implements OnInit {
+    protected injector: Injector;
     protected formBuilder: UntypedFormBuilder;
     protected dateAdapter: DateAdapter<Moment>;
     protected cd: ChangeDetectorRef;
     protected validator: PropertyValidator;
     private formGroupDir;
-    protected _definitions: FormFieldDefinition[];
-    protected _options: Property[];
-    protected _definitionsMapByKey: FormFieldDefinitionMap;
+    protected readonly _state: RxState<S>;
+    protected _definitions$: import("rxjs").Observable<S["definitions"]>;
+    protected _definitionKeys$: import("rxjs").Observable<S["definitionKeys"]>;
+    protected set _definitionKeys(value: Property[]);
+    protected get _definitionKeys(): Property[];
+    protected _definitionByKey: FormFieldDefinitionMap;
     protected _definitionsByIndex: {
         [index: number]: FormFieldDefinition;
     };
     protected _helper: FormArrayHelper<Property>;
     protected _autocompleteConfig: MatAutocompleteFieldConfig;
+    protected _focusedControlIndex: number;
     formArrayName: string;
     formArray: UntypedFormArray;
     options: FormArrayHelperOptions;
@@ -36,8 +46,15 @@ export declare class AppPropertiesForm<T = Property> extends AppForm<T[]> implem
     showHintKey: boolean;
     hintKeyPrefix: string;
     showMoreButton: boolean;
-    showMoreButtonTitle: string;
+    addButtonText: string;
+    addButtonTitle: string;
     showAddButton: boolean;
+    /**
+     * @deprecated Use addButtonTitle instead
+     * @param value
+     */
+    set showMoreButtonTitle(value: string);
+    get showMoreButtonTitle(): string;
     set definitions(value: FormFieldDefinition[]);
     get definitions(): FormFieldDefinition[];
     set value(data: T[]);
@@ -46,19 +63,19 @@ export declare class AppPropertiesForm<T = Property> extends AppForm<T[]> implem
     get fieldForms(): UntypedFormGroup[];
     constructor(injector: Injector, formBuilder: UntypedFormBuilder, dateAdapter: DateAdapter<Moment>, cd: ChangeDetectorRef, validator: PropertyValidator, formGroupDir: FormGroupDirective);
     ngOnInit(): void;
-    protected updateDefinitionsMaps(): void;
+    protected processDefinitions(definitions: FormFieldDefinition[]): FormFieldDefinition[];
     getDefinitionAt(index: number): FormFieldDefinition;
     updateDefinitionAt(index: number, opts?: {
         emitEvent?: boolean;
     }): FormFieldDefinition;
     removeAt(index: number): void;
-    isUnknownField(fieldForm: UntypedFormGroup): boolean;
-    setValue(data: T[] | any): void;
+    setValue(data: PropertyMap | T[]): Promise<void>;
+    getValueAsJson(): PropertyMap;
     protected suggestDefinition(value: any, filter?: any): Promise<LoadResult<Property>>;
     protected markForCheck(): void;
     protected isEmptyProperty(obj: Property): boolean;
-    static ɵfac: i0.ɵɵFactoryDeclaration<AppPropertiesForm<any>, [null, null, null, null, null, { optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<AppPropertiesForm<any>, "app-properties-form", never, { "formArrayName": { "alias": "formArrayName"; "required": false; }; "formArray": { "alias": "formArray"; "required": false; }; "options": { "alias": "options"; "required": false; }; "chipColor": { "alias": "chipColor"; "required": false; }; "mobile": { "alias": "mobile"; "required": false; }; "appearance": { "alias": "appearance"; "required": false; }; "subscriptSizing": { "alias": "subscriptSizing"; "required": false; }; "showHintKey": { "alias": "showHintKey"; "required": false; }; "hintKeyPrefix": { "alias": "hintKeyPrefix"; "required": false; }; "showMoreButton": { "alias": "showMoreButton"; "required": false; }; "showMoreButtonTitle": { "alias": "showMoreButtonTitle"; "required": false; }; "showAddButton": { "alias": "showAddButton"; "required": false; }; "definitions": { "alias": "definitions"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<AppPropertiesForm<any, any, any>, [null, null, null, null, null, { optional: true; }]>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<AppPropertiesForm<any, any, any>, "app-properties-form", never, { "formArrayName": { "alias": "formArrayName"; "required": false; }; "formArray": { "alias": "formArray"; "required": false; }; "options": { "alias": "options"; "required": false; }; "chipColor": { "alias": "chipColor"; "required": false; }; "mobile": { "alias": "mobile"; "required": false; }; "appearance": { "alias": "appearance"; "required": false; }; "subscriptSizing": { "alias": "subscriptSizing"; "required": false; }; "showHintKey": { "alias": "showHintKey"; "required": false; }; "hintKeyPrefix": { "alias": "hintKeyPrefix"; "required": false; }; "showMoreButton": { "alias": "showMoreButton"; "required": false; }; "addButtonText": { "alias": "addButtonText"; "required": false; }; "addButtonTitle": { "alias": "addButtonTitle"; "required": false; }; "showAddButton": { "alias": "showAddButton"; "required": false; }; "showMoreButtonTitle": { "alias": "showMoreButtonTitle"; "required": false; }; "definitions": { "alias": "definitions"; "required": false; }; }, {}, never, never, false, never>;
     static ngAcceptInputType_mobile: unknown;
     static ngAcceptInputType_showHintKey: unknown;
     static ngAcceptInputType_showMoreButton: unknown;

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

@@ -1,27 +1,55 @@
-import { PropertiesMap, Property } from '../../../shared/types';
+import { Property, PropertyMap } from '../../../shared/types';
+import { FormFieldDefinition } from '../../../shared/form/field.model';
+import { EntitiesServiceLoadOptions, SuggestFn } from '../../../shared/services/entity-service.class';
 export declare class AppPropertiesUtils {
     /**
-     * Converts an array of Property objects to an object map.
+     * Converts an array of `Property` objects into a `PropertiesMap` object.
      *
-     * @param {Property[]} [sources] - The array of Property objects to convert.
-     * @param {Object} [opts] - Options for the conversion.
-     * @param {boolean} [opts.omitNilOrBlank] - If set to true, properties with nil or blank values will be omitted from the resulting object.
-     * @return {PropertiesMap} The resulting object map where keys are property keys and values are property values.
+     * @param {Property[]} [sources] - An optional array of properties to be converted.
+     * @param {FormFieldDefinition[]} [definitions] - An optional array of form field definitions to help with the conversion.
+     * @param {Object} [opts] - Optional configurations.
+     * @param {boolean} [opts.omitNilOrBlank] - If true, properties with nil or blank values will be omitted. Defaults to true.
+     * @return {PropertyMap} - The resulting `PropertiesMap` object.
      */
-    static arrayAsObject(sources?: Property[], opts?: {
+    static arrayAsObject<T = any>(sources?: Property<T>[], definitions?: FormFieldDefinition[], opts?: {
         omitNilOrBlank: boolean;
-    }): PropertiesMap;
+    }): PropertyMap;
     /**
-     * Converts an object into an array of properties.
+     * Generates an array of properties from the given object, optionally applying definitions to the properties.
      *
-     * @param {PropertiesMap} [source] - The source object containing properties to convert.
-     * @return {Property[]} An array of properties derived from the source object.
+     * @param {PropertyMap} [sources] - The source object from which properties are to be extracted.
+     * @param {FormFieldDefinition[]} [definitions] - An optional array of definitions to be applied to the extracted properties.
+     * @param opts
+     * @return {Property[] | Promise<Property[]>} An array of properties generated from the source object, or a promise resolving to that array.
      */
-    static arrayFromObject<T = any>(source?: PropertiesMap): Property[];
+    static arrayFromObject<T>(sources?: PropertyMap | Property<T>[], definitions?: FormFieldDefinition[], opts?: {
+        keepOrphan?: boolean;
+    }): Property<T>[] | Promise<Property<T>[]>;
 }
 export declare class AppPropertyUtils {
-    static asObject(source: Property | any): {
+    static key(key: any): string;
+    static getPropertyKey(source: Property | any): string;
+    /**
+     * Converts the given source to an object that contains a key-value pair.
+     *
+     * @param {Property<any> | any} source - The source property or any value to be converted.
+     * @param {FormFieldDefinition} [def] - The form field definition used for serialization.
+     * @param {Object} [opts] - Additional options for serialization.
+     * @param {string} [opts.defaultSerializeAttribute='id'] - The attribute to be used for default serialization.
+     * @return {{ key: string, value: string } | undefined} An object containing the serialized key-value pair, or undefined if the source is not provided.
+     */
+    static asObject(source: Property<any> | any, def?: FormFieldDefinition, opts?: {
+        defaultSerializeAttribute?: string;
+    }): {
         key: string;
         value: string;
     } | undefined;
+    static fromObject<T = string>(source: Property | Property<T>, def: FormFieldDefinition, opts?: {
+        defaultSuggestFn: SuggestFn<any, any>;
+        defaultSuggestOptions?: EntitiesServiceLoadOptions;
+        defaultSerializeAttribute?: string;
+    }): Property<T> | Promise<Property<T>>;
+    private static resolveEntity;
+    private static resolveEntityBySuggest;
+    private static toString;
 }

package/src/app/core/form/properties/property.validator.d.ts

@@ -1,13 +1,21 @@
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { Property } from '../../../shared/types';
 import { AppValidatorService } from '../../services/validator/base.validator.class';
+import { FormFieldDefinition } from '../../../shared/form/field.model';
+import { AppFormArray } from '../array/form-array';
 import * as i0 from "@angular/core";
 export interface PropertyValidatorOptions {
+    definition?: FormFieldDefinition;
+    valueMaxLength?: number;
+}
+export interface PropertiesValidatorOptions {
+    definitions?: FormFieldDefinition[];
     valueMaxLength?: number;
 }
 export declare class PropertyValidator extends AppValidatorService<Property> {
     protected formBuilder: UntypedFormBuilder;
     constructor(formBuilder: UntypedFormBuilder);
+    getFormArray(data?: any, opts?: PropertiesValidatorOptions): AppFormArray<Property, UntypedFormGroup>;
     getFormGroup(data?: Property, opts?: PropertyValidatorOptions): UntypedFormGroup;
     getFormGroupConfig(data?: Property, opts?: PropertyValidatorOptions): {
         [p: string]: any;

package/src/app/core/form/properties/testing/properties-form.test.d.ts

@@ -3,17 +3,20 @@ import { FormFieldDefinition } from '../../../../shared/form/field.model';
 import { AppPropertiesForm } from '../properties.form';
 import { LoadResult } from '../../../../shared/services/entity-service.class';
 import { FormBuilder, FormGroup } from '@angular/forms';
+import { PropertyValidator } from '../property.validator';
+import { SortDirection } from '@angular/material/sort';
 import * as i0 from "@angular/core";
 export declare class PropertiesFormTestPage implements OnInit, AfterViewInit {
     protected formBuilder: FormBuilder;
+    protected pv: PropertyValidator;
     propertyDefinitions: FormFieldDefinition[];
     i18nFieldPrefix: string;
     form: FormGroup;
     propertiesForm: AppPropertiesForm;
-    constructor(formBuilder: FormBuilder);
+    constructor(formBuilder: FormBuilder, pv: PropertyValidator);
     ngOnInit(): void;
-    ngAfterViewInit(): void;
-    protected suggestEntity(value: any, filter: any): Promise<LoadResult<any>>;
+    ngAfterViewInit(): Promise<void>;
+    protected suggestEntity(value: any, filter: any, sortBy: any | string, sortDirection: SortDirection, options: any): Promise<LoadResult<any>>;
     static ɵfac: i0.ɵɵFactoryDeclaration<PropertiesFormTestPage, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<PropertiesFormTestPage, "app-properties-form-test", never, {}, {}, never, never, false, never>;
 }

package/src/app/core/graphql/graphql.service.d.ts

@@ -12,7 +12,7 @@ import { HttpLink } from 'apollo-angular/http';
 import { ErrorPolicy, MutationBaseOptions } from '@apollo/client/core/watchQueryOptions';
 import { Cache } from '@apollo/client/cache/core/types/Cache';
 import { Environment } from '../../../environments/environment.class';
-import { PropertiesMap } from '../../shared/types';
+import { PropertyMap } from '../../shared/types';
 import { StartableService } from '../../shared/services/startable-service.class';
 import { StorageService } from '../../shared/storage/storage.service';
 import { DocumentNode } from 'graphql';
@@ -133,7 +133,7 @@ export declare class GraphqlService extends StartableService<ApolloClient<any>>
         equalsFn?: (d1: T, d2: T) => boolean;
     }): void;
     clearCache(client?: ApolloClient<any>): Promise<void>;
-    registerCustomError(error: PropertiesMap): void;
+    registerCustomError(error: PropertyMap): void;
     protected ngOnStart(): Promise<ApolloClient<any>>;
     protected ngOnStop(): Promise<void>;
     protected resetClient(client?: ApolloClient<any>): Promise<void>;

package/src/app/core/home/home.module.d.ts

@@ -3,7 +3,7 @@ import * as i1 from "./home";
 import * as i2 from "../../shared/shared.module";
 import * as i3 from "@angular/router";
 import * as i4 from "@ngx-translate/core";
-import * as i5 from "../../shared/rx-state.module";
+import * as i5 from "../../shared/rx-state/rx-state.module";
 import * as i6 from "../auth/auth.module";
 import * as i7 from "../install/install-upgrade-card.module";
 export declare class AppHomePageModule {

package/src/app/core/menu/menu.module.d.ts

@@ -3,7 +3,7 @@ import * as i1 from "./menu.component";
 import * as i2 from "./sub-menu-tab.directive";
 import * as i3 from "../../shared/shared.module";
 import * as i4 from "@angular/router";
-import * as i5 from "../../shared/rx-state.module";
+import * as i5 from "../../shared/rx-state/rx-state.module";
 import * as i6 from "@ngx-translate/core";
 export declare class AppMenuModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<AppMenuModule, never>;

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

@@ -72,7 +72,7 @@ export declare abstract class BaseEntityService<T extends Entity<T, ID>, F exten
     watch(id: number, opts?: WO): Observable<T>;
     load(id: ID, opts?: LO): Promise<T>;
     watchAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, dataFilter?: F, opts?: WO): Observable<LoadResult<T>>;
-    loadAll(offset: number, size: number, sortBy?: string, sortDirection?: SortDirection, filter?: Partial<F>, opts?: LO & {
+    loadAll(offset: number, size: number, sortBy?: keyof T | string, sortDirection?: SortDirection, filter?: Partial<F>, opts?: LO & {
         debug?: boolean;
     }): Promise<LoadResult<T>>;
     countAll(filter?: Partial<F>, opts?: LO): Promise<number>;

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

@@ -20,6 +20,7 @@ export declare const CORE_CONFIG_OPTIONS: Readonly<{
     APP_MIN_VERSION: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     HELP_URL: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     FORUM_URL: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
+    REPORT_ISSUE_URL: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     LOGO_LARGE: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     MENU_ITEMS: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;
     HOME_PARTNERS_DEPARTMENTS: FormFieldDefinition<string, import("../../../shared/form/field.model").FormFieldType, any>;

package/src/app/core/services/local-settings.service.d.ts

@@ -77,7 +77,9 @@ export declare class LocalSettingsService extends StartableService<LocalSettings
     getFieldDisplayAttributes(fieldName: string, defaultAttributes?: string[]): string[];
     getPageFieldDefaultValue(pageId: string, fieldName: string): any;
     get optionDefs(): FormFieldDefinition[];
-    registerOption(def: FormFieldDefinition): void;
+    registerOption(def: FormFieldDefinition, opts?: {
+        replaceIfExists?: boolean;
+    }): void;
     registerOptions(defs: FormFieldDefinition[]): void;
     addToPageHistory(page: HistoryPageReference, opts?: AddToPageHistoryOptions, pageHistory?: HistoryPageReference[]): Promise<void>;
     removePageHistory(path: string, opts?: {

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

@@ -2,7 +2,7 @@ import { Moment } from 'moment';
 import { FormFieldDefinition } from '../../../shared/form/field.model';
 import { Entity, EntityAsObjectOptions, IEntity } from './entity.model';
 import { Department } from './department.model';
-import { PropertiesMap } from '../../../shared/types';
+import { PropertyMap } from '../../../shared/types';
 export declare class Software<T extends Software<any> = Software<any>> extends Entity<T, number> implements IEntity<T, number> {
     static fromObject: (source: any, opts?: any) => Software;
     label: string;
@@ -11,7 +11,7 @@ export declare class Software<T extends Software<any> = Software<any>> extends E
     comments: string;
     creationDate: Date | Moment;
     statusId: number;
-    properties: PropertiesMap;
+    properties: PropertyMap;
     constructor(__typename?: string);
     asObject(options?: EntityAsObjectOptions): any;
     fromObject(source: any): void;

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

@@ -55,8 +55,8 @@ export declare abstract class EntityUtils {
     static fillLocalIds<T extends IEntity<T>>(items: T[], sequenceFactory: (firstEntity: T, incrementSize: number) => Promise<number>): Promise<void>;
     static cleanIdAndUpdateDate<T extends IEntity<T>>(source: T): void;
     static cleanIdsAndUpdateDates<T extends IEntity<T>>(items: T[]): void;
-    static sort<T extends IEntity<T> | any>(data: T[], sortBy?: string, sortDirection?: SortDirection): T[];
-    static sortComparator<T extends IEntity<T> | any>(sortBy?: string, sortDirection?: SortDirection): (a: T, b: T) => number;
+    static sort<T extends IEntity<T> | any>(data: T[], sortBy?: keyof T | string, sortDirection?: SortDirection): T[];
+    static sortComparator<T extends IEntity<T> | any>(sortBy?: keyof T | string, sortDirection?: SortDirection): (a: T, b: T) => number;
     static compare<T extends IEntity<any>>(value1: T, value2: T, direction: 1 | -1, checkAttribute?: keyof T): number;
     static compareValue<T>(value1: T, value2: T, direction: 1 | -1): number;
     static filter<T extends IEntity<T> | any>(data: T[], searchAttribute: string, searchText: string): T[];

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

@@ -1,4 +1,4 @@
-import { PropertiesMap, Property } from '../../../shared/types';
+import { Property, PropertyMap } from '../../../shared/types';
 import { InjectionToken } from '@angular/core';
 import { HistoryPageReference } from './history.model';
 export type UsageMode = 'DESK' | 'FIELD';
@@ -20,7 +20,7 @@ export declare interface LocalSettings {
     locale: string;
     usageMode?: UsageMode;
     mobile?: boolean;
-    properties?: PropertiesMap;
+    properties?: PropertyMap | Property[];
     pageHistory?: HistoryPageReference[];
     offlineFeatures?: (string | OfflineFeature)[];
     pageHistoryMaxSize: number;

package/src/app/core/services/storage/entities-storage.service.d.ts

@@ -35,17 +35,17 @@ export declare class EntitiesStorage extends StartableService<EntityStorageMap>
     watchAll<T extends Entity<T>>(entityName: string, variables: {
         offset?: number;
         size?: number;
-        sortBy?: string;
+        sortBy?: keyof T | string;
         sortDirection?: string;
         trash?: boolean;
-        filter?: (T: any) => boolean;
+        filter?: (data: T) => boolean;
     }, opts?: EntityStorageLoadOptions): Observable<LoadResult<T>>;
     loadAll<T extends Entity<T>>(entityName: string, variables?: {
         offset?: number;
         size?: number;
-        sortBy?: string;
+        sortBy?: keyof T | string;
         sortDirection?: string;
-        filter?: (T: any) => boolean;
+        filter?: (data: T) => boolean;
     }, opts?: EntityStorageLoadOptions): Promise<LoadResult<T>>;
     load<T extends Entity<T>>(id: number, entityName: string, opts?: EntityStorageLoadOptions): Promise<T>;
     nextValue(entityOrName: string | any): Promise<number>;

package/src/app/core/services/storage/entity-store.class.d.ts

@@ -42,9 +42,9 @@ export declare class EntityStore<T extends IEntity<T, ID>, ID = number, O extend
     watchAll(variables: {
         offset?: number;
         size?: number;
-        sortBy?: string;
+        sortBy?: keyof T | string;
         sortDirection?: string;
-        filter?: (T: any) => boolean;
+        filter?: (data: T) => boolean;
     }, opts?: O): Observable<LoadResult<T>>;
     /**
      * WIll apply a filter, then a sort, then a page slice
@@ -55,9 +55,9 @@ export declare class EntityStore<T extends IEntity<T, ID>, ID = number, O extend
     loadAll(variables: {
         offset?: number;
         size?: number;
-        sortBy?: string;
+        sortBy?: keyof T | string;
         sortDirection?: string;
-        filter?: (T: any) => boolean;
+        filter?: (data: T) => boolean;
     }, opts?: O): Promise<LoadResult<T>>;
     save(entity: T, opts?: {
         emitEvent?: boolean;

package/src/app/core/services/validator/local-settings.validator.d.ts

@@ -2,19 +2,15 @@ import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, ValidationErrors
 import { LocalSettings } from '../model/settings.model';
 import { NetworkService } from '../network.service';
 import { AppValidatorService } from './base.validator.class';
-import { AppFormArray } from '../../form/array/form-array';
-import { Property } from '../../../shared/types';
 import { PropertyValidator } from '../../form/properties/property.validator';
+import { FormFieldDefinition } from '../../../shared/form/field.model';
 import * as i0 from "@angular/core";
 export declare class LocalSettingsValidatorService extends AppValidatorService<LocalSettings> {
     private propertyValidator;
     private networkService;
     constructor(formBuilder: UntypedFormBuilder, propertyValidator: PropertyValidator, networkService: NetworkService);
-    getFormGroup(data?: LocalSettings): UntypedFormGroup;
-    getPropertiesArray(data?: any): AppFormArray<Property, UntypedFormGroup>;
-    getPropertyFormGroup(data?: {
-        key: string;
-        value?: string;
+    getFormGroup(data?: LocalSettings, opts?: {
+        definitions?: FormFieldDefinition[];
     }): UntypedFormGroup;
     protected peerAlive(peerUrlControl: AbstractControl): Promise<ValidationErrors | null>;
     static ɵfac: i0.ɵɵFactoryDeclaration<LocalSettingsValidatorService, never>;

package/src/app/core/settings/settings.page.d.ts

@@ -34,6 +34,7 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
     protected saving: boolean;
     protected usageModes: UsageMode[];
     protected menuItems: IMenuItem[];
+    protected showOptionKeys: boolean;
     protected propertyDefinitions: FormFieldDefinition[];
     protected latLongFormats: string[];
     get accountInheritance(): boolean;
@@ -44,8 +45,9 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
     propertiesForm: AppPropertiesForm;
     constructor(injector: Injector, platform: PlatformService, navController: NavController, validatorService: LocalSettingsValidatorService, alertCtrl: AlertController, translate: TranslateService, formBuilder: UntypedFormBuilder, accountService: AccountService, settings: LocalSettingsService, cd: ChangeDetectorRef, network: NetworkService, locales: LocaleConfig[], menuItems?: IMenuItem[]);
     ngOnInit(): Promise<void>;
+    protected loadPropertyDefinitions(): void;
     load(): Promise<void>;
-    updateView(data: LocalSettings): void;
+    updateView(data: LocalSettings): Promise<void>;
     save(event?: Event, options?: any): Promise<boolean>;
     setAccountInheritance(enable: boolean, opts?: {
         emitEvent?: boolean;
@@ -75,6 +77,7 @@ export declare class SettingsPage extends AppForm<LocalSettings> implements OnIn
         emitEvent?: boolean;
     }): void;
     protected toggleDarkMode(enable?: boolean): Promise<void>;
+    protected toggleShowOptionKey(): void;
     protected markForCheck(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SettingsPage, [null, null, null, null, null, null, null, null, null, null, null, null, { optional: true; }]>;
     static ɵcmp: i0.ɵɵComponentDeclaration<SettingsPage, "page-settings", never, {}, {}, never, never, false, never>;

package/src/app/shared/debug/debug.component.d.ts

@@ -2,6 +2,7 @@ import { MatExpansionPanel } from '@angular/material/expansion';
 import { Environment } from '../../../environments/environment.class';
 import * as i0 from "@angular/core";
 export declare class DebugComponent {
+    titlePrefix: string;
     title: string;
     enable: boolean;
     expanded: boolean;
@@ -9,5 +10,5 @@ export declare class DebugComponent {
     constructor(environment: Environment);
     toggle(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<DebugComponent, [{ optional: true; }]>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<DebugComponent, "app-debug", never, { "title": { "alias": "title"; "required": false; }; "enable": { "alias": "enable"; "required": false; }; "expanded": { "alias": "expanded"; "required": false; }; }, {}, never, ["*"], false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<DebugComponent, "app-debug", never, { "titlePrefix": { "alias": "titlePrefix"; "required": false; }; "title": { "alias": "title"; "required": false; }; "enable": { "alias": "enable"; "required": false; }; "expanded": { "alias": "expanded"; "required": false; }; }, {}, never, ["*"], false, never>;
 }