WIP - starting to implement I18n

api/rpk-api/firm/contract/models.py

@@ -5,9 +5,8 @@ from uuid import UUID
 
 from beanie import PydanticObjectId
 from pydantic import BaseModel, Field
-from pydantic.json_schema import SkipJsonSchema
 
-from firm.core.models import CrudDocument, RichtextSingleline, RichtextMultiline, DictionaryEntry, ForeignKey
+from firm.core.models import CrudDocument, RichtextSingleline, RichtextMultiline, DictionaryEntry
 from firm.core.filter import Filter, FilterSchema
 from firm.entity.models import Entity
 
@@ -26,10 +25,27 @@ class ContractDraftStatus(str, Enum):
 
 
 class DraftParty(BaseModel):
-    entity_id: PydanticObjectId = ForeignKey("entities", "Entity", default="", title="Partie")
-    entity: SkipJsonSchema[Entity] = Field(default=None, exclude=True, )
+    entity_id: PydanticObjectId = Field(
+        foreignKey={
+            "reference": {
+                "resource": "entities",
+                "schema": "Entity",
+            }
+        },
+        default="",
+        title="Partie"
+    )
     part: str = Field(title="Rôle")
-    representative_id: PydanticObjectId = ForeignKey("entities", "Entity", default="", title="Représentant")
+    representative_id: PydanticObjectId = Field(
+        foreignKey={
+            "reference": {
+                "resource": "entities",
+                "schema": "Entity",
+            }
+        },
+        default="",
+        title="Représentant"
+    )
 
     class Config:
         title = 'Partie'
@@ -58,10 +74,14 @@ class ProvisionGenuine(BaseModel):
 
 class ContractProvisionTemplateReference(BaseModel):
     type: Literal['template'] = ContractProvisionType.template
-    provision_template_id: PydanticObjectId = ForeignKey(
-        "templates/provisions",
-        "ProvisionTemplate",
-        displayed_fields=['title', 'body'],
+    provision_template_id: PydanticObjectId = Field(
+        foreignKey={
+            "reference": {
+                "resource": "templates/provisions",
+                "schema": "ProvisionTemplate",
+                "displayedFields": ['title', 'body']
+            },
+        },
         props={"parametrized": True},
         default="",
         title="Template de clause"
@@ -153,9 +173,6 @@ class ContractDraft(CrudDocument):
         update = ContractDraftUpdateStatus(status=status)
         await self.update(db, self, update)
 
-    def compute_label(self) -> str:
-        return f"{self.name} - {self.title}"
-
 class Contract(CrudDocument):
     """
     Contrat publié. Les contrats ne peuvent pas être modifiés.

api/rpk-api/firm/core/models.py

@@ -114,20 +114,6 @@ def RichtextSingleline(*args, **kwargs):
     return Field(*args, **kwargs)
 
 
-def ForeignKey(resource, schema, displayed_fields=None, *args, **kwargs):
-    kwargs["foreignKey"] = {
-        "reference": {
-            "resource": resource,
-            "schema": schema,
-        }
-    }
-
-    if displayed_fields:
-        kwargs["foreignKey"]["reference"]["displayedFields"] = displayed_fields
-
-    return Field(*args, **kwargs)
-
-
 class DictionaryEntry(BaseModel):
     key: str
     value: str = ""

gui/rpk-gui/src/lib/crud/components/base-form.tsx

@@ -4,7 +4,6 @@ import { RegistryFieldsType, RegistryWidgetsType, RJSFSchema, UiSchema } from "@
 import CrudTextWidget from "./widgets/crud-text-widget";
 import UnionEnumField from "./fields/union-enum";
 import { ResourceContext } from "../contexts/ResourceContext";
-import { ReactNode } from "react";
 
 type BaseFormProps = {
   schema: RJSFSchema,
@@ -13,7 +12,6 @@ type BaseFormProps = {
   onChange?: (data: any) => void,
   uiSchema?: UiSchema,
   formData?: any,
-  children?: ReactNode
 }
 
 export const customWidgets: RegistryWidgetsType = {
@@ -25,7 +23,7 @@ export const customFields: RegistryFieldsType = {
 }
 
 export const BaseForm: React.FC<BaseFormProps> = (props) => {
-  const { schema, uiSchema, resourceBasePath, formData, children, onSubmit, onChange } = props;
+  const { schema, uiSchema, resourceBasePath, formData, onSubmit, onChange } = props;
 
   return (
     <ResourceContext.Provider value={{basePath: resourceBasePath}} >
@@ -39,7 +37,6 @@ export const BaseForm: React.FC<BaseFormProps> = (props) => {
         widgets={customWidgets}
         fields={customFields}
         onChange={(e, id) => onChange != undefined && onChange(e.formData)}
-        children={children}
       />
     </ResourceContext.Provider>
   )

gui/rpk-gui/src/lib/crud/components/crud-form.tsx

@@ -1,4 +1,4 @@
-import { ReactNode, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { CircularProgress } from "@mui/material";
 import { useForm } from "@refinedev/core";
 import { UiSchema } from "@rjsf/utils";
@@ -12,12 +12,11 @@ type CrudFormProps = {
   resource: string,
   id?: string,
   onSuccess?: (data: any) => void,
-  defaultValue?: any,
-  children?: ReactNode
+  defaultValue?: any
 }
 
 export const CrudForm: React.FC<CrudFormProps> = (props) => {
-  const { schemaName, uiSchema, resourceBasePath="" ,resource, id, onSuccess, defaultValue, children } = props;
+  const { schemaName, uiSchema, resourceBasePath="" ,resource, id, onSuccess, defaultValue } = props;
 
   const { onFinish, query, formLoading } = useForm({
     resource: resourceBasePath == "" ? resource : `${resourceBasePath}/${resource}`,
@@ -58,7 +57,6 @@ export const CrudForm: React.FC<CrudFormProps> = (props) => {
       onSubmit={
         (data: any) => onFinish(data)
       }
-      children={children}
     />
   )
 }

gui/rpk-gui/src/pages/firm/DraftRoutes.tsx

@@ -1,11 +1,4 @@
 import { Route, Routes } from "react-router";
-import { CircularProgress } from "@mui/material";
-import React, { useContext, useState } from "react";
-import { useOne } from "@refinedev/core";
-import { BaseForm } from "../../lib/crud/components/base-form";
-import { ForeignKeyReference, ForeignKeySchema } from "../../lib/crud/components/widgets/foreign-key";
-
-import { FirmContext } from "../../contexts/FirmContext";
 import List from "./base-page/List";
 import Edit from "./base-page/Edit";
 import New from "./base-page/New";
@@ -36,79 +29,6 @@ const EditDraft = () => {
   return <Edit<Draft> resource={`contracts/drafts`} schemaName={"ContractDraft"} />
 }
 
-type ForeignKeySubSchema = ForeignKeySchema & {
-  properties: { [key: string]: { foreignKey: { reference: ForeignKeyReference } } }
-}
-
 const CreateDraft = () => {
-  const [chosenDraft, setChosenDraft] = useState<string|null>(null)
-  const { currentFirm } = useContext(FirmContext);
-  const resourceBasePath = `firm/${currentFirm.instance}/${currentFirm.firm}`
-  const templateFieldSchema: ForeignKeySubSchema = {
-    type: "object",
-    properties: {
-      template_id: {
-        type: "string",
-        title: "Find a template",
-        foreignKey: {
-          reference: {
-            resource: "templates/contracts",
-            schema: "ContractTemplate"
-          }
-        }
-      }
-    },
-  };
-
-  const templateForm = (
-    <BaseForm
-      schema={templateFieldSchema}
-      formData={{template_id: chosenDraft}}
-      resourceBasePath={resourceBasePath}
-      onChange={(data) => {
-        const { template_id } = data;
-        setChosenDraft(template_id);
-      }}
-    >
-      &nbsp;
-    </BaseForm>
-  )
-
-  if (chosenDraft !== null) {
-    return (
-      <>
-        {templateForm}
-        <CreateDraftFromTemplate template_id={chosenDraft}/>
-      </>
-    )
-  }
-
-  return (
-    <>
-      {templateForm}
-      <New<Draft> resource={`contracts/drafts`} schemaName={"ContractDraft"} />
-    </>
-  )
-}
-
-const CreateDraftFromTemplate = (props: { template_id: string }) => {
-  const { template_id } = props;
-  const { currentFirm } = useContext(FirmContext);
-  const resourceBasePath = `firm/${currentFirm.instance}/${currentFirm.firm}`
-  const resource = "templates/contracts"
-  const { data, isLoading } = useOne({
-    resource: `${resourceBasePath}/${resource}`,
-    id: template_id
-  });
-
-  if (isLoading || data === undefined) {
-    return <CircularProgress />
-  }
-
-  let template = { ...data.data };
-  template.provisions = data.data.provisions.map((item: any) => {
-    return { provision: {type: "template", provision_template_id: item.provision_template_id} }
-  })
-
-  return <New<Draft> resource={`contracts/drafts`} schemaName={"ContractDraft"} defaultValue={ template }/>
+  return <New<Draft> resource={`contracts/drafts`} schemaName={"ContractDraft"} />
 }

gui/rpk-gui/src/pages/firm/base-page/Edit.tsx

@@ -1,13 +1,8 @@
+import { CrudForm } from "../../../lib/crud/components/crud-form";
 import { UiSchema } from "@rjsf/utils";
 import { useParams } from "react-router";
 import { useContext } from "react";
-import { Button } from "@mui/material";
-import DeleteIcon from '@mui/icons-material/Delete';
-import SaveIcon from '@mui/icons-material/Save';
 import { FirmContext } from "../../../contexts/FirmContext";
-import { CrudForm } from "../../../lib/crud/components/crud-form";
-import Stack from "@mui/material/Stack";
-import { DeleteButton } from "@refinedev/mui";
 
 type EditProps = {
   resource: string,
@@ -22,26 +17,13 @@ const Edit = <T,>(props: EditProps) => {
   const { record_id } = useParams();
 
   return (
-    <>
-      <CrudForm
-        schemaName={schemaName}
-        uiSchema={uiSchema}
-        resourceBasePath={resourceBasePath}
-        resource={resource}
-        id={record_id}
-      >
-        <Stack
-          direction="row"
-          spacing={2}
-          sx={{
-            justifyContent: "space-between",
-            alignItems: "center",
-          }}>
-          <Button type='submit' variant="contained" size="large"><SaveIcon />Save</Button>
-          <DeleteButton variant="contained" size="large" color="error" recordItemId={record_id}/>
-        </Stack>
-      </CrudForm>
-    </>
+    <CrudForm
+      schemaName={schemaName}
+      uiSchema={uiSchema}
+      resourceBasePath={resourceBasePath}
+      resource={resource}
+      id={record_id}
+      />
   )
 }
 

gui/rpk-gui/src/providers/data-provider.tsx

@@ -96,7 +96,7 @@ const dataProvider: DataProvider = {
     };
   },
   create: async ({ resource, variables }) => {
-    const response = await fetch(`${API_URL}/${resource}/`, {
+    const response = await fetch(`${API_URL}/${resource}`, {
       method: "POST",
       body: JSON.stringify(variables),
       headers: {