Improving props drilling for resources and resources path

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

@@ -7,11 +7,13 @@ import { useForm } from "@refinedev/core";
 import CrudTextWidget from "./widgets/crud-text-widget";
 import UnionEnumField from "./fields/union-enum";
 import { CircularProgress } from "@mui/material";
+import { ResourceContext } from "../contexts/ResourceContext";
 
 type CrudFormProps = {
   schemaName: string,
   uiSchema?: UiSchema,
   resource: string,
+  resourceBasePath?: string,
   id?: string,
   //onSubmit: (data: IChangeEvent, event: FormEvent<any>) => void
   onSuccess?: (data: any) => void
@@ -26,9 +28,9 @@ const customFields: RegistryFieldsType = {
 }
 
 export const CrudForm: React.FC<CrudFormProps> = (props) => {
-  const { schemaName, uiSchema, resource, id, onSuccess } = props;
+  const { schemaName, uiSchema, resourceBasePath="" ,resource, id, onSuccess } = props;
   const { onFinish, query, formLoading } = useForm({
-    resource: resource,
+    resource: `${resourceBasePath}/${resource}`,
     action: id === undefined ? "create" : "edit",
     redirect: "show",
     id,
@@ -61,6 +63,7 @@ export const CrudForm: React.FC<CrudFormProps> = (props) => {
   }
 
   return (
+    <ResourceContext.Provider value={{basePath: resourceBasePath}} >
       <Form
         schema={schema}
         uiSchema={uiSchema === undefined ? {} : uiSchema}
@@ -72,5 +75,6 @@ export const CrudForm: React.FC<CrudFormProps> = (props) => {
         widgets={customWidgets}
         fields={customFields}
       />
+    </ResourceContext.Provider>
   )
 }

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

@@ -1,6 +1,4 @@
 import { Route, Routes } from "react-router";
-import React, { useContext } from "react";
-import { FirmContext } from "../../contexts/FirmContext";
 import List from "./base-page/List";
 import Edit from "./base-page/Edit";
 import New from "./base-page/New";
@@ -21,19 +19,16 @@ export const ContractRoutes = () => {
 }
 
 const ListContract = () => {
-  const { currentFirm } = useContext(FirmContext);
   const columns = [
     { field: "label", headerName: "Label", flex: 1 },
   ];
-  return <List<Contract> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/contracts`} columns={columns} />
+  return <List<Contract> resource={`contracts`} columns={columns} />
 }
 
 const EditContract = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <Edit<Contract> resource={`contracts`} schemaName={"ContractUpdate"} />
-  return <Edit<Contract> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/contracts`} schemaName={"ContractUpdate"} />
 }
 
 const CreateContract = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <New<Contract> resource={`contracts`} schemaName={"ContractCreate"} />
-  return <New<Contract> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/contracts`} schemaName={"ContractCreate"} />
 }

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

@@ -1,6 +1,4 @@
 import { Route, Routes } from "react-router";
-import React, { useContext } from "react";
-import { FirmContext } from "../../contexts/FirmContext";
 import List from "./base-page/List";
 import Edit from "./base-page/Edit";
 import New from "./base-page/New";
@@ -21,19 +19,16 @@ export const DraftRoutes = () => {
 }
 
 const ListDraft = () => {
-  const { currentFirm } = useContext(FirmContext);
   const columns = [
     { field: "label", headerName: "Label", flex: 1 },
   ];
-  return <List<Draft> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/contracts/drafts`} columns={columns} />
+  return <List<Draft> resource={`contracts/drafts`} columns={columns} />
 }
 
 const EditDraft = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <Edit<Draft> resource={`contracts/drafts`} schemaName={"ContractDraftUpdate"} />
-  return <Edit<Draft> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/contracts/drafts`} schemaName={"ContractDraftUpdate"} />
 }
 
 const CreateDraft = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <New<Draft> resource={`contracts/drafts`} schemaName={"ContractDraftCreate"} />
-  return <New<Draft> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/contracts/drafts`} schemaName={"ContractDraftCreate"} />
 }

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

@@ -1,6 +1,4 @@
 import { Route, Routes } from "react-router";
-import React, { useContext } from "react";
-import { FirmContext } from "../../contexts/FirmContext";
 import List from "./base-page/List";
 import Edit from "./base-page/Edit";
 import New from "./base-page/New";
@@ -23,20 +21,17 @@ export const EntityRoutes = () => {
 }
 
 const ListEntity = () => {
-  const { currentFirm } = useContext(FirmContext);
   const columns = [
     { field: "label", headerName: "Label", flex: 1 },
     { field: "entity_data", headerName: "Type", flex: 1, valueFormatter: ({ type }: {type: string}) => type }
   ];
-  return <List<Entity> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/entities`} columns={columns} />
+  return <List<Entity> resource={`entities`} columns={columns} />
 }
 
 const EditEntity = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <Edit<Entity> resource={`entities`} schemaName={"EntityUpdate"} />
-  return <Edit<Entity> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/entities`} schemaName={"EntityUpdate"} />
 }
 
 const CreateEntity = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <New<Entity> resource={`entities`} schemaName={"EntityCreate"} />
-  return <New<Entity> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/entities`} schemaName={"EntityCreate"} />
 }

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

@@ -1,6 +1,4 @@
 import { Route, Routes } from "react-router";
-import React, { useContext } from "react";
-import { FirmContext } from "../../contexts/FirmContext";
 import List from "./base-page/List";
 import Edit from "./base-page/Edit";
 import New from "./base-page/New";
@@ -22,19 +20,16 @@ export const ProvisionRoutes = () => {
 }
 
 const ListProvision = () => {
-  const { currentFirm } = useContext(FirmContext);
   const columns = [
     { field: "label", headerName: "Label", flex: 1 },
   ];
-  return <List<Provision> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/templates/provisions`} columns={columns} />
+  return <List<Provision> resource={`templates/provisions`} columns={columns} />
 }
 
 const EditProvision = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <Edit<Provision> resource={`templates/provisions`} schemaName={"ProvisionTemplateUpdate"} />
-  return <Edit<Provision> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/templates/provisions`} schemaName={"ProvisionTemplateUpdate"} />
 }
 
 const CreateProvision = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <New<Provision> resource={`templates/provisions`} schemaName={"ProvisionTemplateCreate"} />
-  return <New<Provision> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/templates/provisions`} schemaName={"ProvisionTemplateCreate"} />
 }

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

@@ -1,6 +1,4 @@
 import { Route, Routes } from "react-router";
-import React, { useContext } from "react";
-import { FirmContext } from "../../contexts/FirmContext";
 import List from "./base-page/List";
 import Edit from "./base-page/Edit";
 import New from "./base-page/New";
@@ -21,19 +19,16 @@ export const TemplateRoutes = () => {
 }
 
 const ListTemplate = () => {
-  const { currentFirm } = useContext(FirmContext);
   const columns = [
     { field: "label", headerName: "Label", flex: 1 },
   ];
-  return <List<Template> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/templates/contracts`} columns={columns} />
+  return <List<Template> resource={`templates/contracts`} columns={columns} />
 }
 
 const EditTemplate = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <Edit<Template> resource={`templates/contracts`} schemaName={"ContractTemplateUpdate"} />
-  return <Edit<Template> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/templates/contracts`} schemaName={"ContractTemplateUpdate"} />
 }
 
 const CreateTemplate = () => {
-  const { currentFirm } = useContext(FirmContext);
+  return <New<Template> resource={`templates/contracts`} schemaName={"ContractTemplateCreate"} />
-  return <New<Template> resource={`firm/${currentFirm.instance}/${currentFirm.firm}/templates/contracts`} schemaName={"ContractTemplateCreate"} />
 }

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

@@ -1,6 +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 { FirmContext } from "../../../contexts/FirmContext";
 
 type EditProps = {
   resource: string,
@@ -10,12 +12,15 @@ type EditProps = {
 
 const Edit = <T,>(props: EditProps) => {
   const { schemaName, resource, uiSchema } = props;
+  const { currentFirm } = useContext(FirmContext);
+  const resourceBasePath = `firm/${currentFirm.instance}/${currentFirm.firm}`
   const { record_id } = useParams();
 
   return (
     <CrudForm
       schemaName={schemaName}
       uiSchema={uiSchema}
+      resourceBasePath={resourceBasePath}
       resource={resource}
       id={record_id}
       />

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

@@ -2,8 +2,9 @@ import { UiSchema } from "@rjsf/utils";
 import { List as RefineList, useDataGrid } from "@refinedev/mui";
 import { DataGrid, GridColDef, GridValidRowModel } from "@mui/x-data-grid";
 import { Link, useNavigate } from "react-router"
-import React from "react";
+import React, { useContext } from "react";
 import { Button } from "@mui/material";
+import { FirmContext } from "../../../contexts/FirmContext";
 
 type ListProps<T extends GridValidRowModel> = {
   resource: string,
@@ -13,8 +14,11 @@ type ListProps<T extends GridValidRowModel> = {
 }
 
 const List = <T extends GridValidRowModel>(props: ListProps<T>) => {
-  const { schemaName, resource, uiSchema, columns } = props;
+  const { resource, columns } = props;
-  const { dataGridProps } = useDataGrid<T>({resource: resource});
+  const { currentFirm } = useContext(FirmContext);
+  const resourceBasePath = `firm/${currentFirm.instance}/${currentFirm.firm}`
+
+  const { dataGridProps } = useDataGrid<T>({resource: `${resourceBasePath}/${resource}`});
   const navigate = useNavigate();
 
   const cols = React.useMemo<GridColDef<T>[]>(

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

@@ -1,5 +1,7 @@
 import { CrudForm } from "../../../lib/crud/components/crud-form";
 import { UiSchema } from "@rjsf/utils";
+import { useContext } from "react";
+import { FirmContext } from "../../../contexts/FirmContext";
 
 type NewProps = {
   resource: string,
@@ -9,11 +11,14 @@ type NewProps = {
 
 const New = <T,>(props: NewProps) => {
   const { schemaName, resource, uiSchema } = props;
+  const { currentFirm } = useContext(FirmContext);
+  const resourceBasePath = `firm/${currentFirm.instance}/${currentFirm.firm}`
 
   return (
     <CrudForm
       schemaName={schemaName}
       uiSchema={uiSchema}
+      resourceBasePath={resourceBasePath}
       resource={resource}
       />
   )