Browse Source

fix: build errors

pull/20244/head
sumeyyeKurtulus 2 years ago
parent
commit
9b7fd267ec
  1. 6
      npm/ng-packs/packages/components/extensible/src/lib/models/actions.ts
  2. 9
      npm/ng-packs/packages/components/extensible/src/lib/models/entity-actions.ts
  3. 10
      npm/ng-packs/packages/components/extensible/src/lib/models/entity-props.ts
  4. 9
      npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts
  5. 6
      npm/ng-packs/packages/components/extensible/src/lib/models/props.ts
  6. 20
      npm/ng-packs/packages/components/extensible/src/lib/models/toolbar-actions.ts
  7. 8
      npm/ng-packs/packages/components/extensible/src/lib/utils/form-props.util.ts
  8. 2
      npm/ng-packs/packages/components/extensible/src/lib/utils/props.util.ts

6
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,

9
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<

10
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>>;

9
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>>;

6
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,

20
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>;

8
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;

2
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>>(

Loading…
Cancel
Save