Light reformating

Movinf card title from cartouche to edit
Implementing the partner map for author identifying
2025-05-02 01:49:14 +02:00 · 2025-05-02 00:56:51 +02:00 · 2025-05-02 00:51:05 +02:00 · 2025-05-02 00:09:56 +02:00 · 2025-05-02 00:03:08 +02:00 · 2025-05-01 22:43:40 +02:00
20 changed files with 412 additions and 183 deletions
--- a/api/rpk-api/firm/contract/routes_contract.py
+++ b/api/rpk-api/firm/contract/routes_contract.py
@@ -31,8 +31,7 @@ async def create(schema: ContractCreate, reg=Depends(get_authed_tenant_registry)
    contract_dict = schema.model_dump()
    del(contract_dict['draft_id'])

-    lawyer = await Entity.get(reg.db, reg.user.entity_id)
-    contract_dict['lawyer'] = lawyer.model_dump()
+    contract_dict['lawyer'] = reg.partner.model_dump()

    contract_dict['name'] = draft.name
    contract_dict['title'] = draft.title
--- a/api/rpk-api/firm/contract/schemas.py
+++ b/api/rpk-api/firm/contract/schemas.py
@@ -1,13 +1,14 @@
 import datetime
 from typing import List

+from beanie import PydanticObjectId
 from pydantic import BaseModel, Field

 from firm.contract.models import ContractDraft, DraftProvision, DraftParty, Contract

 from firm.entity.models import Entity
 from firm.core.schemas import Writer, Reader
-from firm.core.models import DictionaryEntry
+from firm.core.models import DictionaryEntry, ForeignKey


 class ContractDraftRead(Reader, ContractDraft):
@@ -68,7 +69,7 @@ class ContractRead(Reader, Contract):
 class ContractCreate(Writer):
    date: datetime.date
    location: str
-    draft_id: str
+    draft_id: PydanticObjectId = ForeignKey(resource="contracts/drafts", schema="ContractDraft")

 class ContractInit(BaseModel):
    date: datetime.date
--- a/api/rpk-api/firm/core/depends.py
+++ b/api/rpk-api/firm/core/depends.py
@@ -1,11 +1,15 @@
 from fastapi import HTTPException, Depends
+
 from hub.auth import get_current_user

+from firm.current_firm import CurrentFirmModel, Partner
 from firm.db import get_db_client
-from firm.current_firm import CurrentFirmModel
+from firm.entity.models import Entity
+

 class Registry:
    user = None
+    partner = None

    def __init__(self, db_client, instance, firm):
        self.db = db_client[f"tenant_{instance}_{firm}"]
@@ -14,11 +18,14 @@ class Registry:

        self.current_firm = CurrentFirmModel.get_current(self.db)

-    def set_user(self, user):
+    async def set_user(self, user):
        for firm in user.firms:
            if firm.instance == self.instance and firm.firm == self.firm:
+                partner = await Partner.get_by_user_id(self.db, user.id)
+                partner_entity = await Entity.get(self.db, partner.entity_id)
                self.user = user
-                self.db.user = user
+                self.partner = partner_entity
+                self.db.partner = partner_entity
                return

        raise PermissionError
@@ -30,9 +37,9 @@ async def get_tenant_registry(instance: str, firm: str, db_client=Depends(get_db

    return registry

-def get_authed_tenant_registry(registry=Depends(get_tenant_registry), user=Depends(get_current_user)) -> Registry:
+async def get_authed_tenant_registry(registry=Depends(get_tenant_registry), user=Depends(get_current_user)) -> Registry:
    try:
-        registry.set_user(user)
+        await registry.set_user(user)
    except PermissionError:
        raise HTTPException(status_code=404, detail="This firm doesn't exist or you are not allowed to access it.")

@@ -44,7 +51,7 @@ async def get_uninitialized_registry(instance: str, firm: str, db_client=Depends
        raise HTTPException(status_code=409, detail="Firm configuration already exists")

    try:
-        registry.set_user(user)
+        await registry.set_user(user)
    except PermissionError:
        raise HTTPException(status_code=404, detail="This firm doesn't exist or you are not allowed to access it.")

--- a/api/rpk-api/firm/core/models.py
+++ b/api/rpk-api/firm/core/models.py
@@ -37,7 +37,7 @@ class CrudDocument(BaseModel):

    @classmethod
    async def create(cls, db, create_schema):
-        model_dict = create_schema.model_dump() | {"created_by": db.user.id, "updated_by": db.user.id}
+        model_dict = create_schema.model_dump() | {"created_by": db.partner.id, "updated_by": db.partner.id}
        document = cls.model_validate(model_dict).model_dump(mode="json")
        result = await cls._get_collection(db).insert_one(document)

@@ -52,8 +52,13 @@ class CrudDocument(BaseModel):
        }

    @classmethod
-    def list(cls, db):
-        return cls._get_collection(db).find({})
+    async def list(cls, db, criteria={}):
+        result = []
+        for document in await cls._get_collection(db).find(criteria).to_list():
+            document["id"] = document.pop("_id")
+            result.append(cls.model_validate(document))
+
+        return result

    @classmethod
    async def get(cls, db, model_id):
@@ -66,7 +71,7 @@ class CrudDocument(BaseModel):

    @classmethod
    async def update(cls, db, model, update_schema):
-        model_dict = update_schema.model_dump(mode="json") | {"updated_by": db.user.id}
+        model_dict = update_schema.model_dump(mode="json") | {"updated_by": db.partner.id}
        update_query = {
            "$set": {field: value for field, value in model_dict.items() if field!= "id" }
        }
--- a/api/rpk-api/firm/current_firm/init.py
+++ b/api/rpk-api/firm/current_firm/init.py
@@ -36,14 +36,15 @@ class CurrentFirmModel(CrudDocument):
 class CurrentFirmSchemaRead(Reader):
    entity: EntityRead
    partner: EntityRead
+    partner_list: list[EntityRead]
    instance: str
    firm: str
    primary_color: str
    secondary_color: str

    @classmethod
-    def from_model_and_entities(cls, model, entity, partner):
-        schema = cls(**model.model_dump(mode="json"), entity=entity, partner=partner)
+    def from_model_and_entities(cls, model, entity, partner, partner_list):
+        schema = cls(**model.model_dump(mode="json"), entity=entity, partner=partner, partner_list=partner_list)
        return schema

 class CurrentFirmSchemaCreate(Writer):
--- a/api/rpk-api/firm/current_firm/routes.py
+++ b/api/rpk-api/firm/current_firm/routes.py
@@ -10,10 +10,17 @@ current_firm_router = APIRouter()
@current_firm_router.get("/", response_model=CurrentFirmSchemaRead, response_description=f"Current Firm records retrieved")
 async def read(reg=Depends(get_authed_tenant_registry)) -> CurrentFirmSchemaRead:
    document = await CurrentFirmModel.get_current(reg.db)
-    entity = await Entity.get(reg.db, document.entity_id)
+    firm_entity = await Entity.get(reg.db, document.entity_id)
    partner = await Partner.get_by_user_id(reg.db, reg.user.id)
    partner = await Entity.get(reg.db, partner.entity_id)
-    return CurrentFirmSchemaRead.from_model_and_entities(document, EntityRead.from_model(entity), EntityRead.from_model(partner))
+    partner_list = await Partner.list(reg.db)
+    partner_list = await Entity.list(reg.db, {"_id": {"$in": [p.entity_id for p in partner_list]}})
+    return CurrentFirmSchemaRead.from_model_and_entities(
+        document,
+        EntityRead.from_model(firm_entity),
+        EntityRead.from_model(partner),
+        [EntityRead.from_model(p) for p in partner_list]
+    )

@current_firm_router.post("/", response_description=f"Current Firm added to the database")
 async def create(schema: CurrentFirmSchemaCreate, reg=Depends(get_uninitialized_registry)) -> CurrentFirmSchemaRead:
--- a/gui/rpk-gui/package-lock.json
+++ b/gui/rpk-gui/package-lock.json
@@ -35,6 +35,7 @@
        "@tiptap/extension-underline": "^2.11.7",
        "@tiptap/react": "^2.11.7",
        "@tiptap/starter-kit": "^2.11.7",
+        "dayjs": "^1.11.13",
        "i18next": "^25.0.1",
        "i18next-browser-languagedetector": "^8.0.5",
        "i18next-http-backend": "^3.0.2",
@@ -2622,9 +2623,9 @@
      }
    },
    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.0.tgz",
-      "integrity": "sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.1.tgz",
+      "integrity": "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==",
      "cpu": [
        "arm"
      ],
@@ -2636,9 +2637,9 @@
      ]
    },
    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.0.tgz",
-      "integrity": "sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.1.tgz",
+      "integrity": "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==",
      "cpu": [
        "arm64"
      ],
@@ -2650,9 +2651,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.0.tgz",
-      "integrity": "sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.1.tgz",
+      "integrity": "sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==",
      "cpu": [
        "arm64"
      ],
@@ -2664,9 +2665,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.0.tgz",
-      "integrity": "sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.1.tgz",
+      "integrity": "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==",
      "cpu": [
        "x64"
      ],
@@ -2678,9 +2679,9 @@
      ]
    },
    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.0.tgz",
-      "integrity": "sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.1.tgz",
+      "integrity": "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==",
      "cpu": [
        "arm64"
      ],
@@ -2692,9 +2693,9 @@
      ]
    },
    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.0.tgz",
-      "integrity": "sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.1.tgz",
+      "integrity": "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==",
      "cpu": [
        "x64"
      ],
@@ -2706,9 +2707,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.0.tgz",
-      "integrity": "sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.1.tgz",
+      "integrity": "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==",
      "cpu": [
        "arm"
      ],
@@ -2720,9 +2721,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.0.tgz",
-      "integrity": "sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.1.tgz",
+      "integrity": "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==",
      "cpu": [
        "arm"
      ],
@@ -2734,9 +2735,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.0.tgz",
-      "integrity": "sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.1.tgz",
+      "integrity": "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==",
      "cpu": [
        "arm64"
      ],
@@ -2748,9 +2749,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.0.tgz",
-      "integrity": "sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.1.tgz",
+      "integrity": "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==",
      "cpu": [
        "arm64"
      ],
@@ -2762,9 +2763,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.0.tgz",
-      "integrity": "sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.1.tgz",
+      "integrity": "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==",
      "cpu": [
        "loong64"
      ],
@@ -2776,9 +2777,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.0.tgz",
-      "integrity": "sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.1.tgz",
+      "integrity": "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==",
      "cpu": [
        "ppc64"
      ],
@@ -2790,9 +2791,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.0.tgz",
-      "integrity": "sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.1.tgz",
+      "integrity": "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==",
      "cpu": [
        "riscv64"
      ],
@@ -2804,9 +2805,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.0.tgz",
-      "integrity": "sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.1.tgz",
+      "integrity": "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==",
      "cpu": [
        "riscv64"
      ],
@@ -2818,9 +2819,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.0.tgz",
-      "integrity": "sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.1.tgz",
+      "integrity": "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==",
      "cpu": [
        "s390x"
      ],
@@ -2832,9 +2833,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.0.tgz",
-      "integrity": "sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.1.tgz",
+      "integrity": "sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==",
      "cpu": [
        "x64"
      ],
@@ -2846,9 +2847,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.0.tgz",
-      "integrity": "sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.1.tgz",
+      "integrity": "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==",
      "cpu": [
        "x64"
      ],
@@ -2860,9 +2861,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.0.tgz",
-      "integrity": "sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.1.tgz",
+      "integrity": "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==",
      "cpu": [
        "arm64"
      ],
@@ -2874,9 +2875,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.0.tgz",
-      "integrity": "sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.1.tgz",
+      "integrity": "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==",
      "cpu": [
        "ia32"
      ],
@@ -2888,9 +2889,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.0.tgz",
-      "integrity": "sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.1.tgz",
+      "integrity": "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==",
      "cpu": [
        "x64"
      ],
@@ -5035,9 +5036,9 @@
      "license": "MIT"
    },
    "node_modules/electron-to-chromium": {
-      "version": "1.5.142",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.142.tgz",
-      "integrity": "sha512-Ah2HgkTu/9RhTDNThBtzu2Wirdy4DC9b0sMT1pUhbkZQ5U/iwmE+PHZX1MpjD5IkJCc2wSghgGG/B04szAx07w==",
+      "version": "1.5.144",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.144.tgz",
+      "integrity": "sha512-eJIaMRKeAzxfBSxtjYnoIAw/tdD6VIH6tHBZepZnAbE3Gyqqs5mGN87DvcldPUbVkIljTK8pY0CMcUljP64lfQ==",
      "license": "ISC"
    },
    "node_modules/emoji-regex": {
@@ -5978,9 +5979,9 @@
      "license": "ISC"
    },
    "node_modules/flow-parser": {
-      "version": "0.268.0",
-      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.268.0.tgz",
-      "integrity": "sha512-URZmPy/jKDDIJUHUfC+5KNwaPcfONTL3R8xltQWVEoCKLWowVebEBg89nbAnYHNo6ev8KzKWFpOROfHZdaCoxA==",
+      "version": "0.269.1",
+      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.269.1.tgz",
+      "integrity": "sha512-2Yr0kqvT7RwaGL192nT78O5AWJeECQjl0NEzBkMsx8OJt63BvNl5yvSIbE4qZ1VDSjEkhbUgaWYdwX354bVNjw==",
      "license": "MIT",
      "engines": {
        "node": ">=0.4.0"
@@ -6525,9 +6526,9 @@
      }
    },
    "node_modules/i18next": {
-      "version": "25.0.1",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.0.1.tgz",
-      "integrity": "sha512-8S8PyZbrymJZn3DaN70/34JYWNhsqrU6yA4MuzcygJBv+41dgNMocEA8h+kV1P7MCc1ll03lOTOIXE7mpNCicw==",
+      "version": "25.0.2",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.0.2.tgz",
+      "integrity": "sha512-xWxgK8GAaPYkV9ia2tdgbtdM+qiC+ysVTBPvXhpCORU/+QkeQe3BSI7Crr+c4ZXULN1PfnXG/HY2n7HGx4KKBg==",
      "funding": [
        {
          "type": "individual",
@@ -9289,9 +9290,9 @@
      }
    },
    "node_modules/react-router": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.2.tgz",
-      "integrity": "sha512-9Rw8r199klMnlGZ8VAsV/I8WrIF6IyJ90JQUdboupx1cdkgYqwnrYjH+I/nY/7cA1X5zia4mDJqH36npP7sxGQ==",
+      "version": "7.5.3",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.3.tgz",
+      "integrity": "sha512-3iUDM4/fZCQ89SXlDa+Ph3MevBrozBAI655OAfWQlTm9nBR0IKlrmNwFow5lPHttbwvITZfkeeeZFP6zt3F7pw==",
      "license": "MIT",
      "dependencies": {
        "cookie": "^1.0.1",
@@ -9576,9 +9577,9 @@
      }
    },
    "node_modules/rollup": {
-      "version": "4.40.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.0.tgz",
-      "integrity": "sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==",
+      "version": "4.40.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz",
+      "integrity": "sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -9592,26 +9593,26 @@
        "npm": ">=8.0.0"
      },
      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.40.0",
-        "@rollup/rollup-android-arm64": "4.40.0",
-        "@rollup/rollup-darwin-arm64": "4.40.0",
-        "@rollup/rollup-darwin-x64": "4.40.0",
-        "@rollup/rollup-freebsd-arm64": "4.40.0",
-        "@rollup/rollup-freebsd-x64": "4.40.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.40.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.40.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.40.0",
-        "@rollup/rollup-linux-arm64-musl": "4.40.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.40.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.40.0",
-        "@rollup/rollup-linux-riscv64-musl": "4.40.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.40.0",
-        "@rollup/rollup-linux-x64-gnu": "4.40.0",
-        "@rollup/rollup-linux-x64-musl": "4.40.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.40.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.40.0",
-        "@rollup/rollup-win32-x64-msvc": "4.40.0",
+        "@rollup/rollup-android-arm-eabi": "4.40.1",
+        "@rollup/rollup-android-arm64": "4.40.1",
+        "@rollup/rollup-darwin-arm64": "4.40.1",
+        "@rollup/rollup-darwin-x64": "4.40.1",
+        "@rollup/rollup-freebsd-arm64": "4.40.1",
+        "@rollup/rollup-freebsd-x64": "4.40.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.40.1",
+        "@rollup/rollup-linux-arm-musleabihf": "4.40.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.40.1",
+        "@rollup/rollup-linux-arm64-musl": "4.40.1",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.40.1",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.40.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.40.1",
+        "@rollup/rollup-linux-riscv64-musl": "4.40.1",
+        "@rollup/rollup-linux-s390x-gnu": "4.40.1",
+        "@rollup/rollup-linux-x64-gnu": "4.40.1",
+        "@rollup/rollup-linux-x64-musl": "4.40.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.40.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.40.1",
+        "@rollup/rollup-win32-x64-msvc": "4.40.1",
        "fsevents": "~2.3.2"
      }
    },
--- a/gui/rpk-gui/package.json
+++ b/gui/rpk-gui/package.json
@@ -31,6 +31,7 @@
    "@tiptap/extension-underline": "^2.11.7",
    "@tiptap/react": "^2.11.7",
    "@tiptap/starter-kit": "^2.11.7",
+    "dayjs": "^1.11.13",
    "i18next": "^25.0.1",
    "i18next-browser-languagedetector": "^8.0.5",
    "i18next-http-backend": "^3.0.2",
--- a/gui/rpk-gui/src/components/Cartouche.tsx
+++ b/gui/rpk-gui/src/components/Cartouche.tsx
@@ -0,0 +1,39 @@
+import { useTranslation } from "@refinedev/core";
+import { useContext } from "react";
+import { FirmContext } from "../contexts/FirmContext";
+
+type CartoucheProps = {
+  record: any
+}
+
+const Cartouche = (props: CartoucheProps) => {
+  const { record } = props;
+  const { translate: t } = useTranslation();
+  return (
+    <>
+      <ul>
+        <li>
+          {t("resource.created_at")}: {record.created_at} {t("resource.created_by")}:
+          <AuthorField partnerId={record.created_by} />
+        </li>
+        <li>
+          {t("resource.updated_at")}: {record.updated_at} {t("resource.updated_by")}:
+          <AuthorField partnerId={record.updated_by} />
+        </li>
+      </ul>
+    </>
+  )
+}
+
+export default Cartouche;
+
+const AuthorField = (props: {partnerId: string})=> {
+  const { partnerId } = props;
+  const { partnerMap } = useContext(FirmContext);
+  const { translate: t } = useTranslation();
+
+  if (partnerMap && partnerMap.has(partnerId)) {
+    return <>{ partnerMap.get(partnerId) }</>
+  }
+  return <>{t("REDACTED")}</>
+}
--- a/gui/rpk-gui/src/contexts/FirmContext.tsx
+++ b/gui/rpk-gui/src/contexts/FirmContext.tsx
@@ -1,9 +1,12 @@
 import React, { createContext, PropsWithChildren } from 'react';
 import { IFirm } from "../interfaces";
 import { useParams } from "react-router";
+import { useOne } from "@refinedev/core";
+import { CircularProgress } from "@mui/material";

 type FirmContextType = {
  currentFirm: IFirm,
+  partnerMap?: Map<string, string>
 }

 export const FirmContext = createContext<FirmContextType>(
@@ -12,13 +15,27 @@ export const FirmContext = createContext<FirmContextType>(


 export const FirmContextProvider: React.FC<PropsWithChildren> = ({ children }: PropsWithChildren) => {
-  const { instance, firm } = useParams<IFirm>()
+  const { instance, firm } = useParams<IFirm>();
+  const { data, isError, error, isLoading } = useOne({resource: 'firm', id: `${instance}/${firm}/`, errorNotification: false});

  if (instance === undefined || firm === undefined) {
    return "Error"
  }
+
+  if (isLoading) {
+    return <CircularProgress />
+  }
+
+  let value: FirmContextType = {
+    currentFirm: {instance, firm}
+  }
+  if (!isError || error?.statusCode != 405) {
+    value.currentFirm.entity = data?.data.entity;
+    value.partnerMap = new Map(data?.data.partner_list.map((item: any) => [item.id, item.label]));
+  }
+
  return (
-    <FirmContext.Provider value={{currentFirm: {instance, firm}}} >
+    <FirmContext.Provider value={value} >
      { children }
    </FirmContext.Provider>
  );
--- a/gui/rpk-gui/src/interfaces/index.tsx
+++ b/gui/rpk-gui/src/interfaces/index.tsx
@@ -2,6 +2,7 @@
 export type IFirm = {
  instance: string,
  firm: string
+  entity?: any
 }

 type User = {
--- a/gui/rpk-gui/src/lib/crud/components/crud-form.tsx
+++ b/gui/rpk-gui/src/lib/crud/components/crud-form.tsx
@@ -8,32 +8,23 @@ import { BaseForm } from "./base-form";
 type CrudFormProps = {
  schemaName: string,
  uiSchema?: UiSchema,
-  resourceBasePath?: string,
-  resource: string,
-  id?: string,
-  onSuccess?: (data: any) => void,
+  record?: any,
+  resourceBasePath: string,
+  onSubmit: (data: any) => void,
  defaultValue?: any,
  children?: ReactNode
 }

 export const CrudForm: React.FC<CrudFormProps> = (props) => {
-  const { schemaName, uiSchema, resourceBasePath="" ,resource, id, onSuccess, defaultValue, children } = props;
-
-  const { onFinish, query, formLoading } = useForm({
-    resource: resourceBasePath == "" ? resource : `${resourceBasePath}/${resource}`,
-    action: id === undefined ? "create" : "edit",
-    redirect: "show",
-    id,
-    onMutationSuccess: (data: any) => { if (onSuccess) { onSuccess(data) } },
-  });
+  const { schemaName, uiSchema, record, resourceBasePath, defaultValue, children, onSubmit } = props;

  const [schema, setSchema] = useState({});
  const [schemaLoading, setSchemaLoading] = useState(true);
  useEffect(() => {
    const fetchSchema = async () => {
      try {
-        const schemaFullName = id === undefined ? `${schemaName}Create` : `${schemaName}Update`;
-        const resourceSchema = await jsonschemaProvider.getResourceSchema(schemaFullName);
+        const resourceSchema = record === undefined ? await jsonschemaProvider.getCreateResourceSchema(schemaName)
+          : await jsonschemaProvider.getUpdateResourceSchema(schemaName);
        setSchema(resourceSchema);
        setSchemaLoading(false);
      } catch (error) {
@@ -44,19 +35,18 @@ export const CrudForm: React.FC<CrudFormProps> = (props) => {
    fetchSchema();
  }, []);

-  if(formLoading || schemaLoading) {
+  if(schemaLoading) {
    return <CircularProgress />
  }

-  const record = query?.data?.data || defaultValue;
  return (
    <BaseForm
      schema={schema}
      uiSchema={uiSchema}
-      formData={record}
+      formData={record || defaultValue}
      resourceBasePath={resourceBasePath}
      onSubmit={
-        (data: any) => onFinish(data)
+        (data: any) => onSubmit(data)
      }
      children={children}
    />
--- a/gui/rpk-gui/src/lib/crud/components/widgets/richtext/IndentExtension.tsx
+++ b/gui/rpk-gui/src/lib/crud/components/widgets/richtext/IndentExtension.tsx
@@ -25,9 +25,11 @@ declare module "@tiptap/core" {
 export default Extension.create<IndentOptions>({
  name: "indent",

-  defaultOptions: {
+  addOptions() {
+    return {
      types: ["paragraph", "heading"],
      margin: 40
+    }
  },

  addGlobalAttributes() {
--- a/gui/rpk-gui/src/lib/crud/providers/jsonschema-provider.tsx
+++ b/gui/rpk-gui/src/lib/crud/providers/jsonschema-provider.tsx
@@ -1,14 +1,64 @@
 import { RJSFSchema } from '@rjsf/utils';
 import i18n from '../../../i18n'
+import { JSONSchema7Definition } from "json-schema";

 const API_URL = "/api/v1";

+type CrudRJSFSchema = RJSFSchema & {
+    properties?: {
+        [key: string]: JSONSchema7Definition & {
+          readOnly?: boolean | undefined;
+        };
+    } | undefined;
+}

 export const jsonschemaProvider = {
-  getResourceSchema: async (resourceName: string): Promise<RJSFSchema> => {
+  getCardResourceSchema: async (resourceName: string): Promise<CrudRJSFSchema> => {
+    const updateSchema = await getResourceSchema(`${resourceName}Update`);
+    const readSchema = await getResourceSchema(`${resourceName}Read`);
+
+    for (let prop_name in readSchema.properties) {
+        if (! updateSchema.hasOwnProperty(prop_name)) {
+            if (is_reference(readSchema.properties[prop_name])) {
+                let subresourceName = get_reference_name(readSchema.properties[prop_name]);
+                readSchema.components.schemas[subresourceName].readOnly = true;
+            } else {
+                readSchema.properties[prop_name].readOnly = true;
+            }
+        }
+    }
+    changePropertiesOrder(readSchema);
+
+    return readSchema
+  },
+
+  getReadOnlyResourceSchema: async (resourceName: string): Promise<CrudRJSFSchema> => {
+    const updateSchema = await getResourceSchema(`${resourceName}Update`);
+    const readSchema = await getResourceSchema(`${resourceName}Read`);
+
+    for (let prop_name in readSchema.properties) {
+        if (updateSchema.hasOwnProperty(prop_name)) {
+          delete readSchema.properties[prop_name];
+        } else {
+          readSchema.properties[prop_name].readOnly = true;
+        }
+    }
+
+    return readSchema
+  },
+
+  getUpdateResourceSchema: async (resourceName: string): Promise<CrudRJSFSchema> => {
+    return getResourceSchema(`${resourceName}Update`)
+  },
+
+  getCreateResourceSchema: async (resourceName: string): Promise<CrudRJSFSchema> => {
+    return getResourceSchema(`${resourceName}Create`)
+  },
+}
+
+const getResourceSchema = async (resourceName: string): Promise<CrudRJSFSchema> => {
    return buildResource(await getJsonschema(), resourceName)
 }
-};

 let rawSchema: RJSFSchema;
 const getJsonschema = async (): Promise<RJSFSchema> => {
@@ -24,10 +74,12 @@ function convertCamelToSnake(str: string): string {
 }

 function buildResource(rawSchemas: RJSFSchema, resourceName: string) {
-  let resource;
+  if (rawSchemas.components.schemas[resourceName] === undefined) {
+    throw new Error(`Resource "${resourceName}" not found in schema.`);
+  }

  const shortResourceName = convertCamelToSnake(resourceName.replace(/(-Input|Create|Update)$/g, ""));
-  resource = structuredClone(rawSchemas.components.schemas[resourceName]);
+  let resource = structuredClone(rawSchemas.components.schemas[resourceName]);
  resource.components = { schemas: {} };
  for (let prop_name in resource.properties) {
    let prop = resource.properties[prop_name];
@@ -75,13 +127,19 @@ function resolveReference(rawSchemas: RJSFSchema, resource: any, prop_reference:

 function changePropertiesOrder(resource: any) {
  let created_at;
+  let created_by;
  let updated_at;
+  let updated_by;
  let new_properties: any = {};
  for (let prop_name in resource.properties) {
    if (prop_name == 'created_at') {
      created_at = resource.properties[prop_name];
+    } else if (prop_name == 'created_by') {
+      created_by = resource.properties[prop_name];
    } else if (prop_name == 'updated_at') {
      updated_at = resource.properties[prop_name];
+    }  else if (prop_name == 'updated_by') {
+      updated_by = resource.properties[prop_name];
    }else {
      new_properties[prop_name] = resource.properties[prop_name];
    }
@@ -89,9 +147,15 @@ function changePropertiesOrder(resource: any) {
  if (created_at) {
    new_properties['created_at'] = created_at;
  }
+  if (created_by) {
+    new_properties['created_by'] = created_by;
+  }
  if (updated_at) {
    new_properties['updated_at'] = updated_at;
  }
+  if (updated_by) {
+    new_properties['updated_by'] = updated_by;
+  }
  resource.properties = new_properties
 }

--- a/gui/rpk-gui/src/pages/firm/ContractRoutes.tsx
+++ b/gui/rpk-gui/src/pages/firm/ContractRoutes.tsx
@@ -1,9 +1,8 @@
 import { Route, Routes } from "react-router";
 import List from "./base-page/List";
 import Edit from "./base-page/Edit";
-import New from "./base-page/New";

-type Contract = {
+export type Contract = {
  id: string,
  label: string
 }
@@ -13,7 +12,6 @@ export const ContractRoutes = () => {
    <Routes>
      <Route index element={ <ListContract /> } />
      <Route path="/edit/:record_id" element={ <EditContract /> } />
-      <Route path="/create" element={ <CreateContract /> } />
    </Routes>
  );
 }
@@ -28,7 +26,3 @@ const ListContract = () => {
 const EditContract = () => {
  return <Edit<Contract> resource={`contracts`} schemaName={"Contract"} />
 }
-
-const CreateContract = () => {
-  return <New<Contract> resource={`contracts`} schemaName={"Contract"} />
-}
--- a/gui/rpk-gui/src/pages/firm/DraftRoutes.tsx
+++ b/gui/rpk-gui/src/pages/firm/DraftRoutes.tsx
@@ -1,7 +1,7 @@
-import { Route, Routes } from "react-router";
+import { Navigate, Route, Routes, useParams } from "react-router";
 import { CircularProgress } from "@mui/material";
 import React, { useContext, useState } from "react";
-import { useOne } from "@refinedev/core";
+import { useOne, useTranslation } from "@refinedev/core";
 import { BaseForm } from "../../lib/crud/components/base-form";
 import { ForeignKeyReference, ForeignKeySchema } from "../../lib/crud/components/widgets/foreign-key";

@@ -9,6 +9,8 @@ import { FirmContext } from "../../contexts/FirmContext";
 import List from "./base-page/List";
 import Edit from "./base-page/Edit";
 import New from "./base-page/New";
+import { Contract } from "./ContractRoutes";
+import dayjs from "dayjs";

 type Draft = {
  id: string,
@@ -33,7 +35,63 @@ const ListDraft = () => {
 }

 const EditDraft = () => {
-  return <Edit<Draft> resource={`contracts/drafts`} schemaName={"ContractDraft"} />
+  const { currentFirm } = useContext(FirmContext);
+  const { record_id } = useParams();
+  const resourceBasePath = `firm/${currentFirm.instance}/${currentFirm.firm}`
+
+  const { data, isLoading } = useOne({
+    resource: `${resourceBasePath}/contracts/drafts`,
+    id: record_id
+  })
+
+  if (isLoading) {
+    return <CircularProgress />
+  }
+
+  if (!data?.data) {
+    return <Navigate to="../" />
+  }
+
+  const draft = data?.data
+  const readOnly = draft.status === "published";
+
+  const uiSchema = {
+    "ui:readonly":  readOnly
+  }
+
+  return (
+    <>
+      <Edit<Draft> resource={"contracts/drafts"} schemaName={"ContractDraft"} uiSchema={uiSchema} />
+      <ContractCreate draft={draft}></ContractCreate>
+    </>
+  )
+}
+
+const ContractCreate = (props: { draft: any}) => {
+  const { translate: t } = useTranslation();
+  const { draft } = props;
+
+  if (draft.status === "published") {
+    return <h4>{t("resource.draft.already_published") }</h4>
+  }
+  if (draft.status === "in_progress") {
+    return (
+      <>
+        <h4>{ t("resource.draft.todo") + ":" }</h4>
+        <ul>{ draft.todo.map((item: any) => <li>{ item }</li>) }</ul>
+      </>
+    )
+  }
+  return <New<Contract>
+    resource={"contracts"}
+    schemaName={"Contract"}
+    defaultValue={{
+      date: dayjs().format("YYYY-MM-DD"),
+      location: "Los Santos, SA",
+      draft_id: draft.id
+    }}
+    uiSchema={{ draft_id: { 'ui:widget': 'hidden' } }}
+  />
 }

 type ForeignKeySubSchema = ForeignKeySchema & {
--- a/gui/rpk-gui/src/pages/firm/base-page/Edit.tsx
+++ b/gui/rpk-gui/src/pages/firm/base-page/Edit.tsx
@@ -1,13 +1,14 @@
 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 { useParams, Navigate } from "react-router";
+import { Button, CircularProgress } from "@mui/material";
+import Stack from "@mui/material/Stack";
 import SaveIcon from '@mui/icons-material/Save';
+import { useForm, useTranslation } from "@refinedev/core";
+import { DeleteButton } from "@refinedev/mui";
 import { FirmContext } from "../../../contexts/FirmContext";
 import { CrudForm } from "../../../lib/crud/components/crud-form";
-import Stack from "@mui/material/Stack";
-import { DeleteButton } from "@refinedev/mui";
+import Cartouche from "../../../components/Cartouche";

 type EditProps = {
  resource: string,
@@ -18,17 +19,36 @@ type EditProps = {
 const Edit = <T,>(props: EditProps) => {
  const { schemaName, resource, uiSchema } = props;
  const { currentFirm } = useContext(FirmContext);
+  const { translate: t } = useTranslation();
  const resourceBasePath = `firm/${currentFirm.instance}/${currentFirm.firm}`
  const { record_id } = useParams();

+  const { onFinish, query, formLoading } = useForm({
+    resource: `${resourceBasePath}/${resource}`,
+    action: "edit",
+    redirect: "show",
+    id: record_id,
+  });
+
+  if (formLoading) {
+    return <CircularProgress />
+  }
+
+  if (!query?.data?.data) {
+    return <Navigate to="../" />
+  }
+
+  const record = query.data.data;
  return (
    <>
+      <h2>{record.label}</h2>
+      <Cartouche record={record}/>
      <CrudForm
+        resourceBasePath={resourceBasePath}
        schemaName={schemaName}
        uiSchema={uiSchema}
-        resourceBasePath={resourceBasePath}
-        resource={resource}
-        id={record_id}
+        record={record}
+        onSubmit={(data: any) => onFinish(data)}
      >
        <Stack
          direction="row"
@@ -37,7 +57,7 @@ const Edit = <T,>(props: EditProps) => {
            justifyContent: "space-between",
            alignItems: "center",
          }}>
-          <Button type='submit' variant="contained" size="large"><SaveIcon />Save</Button>
+          <Button type='submit' variant="contained" size="large"><SaveIcon />{t("buttons.save")}</Button>
          <DeleteButton variant="contained" size="large" color="error" recordItemId={record_id}/>
        </Stack>
      </CrudForm>
--- a/gui/rpk-gui/src/pages/firm/base-page/New.tsx
+++ b/gui/rpk-gui/src/pages/firm/base-page/New.tsx
@@ -1,7 +1,10 @@
-import { CrudForm } from "../../../lib/crud/components/crud-form";
 import { UiSchema } from "@rjsf/utils";
 import { useContext } from "react";
+import { useForm, useTranslation } from "@refinedev/core";
+import { CrudForm } from "../../../lib/crud/components/crud-form";
 import { FirmContext } from "../../../contexts/FirmContext";
+import SaveIcon from "@mui/icons-material/Save";
+import { Button } from "@mui/material";

 type NewProps = {
  resource: string,
@@ -13,16 +16,25 @@ type NewProps = {
 const New = <T,>(props: NewProps) => {
  const { schemaName, resource, uiSchema, defaultValue } = props;
  const { currentFirm } = useContext(FirmContext);
+  const { translate: t } = useTranslation();
  const resourceBasePath = `firm/${currentFirm.instance}/${currentFirm.firm}`

+  const { onFinish } = useForm({
+    resource: `${resourceBasePath}/${resource}`,
+    action: "create",
+    redirect: "show",
+  });
+
  return (
    <CrudForm
      schemaName={schemaName}
      uiSchema={uiSchema}
      resourceBasePath={resourceBasePath}
-      resource={resource}
      defaultValue={defaultValue}
-    />
+      onSubmit={(data: any) => onFinish(data)}
+    >
+      <Button type='submit' variant="contained" size="large"><SaveIcon />{t("buttons.create")}</Button>
+    </CrudForm>
  )
 }

--- a/gui/rpk-gui/src/pages/firm/index.tsx
+++ b/gui/rpk-gui/src/pages/firm/index.tsx
@@ -1,8 +1,8 @@
 import { Route, Routes, Link } from "react-router";
 import React, { useContext } from "react";
+import { useForm, useOne, useTranslation } from "@refinedev/core";
 import { FirmContext, FirmContextProvider } from "../../contexts/FirmContext";
 import { Header } from "../../components";
-import { useOne } from "@refinedev/core";
 import { CrudForm } from "../../lib/crud/components/crud-form";
 import { IFirm } from "../../interfaces";
 import { EntityRoutes } from "./EntityRoutes";
@@ -33,15 +33,7 @@ export const FirmRoutes = () => {

 const FirmHome = () => {
  const { currentFirm } = useContext(FirmContext);
-  const { data: firm, isError, error, isLoading } = useOne({resource: 'firm', id: `${currentFirm.instance}/${currentFirm.firm}/`, errorNotification: false})
-
-  if (isLoading) {
-    return <h1>Loading...</h1>
-  }
-
-  if (isError && error?.statusCode == 405) {
-    return <FirmInitForm currentFirm={currentFirm} />
-  }
+  const { translate: t } = useTranslation();

  return (
    <>
@@ -64,16 +56,26 @@ type FirmInitFormPros = {

 const FirmInitForm = (props: FirmInitFormPros) => {
  const { currentFirm } = props;
+  const { translate: t } = useTranslation();
+  const resourceBasePath = `firm`
+
+  const { onFinish } = useForm({
+    resource: `${resourceBasePath}/${currentFirm.instance}/${currentFirm.firm}`,
+    action: "create",
+    redirect: "show",
+  });
+
  return (
    <>
      <h1>Initialization of {`${currentFirm.instance} / ${currentFirm.firm}`}</h1>
-
      <CrudForm
-        schemaName={"CurrentFirmSchemaCreate"}
-        resource={`firm/${currentFirm.instance}/${currentFirm.firm}/`}
+        schemaName={"CurrentFirmSchema"}
+        resourceBasePath={resourceBasePath}
+        defaultValue={{corporation: {entity_data: {activity: t("firm.default_activity") }}}}
        uiSchema={{
          corporation: {entity_data: {employees: {"ui:style": {"display": "none"}}}},
        }}
+        onSubmit={(data: any) => onFinish(data)}
      />
    </>
  )
--- a/gui/rpk-gui/src/pages/hub/CreateFirm.tsx
+++ b/gui/rpk-gui/src/pages/hub/CreateFirm.tsx
@@ -1,4 +1,4 @@
-import { useInvalidateAuthStore } from "@refinedev/core";
+import { useForm, useInvalidateAuthStore } from "@refinedev/core";
 import { CrudForm } from "../../lib/crud/components/crud-form";
 import { empty_user } from "../../providers/auth-provider";

@@ -9,11 +9,19 @@ export const CreateFirm = () => {
    invalidateAuthStore().then();
  }

+  const resourceBasePath = "hub/users";
+  const { onFinish } = useForm({
+    resource: `${resourceBasePath}/firms`,
+    action: "create",
+    redirect: "list",
+    onMutationSuccess: data => refreshUser()
+  });
+
  return (
    <CrudForm
-      schemaName={"FirmCreate"}
-      resource={"hub/users/firms/"}
-      onSuccess={() => { refreshUser() }}
+      schemaName={"Firm"}
+      resourceBasePath={resourceBasePath}
+      onSubmit={(data: any) => onFinish(data)}
    />
  )
 }
Author	SHA1	Message	Date
ewandor	f878fa7886	Light reformating	2025-05-02 01:49:14 +02:00
ewandor	ef43369425	Movinf card title from cartouche to edit	2025-05-02 00:56:51 +02:00
ewandor	37193d2246	Implementing the partner map for author identifying	2025-05-02 00:51:05 +02:00
ewandor	87f9119b0b	Upgrading TipTap indent extension	2025-05-02 00:09:56 +02:00
ewandor	f9b6aae927	Implementing the partner into the db and contracts	2025-05-02 00:03:08 +02:00
ewandor	6683d60be5	Adding a read only resource schema	2025-05-01 22:43:40 +02:00
ewandor	3942c54ad9	Translating Edit and New base page	2025-05-01 22:43:17 +02:00
ewandor	0a22bc1b8f	Implementing Contract creation on draft page	2025-05-01 22:42:40 +02:00
ewandor	237f8d5742	Updating changePropertiesOrder method	2025-05-01 19:58:48 +02:00
ewandor	8d72172e0a	Adding a Cartouche for the card component	2025-05-01 19:44:19 +02:00
ewandor	90aa5e06f2	Adding default value for corporation activity on Firm initialization	2025-05-01 19:43:22 +02:00
ewandor	178f27cfe2	Moving Refine Form logic from crud lib to implementation	2025-05-01 19:42:39 +02:00
ewandor	f4c6cdab3b	More explicit schema provider error when resource is not found	2025-05-01 19:34:40 +02:00
ewandor	40e20d0e64	Creating Card Resources that readonly non updatable resources fields	2025-04-30 00:12:52 +02:00
ewandor	3a5a299b53	Upgrading gui packages	2025-04-29 23:58:26 +02:00