@etsoo/appscript 1.2.78 → 1.2.81

package/lib/cjs/app/CoreApp.d.ts

@@ -3,7 +3,6 @@ import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { ProductUnit } from '../business/ProductUnit';
-import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
@@ -270,7 +269,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): IdLabelDto[];
+    getRoles(role: number): DataTypes.IdLabelItem[];
     /**
      * Get status label
      * @param status Status value
@@ -280,7 +279,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Get status list
      * @returns list
      */
-    getStatusList(): IdLabelDto[];
+    getStatusList(): DataTypes.IdLabelItem[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -349,7 +348,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * @param serviceId Service id
      * @returns Result
      */
-    orgList(items?: number, serviceId?: number): Promise<IdLabelDto[] | undefined>;
+    orgList(items?: number, serviceId?: number): Promise<DataTypes.IdLabelItem[] | undefined>;
     /**
      * Persist settings to source when application exit
      */
@@ -718,7 +717,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto[];
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): DataTypes.IdLabelItem[];
     /**
      * Get enum item string id list
      * @param em Enum
@@ -726,7 +725,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto<string>[];
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): DataTypes.IdLabelItem<string>[];
     /**
      * Get all regions
      * @returns Regions
@@ -736,12 +735,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): IdLabelDto<number>[];
+    getRoles(role: number): DataTypes.IdLabelItem<number>[];
     /**
      * Get status list
      * @returns list
      */
-    getStatusList(): IdLabelDto<number>[];
+    getStatusList(): DataTypes.IdLabelItem<number>[];
     /**
      * Get status label
      * @param status Status value
@@ -824,7 +823,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param serviceId Service id
      * @returns Result
      */
-    orgList(items?: number, serviceId?: number): Promise<IdLabelDto<number>[] | undefined>;
+    orgList(items?: number, serviceId?: number): Promise<DataTypes.IdLabelItem<number>[] | undefined>;
     /**
      * Switch organization
      * @param id Organization id

package/lib/cjs/business/BusinessUtils.d.ts

@@ -1,5 +1,4 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
 import { ProductUnit } from './ProductUnit';
 /**
@@ -20,7 +19,7 @@ export declare namespace BusinessUtils {
      * @param func Label delegate
      * @returns Collection
      */
-    function getCurrencies(currencyNames: string[], func: ICultureGet): IdLabelDto<string>[];
+    function getCurrencies(currencyNames: string[], func: ICultureGet): DataTypes.IdLabelItem<string>[];
     /**
      * Get 12-month items
      * @param monthLabels Month labels
@@ -42,7 +41,7 @@ export declare namespace BusinessUtils {
      * @param func Label delegate
      * @returns Units
      */
-    function getUnits(func: ICultureGet): IdLabelDto[];
+    function getUnits(func: ICultureGet): DataTypes.IdLabelItem[];
     /**
      *
      * Get all product units
@@ -51,7 +50,7 @@ export declare namespace BusinessUtils {
      * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Units
      */
-    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): IdLabelDto[];
+    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): DataTypes.IdLabelItem[];
     /**
      *
      * Get all repeat options
@@ -60,5 +59,14 @@ export declare namespace BusinessUtils {
      * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Units
      */
-    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): IdLabelDto[];
+    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): DataTypes.IdLabelItem[];
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    function setIdValue<T extends {
+        id?: number;
+        sid?: string;
+    }>(item: T, id?: DataTypes.IdType): void;
 }

package/lib/cjs/business/BusinessUtils.js

@@ -127,4 +127,18 @@ var BusinessUtils;
         return getUnits(func, options, isJoined);
     }
     BusinessUtils.getRepeatOptions = getRepeatOptions;
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    function setIdValue(item, id) {
+        if (id == null)
+            return;
+        if (typeof id === 'number')
+            item.id = id;
+        else
+            item.sid = id;
+    }
+    BusinessUtils.setIdValue = setIdValue;
 })(BusinessUtils = exports.BusinessUtils || (exports.BusinessUtils = {}));

package/lib/cjs/dto/IdLabelDto.d.ts

@@ -1,14 +1,5 @@
 import { DataTypes } from '@etsoo/shared';
-/**
- * Dto with id and label field
- */
-export declare type IdLabelDto<T extends DataTypes.IdType = number> = DataTypes.IdItem<T> & {
-    /**
-     * Label
-     */
-    label: string;
-};
 /**
  * Conditional IdLabel type
  */
-export declare type IdLabelConditional<T extends boolean> = T extends true ? IdLabelDto<number>[] : IdLabelDto<string>[];
+export declare type IdLabelConditional<T extends boolean> = T extends true ? DataTypes.IdLabelItem<number>[] : DataTypes.IdLabelItem<string>[];

package/lib/cjs/dto/IdLabelPrimaryDto.d.ts

@@ -1,9 +1,8 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdLabelDto } from './IdLabelDto';
 /**
  * Dto with id, label and primary field
  */
-export declare type IdLabelPrimaryDto<T extends DataTypes.IdType = number> = IdLabelDto<T> & {
+export declare type IdLabelPrimaryDto<T extends DataTypes.IdType = number> = DataTypes.IdLabelItem<T> & {
     /**
      * Is primary
      */

package/lib/cjs/rq/TiplistRQ.d.ts

@@ -1,16 +1,21 @@
+import { DataTypes } from '@etsoo/shared';
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export declare type TiplistRQ<T = number> = {
+export declare type TiplistRQ = {
     /**
-     * Current id
+     * number id
      */
-    id: T;
+    id?: number;
+    /**
+     * String id
+     */
+    sid?: string;
     /**
      * Excluded ids
      */
-    excludedIds?: T[];
+    excludedIds?: DataTypes.IdType[];
     /**
      * Filter keyword
      */

package/lib/mjs/app/CoreApp.d.ts

@@ -3,7 +3,6 @@ import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils, IStorage } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { ProductUnit } from '../business/ProductUnit';
-import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
 import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
@@ -270,7 +269,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): IdLabelDto[];
+    getRoles(role: number): DataTypes.IdLabelItem[];
     /**
      * Get status label
      * @param status Status value
@@ -280,7 +279,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * Get status list
      * @returns list
      */
-    getStatusList(): IdLabelDto[];
+    getStatusList(): DataTypes.IdLabelItem[];
     /**
      * Get refresh token from response headers
      * @param rawResponse Raw response from API call
@@ -349,7 +348,7 @@ export interface ICoreApp<U extends IUser, S extends IAppSettings, N, C extends
      * @param serviceId Service id
      * @returns Result
      */
-    orgList(items?: number, serviceId?: number): Promise<IdLabelDto[] | undefined>;
+    orgList(items?: number, serviceId?: number): Promise<DataTypes.IdLabelItem[] | undefined>;
     /**
      * Persist settings to source when application exit
      */
@@ -718,7 +717,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto[];
+    protected getEnumList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): DataTypes.IdLabelItem[];
     /**
      * Get enum item string id list
      * @param em Enum
@@ -726,7 +725,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param filter Filter
      * @returns List
      */
-    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): IdLabelDto<string>[];
+    protected getEnumStrList<E extends DataTypes.EnumBase = DataTypes.EnumBase>(em: E, prefix: string, filter?: (id: E[keyof E], key: keyof E & string) => E[keyof E] | undefined): DataTypes.IdLabelItem<string>[];
     /**
      * Get all regions
      * @returns Regions
@@ -736,12 +735,12 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): IdLabelDto<number>[];
+    getRoles(role: number): DataTypes.IdLabelItem<number>[];
     /**
      * Get status list
      * @returns list
      */
-    getStatusList(): IdLabelDto<number>[];
+    getStatusList(): DataTypes.IdLabelItem<number>[];
     /**
      * Get status label
      * @param status Status value
@@ -824,7 +823,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @param serviceId Service id
      * @returns Result
      */
-    orgList(items?: number, serviceId?: number): Promise<IdLabelDto<number>[] | undefined>;
+    orgList(items?: number, serviceId?: number): Promise<DataTypes.IdLabelItem<number>[] | undefined>;
     /**
      * Switch organization
      * @param id Organization id

package/lib/mjs/business/BusinessUtils.d.ts

@@ -1,5 +1,4 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
 import { ProductUnit } from './ProductUnit';
 /**
@@ -20,7 +19,7 @@ export declare namespace BusinessUtils {
      * @param func Label delegate
      * @returns Collection
      */
-    function getCurrencies(currencyNames: string[], func: ICultureGet): IdLabelDto<string>[];
+    function getCurrencies(currencyNames: string[], func: ICultureGet): DataTypes.IdLabelItem<string>[];
     /**
      * Get 12-month items
      * @param monthLabels Month labels
@@ -42,7 +41,7 @@ export declare namespace BusinessUtils {
      * @param func Label delegate
      * @returns Units
      */
-    function getUnits(func: ICultureGet): IdLabelDto[];
+    function getUnits(func: ICultureGet): DataTypes.IdLabelItem[];
     /**
      *
      * Get all product units
@@ -51,7 +50,7 @@ export declare namespace BusinessUtils {
      * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Units
      */
-    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): IdLabelDto[];
+    function getUnits(func: ICultureGet, options?: string[], isJoined?: boolean): DataTypes.IdLabelItem[];
     /**
      *
      * Get all repeat options
@@ -60,5 +59,14 @@ export declare namespace BusinessUtils {
      * @param isJoined Add the join label like 'per Kg' for Kg
      * @returns Units
      */
-    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): IdLabelDto[];
+    function getRepeatOptions(func: ICultureGet, options?: string[], isJoined?: boolean): DataTypes.IdLabelItem[];
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    function setIdValue<T extends {
+        id?: number;
+        sid?: string;
+    }>(item: T, id?: DataTypes.IdType): void;
 }

package/lib/mjs/business/BusinessUtils.js

@@ -124,4 +124,18 @@ export var BusinessUtils;
         return getUnits(func, options, isJoined);
     }
     BusinessUtils.getRepeatOptions = getRepeatOptions;
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    function setIdValue(item, id) {
+        if (id == null)
+            return;
+        if (typeof id === 'number')
+            item.id = id;
+        else
+            item.sid = id;
+    }
+    BusinessUtils.setIdValue = setIdValue;
 })(BusinessUtils || (BusinessUtils = {}));

package/lib/mjs/dto/IdLabelDto.d.ts

@@ -1,14 +1,5 @@
 import { DataTypes } from '@etsoo/shared';
-/**
- * Dto with id and label field
- */
-export declare type IdLabelDto<T extends DataTypes.IdType = number> = DataTypes.IdItem<T> & {
-    /**
-     * Label
-     */
-    label: string;
-};
 /**
  * Conditional IdLabel type
  */
-export declare type IdLabelConditional<T extends boolean> = T extends true ? IdLabelDto<number>[] : IdLabelDto<string>[];
+export declare type IdLabelConditional<T extends boolean> = T extends true ? DataTypes.IdLabelItem<number>[] : DataTypes.IdLabelItem<string>[];

package/lib/mjs/dto/IdLabelPrimaryDto.d.ts

@@ -1,9 +1,8 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdLabelDto } from './IdLabelDto';
 /**
  * Dto with id, label and primary field
  */
-export declare type IdLabelPrimaryDto<T extends DataTypes.IdType = number> = IdLabelDto<T> & {
+export declare type IdLabelPrimaryDto<T extends DataTypes.IdType = number> = DataTypes.IdLabelItem<T> & {
     /**
      * Is primary
      */

package/lib/mjs/rq/TiplistRQ.d.ts

@@ -1,16 +1,21 @@
+import { DataTypes } from '@etsoo/shared';
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export declare type TiplistRQ<T = number> = {
+export declare type TiplistRQ = {
     /**
-     * Current id
+     * number id
      */
-    id: T;
+    id?: number;
+    /**
+     * String id
+     */
+    sid?: string;
     /**
      * Excluded ids
      */
-    excludedIds?: T[];
+    excludedIds?: DataTypes.IdType[];
     /**
      * Filter keyword
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.78",
+    "version": "1.2.81",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,19 +54,19 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.1.6",
         "@etsoo/restclient": "^1.0.70",
-        "@etsoo/shared": "^1.1.45",
+        "@etsoo/shared": "^1.1.46",
         "@types/crypto-js": "^4.1.1",
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.18.10",
-        "@babel/core": "^7.18.10",
+        "@babel/core": "^7.18.13",
         "@babel/plugin-transform-runtime": "^7.18.10",
         "@babel/preset-env": "^7.18.10",
         "@babel/runtime-corejs3": "^7.18.9",
         "@types/jest": "^28.1.7",
-        "@typescript-eslint/eslint-plugin": "^5.33.1",
-        "@typescript-eslint/parser": "^5.33.1",
+        "@typescript-eslint/eslint-plugin": "^5.34.0",
+        "@typescript-eslint/parser": "^5.34.0",
         "eslint": "^8.22.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",

package/src/app/CoreApp.ts

@@ -33,7 +33,6 @@ import { BridgeUtils } from '../bridges/BridgeUtils';
 import { BusinessUtils } from '../business/BusinessUtils';
 import { EntityStatus } from '../business/EntityStatus';
 import { ProductUnit } from '../business/ProductUnit';
-import { IdLabelDto } from '../dto/IdLabelDto';
 import { InitCallDto } from '../dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
@@ -386,7 +385,7 @@ export interface ICoreApp<
      * Get roles
      * @param role Combination role value
      */
-    getRoles(role: number): IdLabelDto[];
+    getRoles(role: number): DataTypes.IdLabelItem[];
 
     /**
      * Get status label
@@ -398,7 +397,7 @@ export interface ICoreApp<
      * Get status list
      * @returns list
      */
-    getStatusList(): IdLabelDto[];
+    getStatusList(): DataTypes.IdLabelItem[];
 
     /**
      * Get refresh token from response headers
@@ -487,7 +486,7 @@ export interface ICoreApp<
     orgList(
         items?: number,
         serviceId?: number
-    ): Promise<IdLabelDto[] | undefined>;
+    ): Promise<DataTypes.IdLabelItem[] | undefined>;
 
     /**
      * Persist settings to source when application exit
@@ -1621,8 +1620,8 @@ export abstract class CoreApp<
             id: E[keyof E],
             key: keyof E & string
         ) => E[keyof E] | undefined
-    ): IdLabelDto[] {
-        const list: IdLabelDto<number>[] = [];
+    ): DataTypes.IdLabelItem[] {
+        const list: DataTypes.IdLabelItem<number>[] = [];
         const keys = DataTypes.getEnumKeys(em);
         for (const key of keys) {
             let id = em[key as keyof E];
@@ -1652,8 +1651,8 @@ export abstract class CoreApp<
             id: E[keyof E],
             key: keyof E & string
         ) => E[keyof E] | undefined
-    ): IdLabelDto<string>[] {
-        const list: IdLabelDto<string>[] = [];
+    ): DataTypes.IdLabelItem<string>[] {
+        const list: DataTypes.IdLabelItem<string>[] = [];
         const keys = DataTypes.getEnumKeys(em);
         for (const key of keys) {
             let id = em[key as keyof E];
@@ -1884,7 +1883,7 @@ export abstract class CoreApp<
      * @returns Result
      */
     async orgList(items?: number, serviceId?: number) {
-        return await this.api.post<IdLabelDto[]>(
+        return await this.api.post<DataTypes.IdLabelItem[]>(
             'Organization/List',
             {
                 items,

package/src/business/BusinessUtils.ts

@@ -1,5 +1,4 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdLabelDto } from '../dto/IdLabelDto';
 import { ICultureGet } from '../state/Culture';
 import { ProductUnit } from './ProductUnit';
 import { RepeatOption } from './RepeatOption';
@@ -56,7 +55,7 @@ export namespace BusinessUtils {
     export function getCurrencies(
         currencyNames: string[],
         func: ICultureGet
-    ): IdLabelDto<string>[] {
+    ): DataTypes.IdLabelItem<string>[] {
         return currencyNames.map((name) => ({
             id: name,
             label: func(`currency${name}`) ?? name
@@ -110,7 +109,7 @@ export namespace BusinessUtils {
      * @param func Label delegate
      * @returns Units
      */
-    export function getUnits(func: ICultureGet): IdLabelDto[];
+    export function getUnits(func: ICultureGet): DataTypes.IdLabelItem[];
 
     /**
      *
@@ -124,7 +123,7 @@ export namespace BusinessUtils {
         func: ICultureGet,
         options?: string[],
         isJoined?: boolean
-    ): IdLabelDto[];
+    ): DataTypes.IdLabelItem[];
 
     /**
      *
@@ -138,7 +137,7 @@ export namespace BusinessUtils {
         func: ICultureGet,
         options?: string[],
         isJoined?: boolean
-    ): IdLabelDto[] {
+    ): DataTypes.IdLabelItem[] {
         options ??= DataTypes.getEnumKeys(ProductUnit);
         return options.map((key) => {
             const id = DataTypes.getEnumByKey(ProductUnit, key)! as number;
@@ -161,10 +160,24 @@ export namespace BusinessUtils {
         func: ICultureGet,
         options?: string[],
         isJoined: boolean = true
-    ): IdLabelDto[] {
+    ): DataTypes.IdLabelItem[] {
         options ??= DataTypes.getEnumKeys(RepeatOption);
         isJoined ??= true;
 
         return getUnits(func, options, isJoined);
     }
+
+    /**
+     * Set id value
+     * @param item QueryRQ or TiplistRQ or similiar item
+     * @param id Id value
+     */
+    export function setIdValue<T extends { id?: number; sid?: string }>(
+        item: T,
+        id?: DataTypes.IdType
+    ) {
+        if (id == null) return;
+        if (typeof id === 'number') item.id = id;
+        else item.sid = id;
+    }
 }

package/src/dto/IdLabelDto.ts

@@ -1,19 +1,8 @@
 import { DataTypes } from '@etsoo/shared';
 
-/**
- * Dto with id and label field
- */
-export type IdLabelDto<T extends DataTypes.IdType = number> =
-    DataTypes.IdItem<T> & {
-        /**
-         * Label
-         */
-        label: string;
-    };
-
 /**
  * Conditional IdLabel type
  */
 export type IdLabelConditional<T extends boolean> = T extends true
-    ? IdLabelDto<number>[]
-    : IdLabelDto<string>[];
+    ? DataTypes.IdLabelItem<number>[]
+    : DataTypes.IdLabelItem<string>[];

package/src/dto/IdLabelPrimaryDto.ts

@@ -1,11 +1,10 @@
 import { DataTypes } from '@etsoo/shared';
-import { IdLabelDto } from './IdLabelDto';
 
 /**
  * Dto with id, label and primary field
  */
 export type IdLabelPrimaryDto<T extends DataTypes.IdType = number> =
-    IdLabelDto<T> & {
+    DataTypes.IdLabelItem<T> & {
         /**
          * Is primary
          */

package/src/rq/TiplistRQ.ts

@@ -1,17 +1,24 @@
+import { DataTypes } from '@etsoo/shared';
+
 /**
  * Tiplist request data
  * com.etsoo.CoreFramework.Models.TiplistRQ
  */
-export type TiplistRQ<T = number> = {
+export type TiplistRQ = {
+    /**
+     * number id
+     */
+    id?: number;
+
     /**
-     * Current id
+     * String id
      */
-    id: T;
+    sid?: string;
 
     /**
      * Excluded ids
      */
-    excludedIds?: T[];
+    excludedIds?: DataTypes.IdType[];
 
     /**
      * Filter keyword