update: remove unused dependency and apply model utility

npm/ng-packs/packages/components/extensible/src/lib/models/entity-actions.ts

@@ -1,5 +1,4 @@
 import { Type } from '@angular/core';
-import { O } from 'ts-toolbelt';
 import {
   Action,
   ActionContributorCallback,
@@ -9,6 +8,7 @@ import {
   ActionsFactory,
 } from './actions';
 import { FormPropTooltip } from './form-props';
+import { FilteredWithOptions, PartialWithOptions } from '../utils/model.utils';
 
 export class EntityActionList<R = any> extends ActionList<R, EntityAction<R>> {}
 
@@ -48,10 +48,8 @@ export class EntityAction<R = any> extends Action<R> {
 }
 
 type OptionalKeys = 'permission' | 'visible' | 'icon';
-type PartialEntityActionOptions<R = any> = O.Partial<O.Pick<EntityAction<R>, OptionalKeys>>;
+export type EntityActionOptions<R = any> = PartialWithOptions<EntityAction<R>, OptionalKeys> &
-type FilteredEntityActionOptions<R = any> = O.Omit<EntityAction<R>, OptionalKeys>;
+  FilteredWithOptions<EntityAction<R>, OptionalKeys>;
-export type EntityActionOptions<R = any> = PartialEntityActionOptions<R> &
-  FilteredEntityActionOptions<R>;
 
 export type EntityActionDefaults<R = any> = Record<string, EntityAction<R>[]>;
 export type EntityActionContributorCallback<R = any> = ActionContributorCallback<

npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts

@@ -1,7 +1,6 @@
 import { ABP, escapeHtmlChars } from '@abp/ng.core';
 import { InjectFlags, InjectOptions, InjectionToken, Type } from '@angular/core';
 import { Observable, of } from 'rxjs';
-import { O } from 'ts-toolbelt';
 import { ActionCallback } from './actions';
 import {
   Prop,
@@ -13,6 +12,7 @@ import {
   PropsFactory,
 } from './props';
 import { FormPropTooltip } from './form-props';
+import { FilteredWithOptions, PartialWithOptions } from '../utils/model.utils';
 
 export class EntityPropList<R = any> extends PropList<R, EntityProp<R>> {}
 
@@ -83,10 +83,8 @@ type OptionalKeys =
   | 'action'
   | 'component'
   | 'enumList';
-
+export type EntityPropOptions<R = any> = PartialWithOptions<EntityProp<R>, OptionalKeys> &
-type PartialEntityPropOptions<R = any> = O.Partial<O.Pick<EntityProp<R>, OptionalKeys>>;
+  FilteredWithOptions<EntityProp<R>, OptionalKeys>;
-type FilteredEntityPropOptions<R = any> = O.Omit<EntityProp<R>, OptionalKeys>;
-export type EntityPropOptions<R = any> = PartialEntityPropOptions<R> & FilteredEntityPropOptions<R>;
 
 export type EntityPropDefaults<R = any> = Record<string, EntityProp<R>[]>;
 export type EntityPropContributorCallback<R = any> = PropContributorCallback<EntityPropList<R>>;

npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts

@@ -2,7 +2,6 @@ import { ABP } from '@abp/ng.core';
 import { Injector, Type } from '@angular/core';
 import { AsyncValidatorFn, ValidatorFn } from '@angular/forms';
 import { Observable } from 'rxjs';
-import { O } from 'ts-toolbelt';
 import {
   Prop,
   PropCallback,
@@ -15,6 +14,7 @@ import {
   Props,
   PropsFactory,
 } from './props';
+import { FilteredWithOptions, PartialWithOptions } from '../utils/model.utils';
 
 export class FormPropList<R = any> extends PropList<R, FormProp<R>> {}
 
@@ -147,9 +147,8 @@ type OptionalKeys =
   | 'displayTextResolver'
   | 'formText'
   | 'tooltip';
-type PartialFormPropOptions<R = any> = O.Partial<O.Pick<FormProp<R>, OptionalKeys>>;
+export type FormPropOptions<R = any> = PartialWithOptions<FormProp<R>, OptionalKeys> &
-type FilteredFormPropOptions<R = any> = O.Omit<FormProp<R>, OptionalKeys>;
+  FilteredWithOptions<FormProp<R>, OptionalKeys>;
-export type FormPropOptions<R = any> = PartialFormPropOptions<R> & FilteredFormPropOptions<R>;
 
 export type CreateFormPropDefaults<R = any> = Record<string, FormProp<R>[]>;
 export type CreateFormPropContributorCallback<R = any> = PropContributorCallback<FormPropList<R>>;

npm/ng-packs/packages/components/extensible/src/lib/models/toolbar-actions.ts

@@ -1,5 +1,4 @@
 import { Injector, Type } from '@angular/core';
-import { O } from 'ts-toolbelt';
 import {
   Action,
   ActionContributorCallback,
@@ -10,6 +9,7 @@ import {
   ActionsFactory,
   ReadonlyActionData,
 } from './actions';
+import { FilteredWithOptions, PartialWithOptions } from '../utils/model.utils';
 
 export class ToolbarActionList<R = any> extends ActionList<R, ToolbarActionDefault<R>> {}
 
@@ -62,18 +62,18 @@ export class ToolbarComponent<R = any> extends Action<R> {
 }
 
 type OptionalActionKeys = 'permission' | 'visible' | 'icon' | 'btnClass';
-type PartialToolbarActionOptions<R = any> = O.Partial<O.Pick<ToolbarAction<R>, OptionalActionKeys>>;
+export type ToolbarActionOptions<R = any> = PartialWithOptions<
-type FilteredToolbarActionOptions<R = any> = O.Omit<ToolbarAction<R>, OptionalActionKeys>;
+  ToolbarAction<R>,
-export type ToolbarActionOptions<R = any> = PartialToolbarActionOptions<R> &
+  OptionalActionKeys
-  FilteredToolbarActionOptions<R>;
+> &
+  FilteredWithOptions<ToolbarAction<R>, OptionalActionKeys>;
 
 type OptionalComponentKeys = 'permission' | 'visible' | 'action';
-type PartialToolbarComponentOptions<R = any> = O.Partial<
+export type ToolbarComponentOptions<R = any> = PartialWithOptions<
-  O.Pick<ToolbarComponent<R>, OptionalComponentKeys>
+  ToolbarComponent<R>,
->;
+  OptionalComponentKeys
-type FilteredToolbarComponentOptions<R = any> = O.Omit<ToolbarComponent<R>, OptionalComponentKeys>;
+> &
-export type ToolbarComponentOptions<R = any> = PartialToolbarComponentOptions<R> &
+  FilteredWithOptions<ToolbarComponent<R>, OptionalComponentKeys>;
-  FilteredToolbarComponentOptions<R>;
 
 export type ToolbarActionDefault<R = any> = ToolbarAction<R> | ToolbarComponent<R>;