Fix add remove button for multifield attributes

src/login/UserProfileFormFields.tsx

@@ -426,6 +426,7 @@ function AddRemoveButtonsMultiValuedAttribute(props: {
     return (
         <>
             {hasRemove && (
+                <>
                     <button
                         id={`kc-remove${idPostfix}`}
                         type="button"
@@ -439,8 +440,9 @@ function AddRemoveButtonsMultiValuedAttribute(props: {
                         }
                     >
                         {msg("remove")}
-                    {hasRemove ? <>&nbsp;|&nbsp;</> : null}
                     </button>
+                    {hasAdd ? <>&nbsp;|&nbsp;</> : null}
+                </>
             )}
             {hasAdd && (
                 <button

src/tools/structuredCloneButFunctions.ts

@@ -0,0 +1,24 @@
+import "minimal-polyfills/Object.fromEntries";
+
+/**
+ * Functionally equivalent to structuredClone but
+ * functions are not cloned but kept as is.
+ * (as opposed to structuredClone that chokes if it encounters a function)
+ */
+export function structuredCloneButFunctions<T>(o: T): T {
+    if (!(o instanceof Object)) {
+        return o;
+    }
+
+    if (typeof o === "function") {
+        return o;
+    }
+
+    if (o instanceof Array) {
+        return o.map(structuredCloneButFunctions) as any;
+    }
+
+    return Object.fromEntries(
+        Object.entries(o).map(([key, value]) => [key, structuredCloneButFunctions(value)])
+    ) as any;
+}