Merge pull request #425 from energywebfoundation/fix/mismatch-types-f…

…or-newmessage-form fix(dsb-client-gateway-frontend): fix mismatched types for new message form
energywebfoundation · Feb 21, 2024 · 00fd404 · 00fd404
2 parents a8c70a1 + 07f0fe2
commit 00fd404
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/...-client-gateway-frontend/ui/messaging/src/lib/containers/modals/NewMessage/NewMessage.tsx b/...-client-gateway-frontend/ui/messaging/src/lib/containers/modals/NewMessage/NewMessage.tsx
@@ -53,7 +53,7 @@ export const NewMessage: FC = () => {
     setTransactionId,
   } = useNewMessageEffects();
 
-  const [formData, setFormData] = useState([]);
+  const [formData, setFormData] = useState({});
   const [errors, setErrors] = useState({});
 
   useEffect(() => {

diff --git a/...nt-gateway-frontend/ui/messaging/src/lib/containers/modals/NewMessage/NewMessage.utils.ts b/...nt-gateway-frontend/ui/messaging/src/lib/containers/modals/NewMessage/NewMessage.utils.ts
@@ -2,7 +2,6 @@ import {
   FormSelectOption,
   GenericFormField,
 } from '@ddhub-client-gateway-frontend/ui/core';
-import { PROPERTIES_KEY } from '@rjsf/utils';
 
 export const fields: { [name: string]: GenericFormField } = {
   channel: {
@@ -43,22 +42,24 @@ export const fields: { [name: string]: GenericFormField } = {
   },
 };
 
-export const constructDefaultData = (schema: string) => {
+export const constructDefaultData = (schema: string): Record<string, any> => {
   try {
     const jsonSchema = JSON.parse(schema);
     const properties = jsonSchema.properties;
-    if (!properties || Object.keys(properties).length === 0) return [];
+    console.log('constructDefaultData', properties, jsonSchema);
+    if (!properties || Object.keys(properties).length === 0) return {};
 
-    let data: Record<string, any> = {};
+    const data: Record<string, any> = {};
     for (const key in properties) {
-      if (properties[key].default) {
+      if (properties[key].default !== undefined) {
         data[key] = properties[key].default;
       }
     }
+    console.log('constructDefaultData', data);
 
-    return Object.keys(data).length > 0 ? data : [];
+    return Object.keys(data).length > 0 ? data : {};
   } catch (e) {
     console.error('constructDefaultData', e);
-    return [];
+    return {};
   }
 };