shishantbiswas/bknd
1
0
Fork 0
mirror of https://github.com/shishantbiswas/bknd.git synced 2026-03-17 12:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from bknd-io/fix/admin-ui-fixes-2

Browse Source 
admin ui: fix initial entity state in create modal
This commit is contained in:
dswbx
2024-12-11 18:37:46 +01:00
committed by GitHub
parent d2c75b1605 134fbd6d34
commit 56fb779f99
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/ui/modules/data/components/schema/create-modal/step.entity.fields.tsx
View File

@@ -1,6 +1,7 @@
import { typeboxResolver } from "@hookform/resolvers/typebox"; import { typeboxResolver } from "@hookform/resolvers/typebox";
import type { Static } from "core/utils"; import type { Static } from "core/utils";
import { type TAppDataEntityFields, entitiesSchema } from "data/data-schema"; import { type TAppDataEntityFields, entitiesSchema } from "data/data-schema";
import { mergeWith } from "lodash-es";
import { useRef } from "react"; import { useRef } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { MantineSelect } from "ui/components/form/hook-form-mantine/MantineSelect"; import { MantineSelect } from "ui/components/form/hook-form-mantine/MantineSelect";
@@ -19,15 +20,13 @@ export function StepEntityFields() {
const entity = state.entities?.create?.[0]!; const entity = state.entities?.create?.[0]!;
const defaultFields = { id: { type: "primary", name: "id" } } as const; const defaultFields = { id: { type: "primary", name: "id" } } as const;
const ref = useRef<EntityFieldsFormRef>(null); const ref = useRef<EntityFieldsFormRef>(null);
const initial = entity const initial = mergeWith(entity, {
? entity
: {
fields: defaultFields, fields: defaultFields,
config: { config: {
sort_field: "id", sort_field: "id",
sort_dir: "asc" sort_dir: "asc"
} }
}; });
const { const {
control, control,
formState: { isValid, errors }, formState: { isValid, errors },