From 8f950ed6657000d1c5fdcd9a4143d7a9644f221e Mon Sep 17 00:00:00 2001 From: ewandor Date: Sun, 20 Apr 2025 13:58:32 +0200 Subject: [PATCH] Small front corrections --- api/rpk-api/firm/core/routes.py | 2 +- gui/rpk-gui/.npmrc | 3 +-- .../lib/crud/components/widgets/crud-text-widget.tsx | 10 +++++++--- gui/rpk-gui/src/pages/firm/base-page/Edit.tsx | 2 -- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/api/rpk-api/firm/core/routes.py b/api/rpk-api/firm/core/routes.py index 39deebc..11af19b 100644 --- a/api/rpk-api/firm/core/routes.py +++ b/api/rpk-api/firm/core/routes.py @@ -21,7 +21,7 @@ def get_crud_router(model: CrudDocument, model_create: Writer, model_read: Reade async def create(schema: model_create, reg=Depends(get_authed_tenant_registry)) -> model_read: await schema.validate_foreign_key(reg.db) record = await model.create(reg.db, schema) - return model_read.validate_model(record) + return model_read.from_model(record) @router.get("/{record_id}", response_description=f"{model_name} record retrieved") async def read_one(record_id: PydanticObjectId, reg=Depends(get_authed_tenant_registry)) -> model_read: diff --git a/gui/rpk-gui/.npmrc b/gui/rpk-gui/.npmrc index acb88cc..e9ee3cb 100644 --- a/gui/rpk-gui/.npmrc +++ b/gui/rpk-gui/.npmrc @@ -1,2 +1 @@ -legacy-peer-deps=true -strict-peer-dependencies=false \ No newline at end of file +legacy-peer-deps=true \ No newline at end of file diff --git a/gui/rpk-gui/src/lib/crud/components/widgets/crud-text-widget.tsx b/gui/rpk-gui/src/lib/crud/components/widgets/crud-text-widget.tsx index 4c90b69..8c13b2e 100644 --- a/gui/rpk-gui/src/lib/crud/components/widgets/crud-text-widget.tsx +++ b/gui/rpk-gui/src/lib/crud/components/widgets/crud-text-widget.tsx @@ -1,14 +1,18 @@ -import {FormContextType, getTemplate, RJSFSchema, StrictRJSFSchema, WidgetProps} from "@rjsf/utils"; +import React from "react"; +import { FormContextType, getTemplate, RJSFSchema, WidgetProps } from "@rjsf/utils"; +import Typography from "@mui/material/Typography"; import ForeignKeyWidget from "./foreign-key"; import Typography from "@mui/material/Typography"; -export default function CrudTextWidget( +export type CrudTextRJSFSchema = RJSFSchema & { props? : any }; + +export default function CrudTextWidget( props: WidgetProps ) { const { schema } = props; if (schema.hasOwnProperty("foreign_key")) { - return (); + return ; } else if (schema.hasOwnProperty("const")) { return {schema.const as string}; } else { diff --git a/gui/rpk-gui/src/pages/firm/base-page/Edit.tsx b/gui/rpk-gui/src/pages/firm/base-page/Edit.tsx index a1bfb0b..d557ce7 100644 --- a/gui/rpk-gui/src/pages/firm/base-page/Edit.tsx +++ b/gui/rpk-gui/src/pages/firm/base-page/Edit.tsx @@ -12,8 +12,6 @@ const Edit = (props: EditProps) => { const { schemaName, resource, uiSchema } = props; const { record_id } = useParams(); - console.log(record_id); - return (