diff --git a/lib/OrganizationsFieldArray/EditOrganizationCard.js b/lib/OrganizationsFieldArray/EditOrganizationCard.js index 1a7ddc13..a3431f93 100644 --- a/lib/OrganizationsFieldArray/EditOrganizationCard.js +++ b/lib/OrganizationsFieldArray/EditOrganizationCard.js @@ -64,7 +64,7 @@ const EditOrganizationCard = ({ setDuplicateWarning(true); setNOONL(o.name); } else { - const org = { name: o.name, orgsUuid: o.id }; + const org = { name: o.name, orgsUuid: o.id, status: o.status }; onUpdate(i, { org }); } }; diff --git a/lib/ViewOrganizationCard/ViewOrganizationCard.js b/lib/ViewOrganizationCard/ViewOrganizationCard.js index 40adce8e..e0cb461e 100644 --- a/lib/ViewOrganizationCard/ViewOrganizationCard.js +++ b/lib/ViewOrganizationCard/ViewOrganizationCard.js @@ -149,16 +149,22 @@ const ViewOrganizationCard = ({ }) ); - const renderOrganizationName = (name) => ( - }> - - {name} - - - ); + const renderOrganizationName = (name) => { + const orgStatus = org.orgsUuid_object?.status ? org.orgsUuid_object.status : + (org?.status ? org.status : null); + return ( + }> + + {name} + {orgStatus ? ' ยท ' : null} + {orgStatus ? : null} + + + ); + }; const renderError = (error) => ( @@ -180,16 +186,16 @@ const ViewOrganizationCard = ({ - { duplicateWarning && - - setDuplicateWarning(false)} - type="error" - > - {duplicateMessage} - - } + {duplicateWarning && + + setDuplicateWarning(false)} + type="error" + > + {duplicateMessage} + + } {meta && meta.error && meta.touched ? renderError(meta.error) : null} @@ -205,7 +211,11 @@ const ViewOrganizationCard = ({ } if (hasOrgData) { - return renderOrganizationName(org.name); + return ( + <> + {renderOrganizationName(org.name)} + + ); } return renderEmpty(); @@ -220,17 +230,17 @@ const ViewOrganizationCard = ({ headerStart={headerStart} roundedBorder > - { roles?.length && }>{renderRoles()} } - { note && - }> -
- {note} -
-
- } + {roles?.length && }>{renderRoles()}} + {note && + }> +
+ {note} +
+
+ } {renderCard()}