fix: get rid of refLink override

arkemishub · Jul 27, 2023 · 9d3d797 · 9d3d797
1 parent 426d7af
commit 9d3d797
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 36 deletions.
diff --git a/components/AppFormConfigProvider/AppFormConfigProvider.tsx b/components/AppFormConfigProvider/AppFormConfigProvider.tsx
@@ -95,11 +95,7 @@ export default function AppFormConfigProvider(props: { children: ReactNode }) {
           />
         ),
         link: ({ field }) => (
-          <AutocompleteLink
-            {...field}
-            refLink={field.refLink}
-            onChange={field.onChange}
-          />
+          <AutocompleteLink {...field} onChange={field.onChange} />
         ),
         default: () => <></>,
       }}

diff --git a/components/AppFormConfigProvider/components/AutocompleteLink.tsx b/components/AppFormConfigProvider/components/AutocompleteLink.tsx
@@ -23,25 +23,25 @@ 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<TUnit[]>([]);
 
   useEffect(() => {
     // 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
@@ -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
@@ -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
@@ -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
@@ -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));
     },