eservices-core 1.0.595 → 1.0.597

package/dist/backend/src/types/main.d.ts

@@ -101,16 +101,25 @@ export interface MetadataField {
 }
 export declare type MetadataResponse = Metadata & {
     _filter: string;
+    metadataByEntityId?: number;
 };
-export interface CustomCriterion {
-    "name": string;
-    "expression": {
-        "equal"?: [string, string];
+export interface NamedCriterion {
+    name: string;
+    "expression"?: {
+        "equal"?: [CustomCriterionEqualItem, CustomCriterionEqualItem];
     };
 }
+export declare type MasterNamedCriterion = NamedCriterion & MasterEntityCriterion;
+export interface FieldsCriterion {
+    fields: string[];
+}
+export declare type MasterFieldsCriterion = FieldsCriterion & MasterEntityCriterion;
+export declare type CustomCriterionEqualItem = string | RefCriterionItem;
+export declare type RefCriterionItem = {
+    value: string | number | null;
+};
 export interface MasterEntityCriterion {
     entity: string;
-    fields: string[];
 }
-export declare type CriterionItem = string | CustomCriterion | MasterEntityCriterion;
+export declare type CriterionItem = string | NamedCriterion | MasterNamedCriterion | FieldsCriterion | MasterFieldsCriterion;
 export declare type CriterionGroup = (CriterionItem | CriterionItem[])[];

package/dist/frontend/core/classes/NotificationSystem.d.ts

@@ -1,24 +1,23 @@
 declare const _default: {
     /**
-     * @description Array of current cards.
+     * @description Хранилище текущих активных уведомлений. Если уведомление не активно (время жизни его вышло) - оно уд
+     * аляется из массива безвозвратно.
      */
     store: {
         id: number;
-        type: "error" | "warning" | "info";
+        type: NotificationType;
         msg: string;
-        children: string[];
         timeout: number;
+        children: string[];
     }[];
     /**
-     * @description Adding new Notification Item.
-     * @param type Type of current notification
-     * @param msg {String} Text message of notification item.
+     * @description Метод используется для добавления новых уведомлений. Принимает два обязательных поля type и message,
+     * которые будут отображаться в системе уведомлений.
+     * @param type Тип уведомления. В данной реализации данный тип влияет на способ отображения сообщения.
+     * @param msg {String} Текстовая метка уведомления.
      * @param options Params for current notification item: children, timeout (Default 10) in seconds.
      */
-    add(type: INotificationCard["type"], msg: string, { children, timeout }?: {
-        children?: string[];
-        timeout?: number;
-    }): void;
+    add(type: NotificationType, msg: string, { children, timeout }?: Partial<INotificationAddOptions>): NotificationCard;
     /**
      * @description Function remove item by id. Return true if card was founded, otherwise false.
      * */
@@ -29,9 +28,24 @@ declare const _default: {
     removeChild(cardId: number, childId: number): void;
 };
 export default _default;
-export interface INotificationCard {
-    id: number;
-    type: 'error' | 'warning' | 'info';
+declare class NotificationCard {
+    type: NotificationType;
     msg: string;
+    /**
+     * @description Время жизни уведомления в СЕКУНДАХ.
+     * */
+    timeout: INotificationAddOptions['timeout'];
+    children: INotificationAddOptions['children'];
+    static cardId: number;
+    id: number;
+    constructor(type: NotificationType, msg: string, 
+    /**
+     * @description Время жизни уведомления в СЕКУНДАХ.
+     * */
+    timeout: INotificationAddOptions['timeout'], children: INotificationAddOptions['children']);
+}
+export declare type NotificationType = 'error' | 'warning' | 'info' | 'success';
+interface INotificationAddOptions {
     children: string[];
+    timeout: number;
 }

package/dist/frontend/core/hooks/use-form-metadata.d.ts

@@ -56,6 +56,7 @@ export default function useFormMetadata(form: Form, id: number): {
             [name: string]: import("..").MetadataField;
         };
         _filter: string;
+        metadataByEntityId?: number;
     }>;
     update: () => Promise<void>;
 };

package/dist/frontend/core/index.d.ts

@@ -11,12 +11,12 @@ import { Values } from "./types";
 import historyService, { IParsedHistoryResponse } from "./services/history-service";
 import * as newImport from "./new/new-import";
 import { MetadataStore, ComputedMetadata, prettifyValueByMetadata } from "./classes/MetadataStore";
+import { NotificationType } from "./classes/NotificationSystem";
 import { Metadata, MetadataField, MetadataResponse } from "./../../backend/src/types/main";
 export { Metadata, MetadataResponse, MetadataField, MasterEntity, MasterEntities };
-export { newImport, testTypes, MetadataStore, ComputedMetadata, prettifyValueByMetadata };
+export { newImport, testTypes, MetadataStore, ComputedMetadata, prettifyValueByMetadata, NotificationType };
 import { ICustomerContext, ApplicationType } from "./classes/ApplicationManager";
 import { IActionExecuteResult, IValidationEffect, IActionResponse } from "./services/action-service";
-import { INotificationCard } from "./classes/NotificationSystem";
 import { IAffectedEntity } from "./hooks/use-form-action";
 import { IWizardFixedResponse } from "./services/process-wizard-service";
 import { IWizardCompletedResult, IWizardConfirmationResult, IWizardValidationErrorResult, IWizardStepConfig } from "./hooks/use-wizard";
@@ -117,7 +117,7 @@ export { utils, Request };
 /**
  * Interfaces and Types
  * */
-export { IListCell, ICustomerContext, IActionExecuteResult, IValidationEffect, INotificationCard, ApplicationType, IAffectedEntity, IWizardFixedResponse, IWizardCompletedResult, IWizardConfirmationResult, IWizardValidationErrorResult, IWizardStepConfig };
+export { IListCell, ICustomerContext, IActionExecuteResult, IValidationEffect, ApplicationType, IAffectedEntity, IWizardFixedResponse, IWizardCompletedResult, IWizardConfirmationResult, IWizardValidationErrorResult, IWizardStepConfig };
 declare const _default: {
     widgets: {
         inputs: {

package/dist/frontend/core/types/index.d.ts

@@ -100,6 +100,6 @@ export interface IOrganizationPopup {
     id: number;
     name: string;
 }
-export declare type MasterEntity = [entity: string, id: number];
+declare type MasterEntity = [entity: string, id: number];
 export declare type MasterEntities = MasterEntity[];
-export type { EntityId, ValuesInterface, Values, FormControllerInterface, FormProvideControllerInterface, TableCellInterface, ListChunker, SortConfig, ListOptions, ViewFormInterface, TableController, ValuesEntityInterface, LoginValues, TableRowController, ListRowValues };
+export type { MasterEntity, EntityId, ValuesInterface, Values, FormControllerInterface, FormProvideControllerInterface, TableCellInterface, ListChunker, SortConfig, ListOptions, ViewFormInterface, TableController, ValuesEntityInterface, LoginValues, TableRowController, ListRowValues };

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
-  * eservices-core v1.0.595
+  * eservices-core v1.0.597
   * (c) 2023 ESERVICES
   */
 'use strict';
@@ -1620,21 +1620,24 @@ var spinners = {
 var NotificationSystem = new class NotificationSystem {
     constructor() {
         /**
-         * @description Array of current cards.
+         * @description Хранилище текущих активных уведомлений. Если уведомление не активно (время жизни его вышло) - оно уд
+         * аляется из массива безвозвратно.
          */
         this.store = vue.reactive([]);
     }
     /**
-     * @description Adding new Notification Item.
-     * @param type Type of current notification
-     * @param msg {String} Text message of notification item.
+     * @description Метод используется для добавления новых уведомлений. Принимает два обязательных поля type и message,
+     * которые будут отображаться в системе уведомлений.
+     * @param type Тип уведомления. В данной реализации данный тип влияет на способ отображения сообщения.
+     * @param msg {String} Текстовая метка уведомления.
      * @param options Params for current notification item: children, timeout (Default 10) in seconds.
      */
     add(type, msg, { children, timeout = 10 } = {}) {
-        const card = new NotificationCard(type, msg, children || [], timeout);
+        const card = new NotificationCard(type, msg, timeout, children || []);
         this.store.push(card);
         if (timeout)
-            setTimeout(() => this.remove(card.id), timeout * 1000);
+            setTimeout(this.remove.bind(this, card.id), timeout * 1000);
+        return card;
     }
     /**
      * @description Function remove item by id. Return true if card was founded, otherwise false.
@@ -1664,11 +1667,15 @@ var NotificationSystem = new class NotificationSystem {
     }
 };
 class NotificationCard {
-    constructor(type, msg, children, timeout) {
+    constructor(type, msg, 
+    /**
+     * @description Время жизни уведомления в СЕКУНДАХ.
+     * */
+    timeout, children) {
         this.type = type;
         this.msg = msg;
-        this.children = children;
         this.timeout = timeout;
+        this.children = children;
         this.id = NotificationCard.cardId++;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eservices-core",
-  "version": "1.0.595",
+  "version": "1.0.597",
   "description": "Core library",
   "author": "",
   "scripts": {