From 426d7af5723f474bf5a49a806c80b68b3466098c Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 27 Jul 2023 09:55:37 +0200 Subject: [PATCH 1/2] fix: use link_ref instead of ref --- components/AssignParametersTab/AssignParametersTab.tsx | 2 +- components/VisualSchema/ArkeNode.tsx | 6 +++--- crud/arke/ArkeCrud.tsx | 2 +- crud/common/CrudAddEdit.tsx | 2 +- crud/parameter/ParameterCrud.tsx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/components/AssignParametersTab/AssignParametersTab.tsx b/components/AssignParametersTab/AssignParametersTab.tsx index 77385ad..e9d5455 100644 --- a/components/AssignParametersTab/AssignParametersTab.tsx +++ b/components/AssignParametersTab/AssignParametersTab.tsx @@ -72,7 +72,7 @@ function AssignParametersTab({ arke }: { arke: TUnit }) { .then((res) => { setData( res.data.content.parameters.map((item) => { - item.refLink = item.ref; + item.refLink = item.link_ref; return item; }) ); diff --git a/components/VisualSchema/ArkeNode.tsx b/components/VisualSchema/ArkeNode.tsx index 53c284f..a56c73a 100644 --- a/components/VisualSchema/ArkeNode.tsx +++ b/components/VisualSchema/ArkeNode.tsx @@ -109,15 +109,15 @@ function ArkeNode(props: ArkeNodeProps) { /> - {!item.ref ? ( + {!item.link_ref ? ( <>
{item.label}
({item.type})
) : (
-
{item.ref.label}
-
({item.ref.type ?? item.ref.arke_id})
+
{item.link_ref.label}
+
({item.link_ref.type ?? item.link_ref.arke_id})
)} diff --git a/crud/arke/ArkeCrud.tsx b/crud/arke/ArkeCrud.tsx index 6ce421a..e79153a 100644 --- a/crud/arke/ArkeCrud.tsx +++ b/crud/arke/ArkeCrud.tsx @@ -56,7 +56,7 @@ export function ArkeCrud({ promise.then((res) => { setFields( res.data.content.parameters.map((item) => { - item.refLink = item.ref; + item.refLink = item.link_ref; return item; }) ); diff --git a/crud/common/CrudAddEdit.tsx b/crud/common/CrudAddEdit.tsx index 2b74da6..327ff69 100644 --- a/crud/common/CrudAddEdit.tsx +++ b/crud/common/CrudAddEdit.tsx @@ -77,7 +77,7 @@ export function CrudAddEdit(props: CrudProps) { promise.then((res) => { setFields( res.data.content.parameters.map((item) => { - item.refLink = item.ref; + item.refLink = item.link_ref; return item; }) ); diff --git a/crud/parameter/ParameterCrud.tsx b/crud/parameter/ParameterCrud.tsx index 770f66a..cf42bc6 100644 --- a/crud/parameter/ParameterCrud.tsx +++ b/crud/parameter/ParameterCrud.tsx @@ -108,7 +108,7 @@ export function ParameterAdd({ .then((res) => { setFields( res.data.content.parameters.map((item) => { - item.refLink = item.ref; + item.refLink = item.link_ref; return item; }) ); From 9d3d79721d1f78aff2bdb018c2f36b0f23a7ca2e Mon Sep 17 00:00:00 2001 From: Ilyich Vismara Date: Thu, 27 Jul 2023 10:23:13 +0200 Subject: [PATCH 2/2] fix: get rid of refLink override --- .../AppFormConfigProvider.tsx | 6 +----- .../components/AutocompleteLink.tsx | 14 +++++++------- .../AssignParametersTab/AssignParametersTab.tsx | 7 +------ crud/arke/ArkeCrud.tsx | 7 +------ crud/common/CrudAddEdit.tsx | 7 +------ crud/parameter/ParameterCrud.tsx | 7 +------ 6 files changed, 12 insertions(+), 36 deletions(-) diff --git a/components/AppFormConfigProvider/AppFormConfigProvider.tsx b/components/AppFormConfigProvider/AppFormConfigProvider.tsx index d1baed3..f5fd9c4 100644 --- a/components/AppFormConfigProvider/AppFormConfigProvider.tsx +++ b/components/AppFormConfigProvider/AppFormConfigProvider.tsx @@ -95,11 +95,7 @@ export default function AppFormConfigProvider(props: { children: ReactNode }) { /> ), link: ({ field }) => ( - + ), default: () => <>, }} diff --git a/components/AppFormConfigProvider/components/AutocompleteLink.tsx b/components/AppFormConfigProvider/components/AutocompleteLink.tsx index 86d38fa..e01a3cb 100644 --- a/components/AppFormConfigProvider/components/AutocompleteLink.tsx +++ b/components/AppFormConfigProvider/components/AutocompleteLink.tsx @@ -23,13 +23,13 @@ import toast from "react-hot-toast"; export type LinkRef = { id: string; arke_id: "group" | "arke" }; type AutocompleteLinkProps = { - refLink: LinkRef; + link_ref?: LinkRef; onChange: (value: any) => void; value: string; }; export default function AutocompleteLink(props: AutocompleteLinkProps) { - const { refLink, onChange } = props; + const { link_ref, onChange } = props; const client = useClient(); const [values, setValues] = useState([]); @@ -37,11 +37,11 @@ export default function AutocompleteLink(props: AutocompleteLinkProps) { // getAll: arke / group (id: se é gruppo o arke) // filter_keys [OR] // params: load_links: true => getAll - if (refLink?.arke_id === "group") { + if (link_ref?.arke_id === "group") { // TODO: implement getAll by group and add filters with filter_keys - // client.unit.getAll(refLink.id).then((res) => { + // client.unit.getAll(link_ref.id).then((res) => { client.group - .getAllUnits(refLink.id) + .getAllUnits(link_ref.id) .then((res) => { setValues(res.data.content.items); }) @@ -51,9 +51,9 @@ export default function AutocompleteLink(props: AutocompleteLinkProps) { }) ); } - if (refLink?.arke_id === "arke") { + if (link_ref?.arke_id === "arke") { client.unit - .getAll(refLink.id) + .getAll(link_ref.id) .then((res) => { setValues(res.data.content.items); }) diff --git a/components/AssignParametersTab/AssignParametersTab.tsx b/components/AssignParametersTab/AssignParametersTab.tsx index e9d5455..87901cd 100644 --- a/components/AssignParametersTab/AssignParametersTab.tsx +++ b/components/AssignParametersTab/AssignParametersTab.tsx @@ -70,12 +70,7 @@ function AssignParametersTab({ arke }: { arke: TUnit }) { }, }) .then((res) => { - setData( - res.data.content.parameters.map((item) => { - item.refLink = item.link_ref; - return item; - }) - ); + setData(res.data.content.parameters); }); }, [arke.id] diff --git a/crud/arke/ArkeCrud.tsx b/crud/arke/ArkeCrud.tsx index e79153a..57422c1 100644 --- a/crud/arke/ArkeCrud.tsx +++ b/crud/arke/ArkeCrud.tsx @@ -54,12 +54,7 @@ export function ArkeCrud({ } promise.then((res) => { - setFields( - res.data.content.parameters.map((item) => { - item.refLink = item.link_ref; - return item; - }) - ); + setFields(res.data.content.parameters); setLoading(false); }); } diff --git a/crud/common/CrudAddEdit.tsx b/crud/common/CrudAddEdit.tsx index 327ff69..4a20860 100644 --- a/crud/common/CrudAddEdit.tsx +++ b/crud/common/CrudAddEdit.tsx @@ -75,12 +75,7 @@ export function CrudAddEdit(props: CrudProps) { ? client.unit.struct(arkeId, unitId, { params: { exclude } }) : client.arke.struct(arkeId, { params: { exclude } }); promise.then((res) => { - setFields( - res.data.content.parameters.map((item) => { - item.refLink = item.link_ref; - return item; - }) - ); + setFields(res.data.content.parameters); setLoading(false); if (res.data.content.parameters.length === 0) { toast.error( diff --git a/crud/parameter/ParameterCrud.tsx b/crud/parameter/ParameterCrud.tsx index cf42bc6..994ba5c 100644 --- a/crud/parameter/ParameterCrud.tsx +++ b/crud/parameter/ParameterCrud.tsx @@ -106,12 +106,7 @@ export function ParameterAdd({ }, }) .then((res) => { - setFields( - res.data.content.parameters.map((item) => { - item.refLink = item.link_ref; - return item; - }) - ); + setFields(res.data.content.parameters); }) .finally(() => setLoading(false)); },