Bug fix (regression w/ lov icons) + Cleanups..

evoluteur · Nov 14, 2022 · 0133ef1 · 0133ef1
1 parent 0ec53a5
commit 0133ef1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/src/components/field/Field.js b/src/components/field/Field.js
@@ -319,7 +319,6 @@ const Field = ({
       const height = `${emHeight(f)}em`;
       return (
         <div
-          key={f.id}
           className="disabled evo-rdonly scroll-y"
           style={{ height }}
           dangerouslySetInnerHTML={createMarkup(d)}
@@ -362,11 +361,7 @@ const Field = ({
     } else {
       fw = fieldValue(f, d);
     }
-    return (
-      <div key={f.id} className="disabled evo-rdonly">
-        {fw}
-      </div>
-    );
+    return <div className="disabled evo-rdonly">{fw}</div>;
   };
 
   const f = model || { type: "text" };

diff --git a/src/components/views/many/List.js b/src/components/views/many/List.js
@@ -275,6 +275,7 @@ List.propTypes = {
     entity: PropTypes.string.isRequired,
   }),
   paramsCollec: PropTypes.object,
+  /** Indicates that the list instance is nested in a form. */
   isNested: PropTypes.bool,
   data: PropTypes.any,
 };

diff --git a/src/components/views/one/Card.js b/src/components/views/one/Card.js
@@ -111,7 +111,10 @@ export default class Card extends React.PureComponent {
 }
 
 Card.propTypes = {
+  /** Object Unique key. */
   entity: PropTypes.string.isRequired,
+  /** List of fields metadata. */
   fields: PropTypes.array,
+  /** Data (1 single record/Object). */
   data: PropTypes.object,
 };
diff --git a/src/components/views/one/Edit.js b/src/components/views/one/Edit.js
@@ -172,7 +172,7 @@ export default class Edit extends OneReadWrite {
                 })
               ) : (
                 <Panel title={title} key="pAllFields">
-                  <div className="evol-fset">{m.fields.map(fnField)}</div>
+                  <div className="evol-fset">{m.fields?.map(fnField)}</div>
                 </Panel>
               )}
 
@@ -233,7 +233,7 @@ export default class Edit extends OneReadWrite {
     let cMsg;
 
     this.clearValidation();
-    fields.forEach((f) => {
+    fields?.forEach((f) => {
       cMsg = validation.validateField(f, data[f.id]);
       if (cMsg) {
         messages.push(cMsg);

diff --git a/src/utils/dao-graphql.js b/src/utils/dao-graphql.js
@@ -92,7 +92,7 @@ const mLOVFields = (entity) =>
 // get an array of items
 export const getMany = (entity, options) => {
   const fields = (m) => m.fields.filter(isFieldMany);
-  const gqlFields = (m) => "id " + fields(m).map(qField).join(" ");
+  const gqlFields = (m) => "id " + fields(m)?.map(qField).join(" ");
   const qMany = (entity) => {
     const m = getModel(entity);
     if (m) {

diff --git a/src/utils/format.js b/src/utils/format.js
@@ -73,7 +73,7 @@ export function fieldValue(f, d, abbr) {
   if (f.type === ft.lov) {
     return (
       <>
-        {f.lovIcon && <img src={f.lovIcon} alt=""></img>}
+        {f.lovIcon && <img src={d.icon} alt=""></img>}
         {d}
       </>
     );