shishantbiswas/bknd
1
0
Fork 0
mirror of https://github.com/shishantbiswas/bknd.git synced 2026-03-16 04:27:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix config reconciliation for specific field types, remove lodash

Browse Source 
Replace lodash with native utilities and fix config merging to preserve common properties when switching between field types.
This commit is contained in:
dswbx
2025-11-29 14:18:57 +01:00
parent 8f4de33a76
commit 1359741e5f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/core/utils/objects.ts
View File

@@ -14,9 +14,9 @@ export function isObject(value: unknown): value is Record<string, unknown> {
export function omitKeys<T extends object, K extends keyof T>( export function omitKeys<T extends object, K extends keyof T>(
obj: T, obj: T,
keys_: readonly K[], keys_: readonly K[] | K[] | string[],
): Omit<T, Extract<K, keyof T>> { ): Omit<T, Extract<K, keyof T>> {
const keys = new Set(keys_); const keys = new Set(keys_ as readonly K[]);
const result = {} as Omit<T, Extract<K, keyof T>>; const result = {} as Omit<T, Extract<K, keyof T>>;
for (const [key, value] of Object.entries(obj) as [keyof T, T[keyof T]][]) { for (const [key, value] of Object.entries(obj) as [keyof T, T[keyof T]][]) {
if (!keys.has(key as K)) { if (!keys.has(key as K)) {

7
app/src/ui/routes/data/forms/entity.fields.form.tsx
View File

@@ -5,12 +5,12 @@ import {
ucFirstAllSnakeToPascalWithSpaces, ucFirstAllSnakeToPascalWithSpaces,
s, s,
stringIdentifier, stringIdentifier,
pickKeys,
} from "bknd/utils"; } from "bknd/utils";
import { import {
type TAppDataEntityFields, type TAppDataEntityFields,
fieldsSchemaObject as originalFieldsSchemaObject, fieldsSchemaObject as originalFieldsSchemaObject,
} from "data/data-schema"; } from "data/data-schema";
import { omit } from "lodash-es";
import { forwardRef, memo, useEffect, useImperativeHandle } from "react"; import { forwardRef, memo, useEffect, useImperativeHandle } from "react";
import { type FieldArrayWithId, type UseFormReturn, useFieldArray, useForm } from "react-hook-form"; import { type FieldArrayWithId, type UseFormReturn, useFieldArray, useForm } from "react-hook-form";
import { TbGripVertical, TbSettings, TbTrash } from "react-icons/tb"; import { TbGripVertical, TbSettings, TbTrash } from "react-icons/tb";
@@ -317,7 +317,6 @@ function EntityField({
const name = watch(`fields.${index}.name`); const name = watch(`fields.${index}.name`);
const { active, toggle } = useRoutePathState(routePattern ?? "", name); const { active, toggle } = useRoutePathState(routePattern ?? "", name);
const fieldSpec = fieldSpecs.find((s) => s.type === type)!; const fieldSpec = fieldSpecs.find((s) => s.type === type)!;
const specificData = omit(field.field.config, commonProps);
const disabled = fieldSpec.disabled || []; const disabled = fieldSpec.disabled || [];
const hidden = fieldSpec.hidden || []; const hidden = fieldSpec.hidden || [];
const dragDisabled = index === 0; const dragDisabled = index === 0;
@@ -476,7 +475,7 @@ function EntityField({
field={field} field={field}
onChange={(value) => { onChange={(value) => {
setValue(`${prefix}.config`, { setValue(`${prefix}.config`, {
...getValues([`fields.${index}.config`])[0], ...pickKeys(getValues([`${prefix}.config`])[0], commonProps),
...value, ...value,
}); });
}} }}
@@ -520,7 +519,7 @@ const SpecificForm = ({
readonly?: boolean; readonly?: boolean;
}) => { }) => {
const type = field.field.type; const type = field.field.type;
const specificData = omit(field.field.config, commonProps); const specificData = omitKeys(field.field.config ?? {}, commonProps);
return ( return (
<JsonSchemaForm <JsonSchemaForm