From 34723a0ebfb652441180f5da821339716bcf52e8 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Tue, 20 Oct 2020 22:47:23 +0200
Subject: [PATCH] moved workaround for dots in form names to util (#182)

---
 src/client-scopes/form/ClientScopeForm.tsx | 14 +++++---------
 src/util.ts                                | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/client-scopes/form/ClientScopeForm.tsx b/src/client-scopes/form/ClientScopeForm.tsx
index 380287f62a..f64db88f13 100644
--- a/src/client-scopes/form/ClientScopeForm.tsx
+++ b/src/client-scopes/form/ClientScopeForm.tsx
@@ -23,6 +23,7 @@ import { RealmContext } from "../../context/realm-context/RealmContext";
 import { useAlerts } from "../../components/alert/Alerts";
 import { useLoginProviders } from "../../context/server-info/ServerInfoProvider";
 import { ViewHeader } from "../../components/view-header/ViewHeader";
+import { convertFormValuesToObject, convertToFormValues } from "../../util";
 
 export const ClientScopeForm = () => {
   const { t } = useTranslation("client-scopes");
@@ -49,10 +50,7 @@ export const ClientScopeForm = () => {
         if (response.data) {
           Object.entries(response.data).map((entry) => {
             if (entry[0] === "attributes") {
-              Object.keys(entry[1]).map((key) => {
-                const newKey = key.replace(/\./g, "_");
-                setValue("attributes." + newKey, entry[1][key]);
-              });
+              convertToFormValues(entry[1], "attributes", setValue);
             }
             setValue(entry[0], entry[1]);
           });
@@ -63,11 +61,9 @@ export const ClientScopeForm = () => {
 
   const save = async (clientScopes: ClientScopeRepresentation) => {
     try {
-      const keyValues = Object.keys(clientScopes.attributes!).map((key) => {
-        const newKey = key.replace(/_/g, ".");
-        return { [newKey]: clientScopes.attributes![key] };
-      });
-      clientScopes.attributes = Object.assign({}, ...keyValues);
+      clientScopes.attributes = convertFormValuesToObject(
+        clientScopes.attributes!
+      );
 
       const url = `/admin/realms/${realm}/client-scopes/`;
       if (id) {
diff --git a/src/util.ts b/src/util.ts
index dd039cc022..51b0cef9f6 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -41,3 +41,22 @@ export const exportClient = (client: ClientRepresentation): void => {
     clientCopy.clientId + ".json"
   );
 };
+
+export const convertToFormValues = (
+  obj: any,
+  prefix: string,
+  setValue: (name: string, value: any) => void
+) => {
+  return Object.keys(obj).map((key) => {
+    const newKey = key.replace(/\./g, "_");
+    setValue(prefix + "." + newKey, obj[key]);
+  });
+};
+
+export const convertFormValuesToObject = (obj: any) => {
+  const keyValues = Object.keys(obj).map((key) => {
+    const newKey = key.replace(/_/g, ".");
+    return { [newKey]: obj[key] };
+  });
+  return Object.assign({}, ...keyValues);
+};