From 9b7fd267ecdf216278e6a0ec119c80a2358c4114 Mon Sep 17 00:00:00 2001
From: sumeyyeKurtulus <sumeyye.kurtulus.business@gmail.com>
Date: Wed, 17 Jul 2024 16:50:18 +0300
Subject: [PATCH] fix: build errors

---
 .../extensible/src/lib/models/actions.ts      |  6 ++++--
 .../src/lib/models/entity-actions.ts          |  9 +++++----
 .../extensible/src/lib/models/entity-props.ts | 10 ++++++----
 .../extensible/src/lib/models/form-props.ts   |  9 +++++----
 .../extensible/src/lib/models/props.ts        |  6 ++++--
 .../src/lib/models/toolbar-actions.ts         | 20 +++++++++++--------
 .../src/lib/utils/form-props.util.ts          |  8 ++------
 .../extensible/src/lib/utils/props.util.ts    |  2 +-
 8 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts
index 07e3c0b91e..82c995f3cb 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts
@@ -22,8 +22,10 @@ export abstract class ActionData<R = any> {
   }
 }
 
-export type ReadonlyActionData<R = any> = O.Readonly<Omit<ActionData<R>, 'data'>>;
-
+export type ReadonlyActionData<R = any> = O.Merge<
+  O.Readonly<Omit<ActionData<R>, 'data' | 'record'>>,
+  { record: R }
+>;
 export abstract class Action<R = any> {
   constructor(
     public readonly permission: string,
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/entity-actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-actions.ts
index eb103cb1bd..9c28f270d5 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/models/entity-actions.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-actions.ts
@@ -47,10 +47,11 @@ export class EntityAction<R = any> extends Action<R> {
   }
 }
 
-export type EntityActionOptions<R = any> = O.Optional<
-  O.Writable<EntityAction<R>>,
-  'permission' | 'visible' | 'icon'
->;
+type OptionalKeys = 'permission' | 'visible' | 'icon';
+type PartialEntityActionOptions<R = any> = O.Partial<O.Pick<EntityAction<R>, OptionalKeys>>;
+type FilteredEntityActionOptions<R = any> = O.Omit<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<
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts
index 7692457cd8..b06845af98 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts
@@ -71,8 +71,7 @@ export class EntityProp<R = any> extends Prop<R> {
   }
 }
 
-export type EntityPropOptions<R = any> = O.Optional<
-  O.Writable<EntityProp<R>>,
+type OptionalKeys =
   | 'permission'
   | 'visible'
   | 'columnVisible'
@@ -83,8 +82,11 @@ export type EntityPropOptions<R = any> = O.Optional<
   | 'valueResolver'
   | 'action'
   | 'component'
-  | 'enumList'
->;
+  | 'enumList';
+
+type PartialEntityPropOptions<R = any> = O.Partial<O.Pick<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>>;
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts
index c1b8cacbe2..f9f3736dee 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts
@@ -131,8 +131,7 @@ export class FormPropData<R = any> extends PropData<R> {
   }
 }
 
-export type FormPropOptions<R = any> = O.Optional<
-  O.Writable<FormProp<R>>,
+type OptionalKeys =
   | 'permission'
   | 'visible'
   | 'displayName'
@@ -147,8 +146,10 @@ export type FormPropOptions<R = any> = O.Optional<
   | 'id'
   | 'displayTextResolver'
   | 'formText'
-  | 'tooltip'
->;
+  | 'tooltip';
+type PartialFormPropOptions<R = any> = O.Partial<O.Pick<FormProp<R>, OptionalKeys>>;
+type FilteredFormPropOptions<R = any> = O.Omit<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>>;
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts
index 2c88bd9939..549e6aa43d 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/models/props.ts
@@ -24,8 +24,10 @@ export abstract class PropData<R = any> {
   }
 }
 
-export type ReadonlyPropData<R = any> = O.Readonly<Omit<PropData<R>, 'data'>>;
-
+export type ReadonlyPropData<R> = O.Merge<
+  O.Readonly<O.Omit<PropData<R>, 'data' | 'record'>>,
+  { record: R }
+>;
 export abstract class Prop<R = any> {
   constructor(
     public readonly type: ePropType,
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/models/toolbar-actions.ts b/npm/ng-packs/packages/components/extensible/src/lib/models/toolbar-actions.ts
index 02b26a8173..b54f2e8256 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/models/toolbar-actions.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/models/toolbar-actions.ts
@@ -61,15 +61,19 @@ export class ToolbarComponent<R = any> extends Action<R> {
   }
 }
 
-export type ToolbarActionOptions<R = any> = O.Optional<
-  O.Writable<ToolbarAction<R>>,
-  'permission' | 'visible' | 'icon' | 'btnClass'
->;
-
-export type ToolbarComponentOptions<R = any> = O.Optional<
-  O.Writable<ToolbarComponent<R>>,
-  'permission' | 'visible' | 'action'
+type OptionalActionKeys = 'permission' | 'visible' | 'icon' | 'btnClass';
+type PartialToolbarActionOptions<R = any> = O.Partial<O.Pick<ToolbarAction<R>, OptionalActionKeys>>;
+type FilteredToolbarActionOptions<R = any> = O.Omit<ToolbarAction<R>, OptionalActionKeys>;
+export type ToolbarActionOptions<R = any> = PartialToolbarActionOptions<R> &
+  FilteredToolbarActionOptions<R>;
+
+type OptionalComponentKeys = 'permission' | 'visible' | 'action';
+type PartialToolbarComponentOptions<R = any> = O.Partial<
+  O.Pick<ToolbarComponent<R>, OptionalComponentKeys>
 >;
+type FilteredToolbarComponentOptions<R = any> = O.Omit<ToolbarComponent<R>, OptionalComponentKeys>;
+export type ToolbarComponentOptions<R = any> = PartialToolbarComponentOptions<R> &
+  FilteredToolbarComponentOptions<R>;
 
 export type ToolbarActionDefault<R = any> = ToolbarAction<R> | ToolbarComponent<R>;
 
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts
index aacc6fe597..75b8487b31 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts
@@ -16,7 +16,7 @@ export function generateFormFromProps<R = any>(data: PropData<R>) {
   const extraForm = new UntypedFormGroup({});
   form.addControl(EXTRA_PROPERTIES_KEY, extraForm);
 
-  const record: any = data.record || {};
+  const record = data.record || {};
   const type = JSON.stringify(record) === '{}' ? 'create' : 'edit';
   const props: FormPropList<R> = extensions[`${type}FormProps`].get(identifier).props;
   const extraProperties = record[EXTRA_PROPERTIES_KEY] || {};
@@ -24,11 +24,7 @@ export function generateFormFromProps<R = any>(data: PropData<R>) {
   props.forEach(({ value: prop }) => {
     const name = prop.name;
     const isExtraProperty = prop.isExtra || name in extraProperties;
-    let value = isExtraProperty
-      ? extraProperties[name as string]
-      : name in record
-        ? record[name]
-        : undefined;
+    let value = isExtraProperty ? extraProperties[name] : name in record ? record[name] : undefined;
 
     if (typeof value === 'undefined') value = prop.defaultValue;
 
diff --git a/npm/ng-packs/packages/components/extensible/src/lib/utils/props.util.ts b/npm/ng-packs/packages/components/extensible/src/lib/utils/props.util.ts
index ccd00d3862..7207858036 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/utils/props.util.ts
+++ b/npm/ng-packs/packages/components/extensible/src/lib/utils/props.util.ts
@@ -26,7 +26,7 @@ import {
 export function createExtraPropertyValueResolver<T>(
   name: string,
 ): PropCallback<T, Observable<any>> {
-  return (data?) => of((data?.record as { [key: string]: any })[EXTRA_PROPERTIES_KEY][name]);
+  return (data?) => of((data.record as { [key: string]: any })[EXTRA_PROPERTIES_KEY][name]);
 }
 
 export function mergeWithDefaultProps<F extends PropsFactory<any>>(