From c868da5b33e339affbda3ef010286344c1deb166 Mon Sep 17 00:00:00 2001
From: Claudia Malzer <claudia.malzer@tu-darmstadt.de>
Date: Mon, 4 Dec 2023 17:58:05 +0100
Subject: [PATCH 1/3] ERM-3119 Add Organisation status to organisation card
 display

* add org.orgsUuid_object.status to renderOrganizationName
---
 .../ViewOrganizationCard.js                   | 68 +++++++++++++------
 1 file changed, 46 insertions(+), 22 deletions(-)

diff --git a/lib/ViewOrganizationCard/ViewOrganizationCard.js b/lib/ViewOrganizationCard/ViewOrganizationCard.js
index 40adce8e..3cdc779c 100644
--- a/lib/ViewOrganizationCard/ViewOrganizationCard.js
+++ b/lib/ViewOrganizationCard/ViewOrganizationCard.js
@@ -149,6 +149,13 @@ const ViewOrganizationCard = ({
     })
   );
 
+  const renderOrganizationStatus = () => {
+    if (org?.orgsUuid_object?.status) {
+      return `&nbsp;·&nbsp;${org.orgsUuid_object.status}`;
+    }
+    return undefined;
+  };
+
   const renderOrganizationName = (name) => (
     <KeyValue label={<FormattedMessage id="stripes-erm-components.viewOrg.name" />}>
       <span
@@ -180,16 +187,16 @@ const ViewOrganizationCard = ({
           <Layout className="textCentered">
             <FormattedMessage id="stripes-erm-components.organizations.linkOrganizationToStart" />
           </Layout>
-          { duplicateWarning &&
-          <Layout className="padding-top-gutter">
-            <MessageBanner
-              dismissable
-              onExited={() => setDuplicateWarning(false)}
-              type="error"
-            >
-              {duplicateMessage}
-            </MessageBanner>
-          </Layout> }
+          {duplicateWarning &&
+            <Layout className="padding-top-gutter">
+              <MessageBanner
+                dismissable
+                onExited={() => setDuplicateWarning(false)}
+                type="error"
+              >
+                {duplicateMessage}
+              </MessageBanner>
+            </Layout>}
         </div>
         {meta && meta.error && meta.touched ? renderError(meta.error) : null}
       </>
@@ -199,13 +206,30 @@ const ViewOrganizationCard = ({
 
   const hasOrgData = interfaces || !isEmpty(org);
 
+  // const renderCard = () => {
+  //   if (interfaces) {
+  //     return renderInterfaces();
+  //   }
+
+  //   if (hasOrgData) {
+  //     return renderOrganizationName(org.name);
+  //   }
+
+  //   return renderEmpty();
+  // };
+
   const renderCard = () => {
     if (interfaces) {
       return renderInterfaces();
     }
 
     if (hasOrgData) {
-      return renderOrganizationName(org.name);
+      const status = org?.orgsUuid_object?.status ? ` · ${org.orgsUuid_object.status}` : '';
+      return (
+        <>
+          {renderOrganizationName(`${org.name}${status}`)}
+        </>
+      );
     }
 
     return renderEmpty();
@@ -220,17 +244,17 @@ const ViewOrganizationCard = ({
         headerStart={headerStart}
         roundedBorder
       >
-        { roles?.length && <KeyValue label={<FormattedMessage id="stripes-erm-components.organizations.roles" />}>{renderRoles()}</KeyValue> }
-        { note &&
-        <KeyValue label={<FormattedMessage id="stripes-erm-components.organizations.note" />}>
-          <div
-            data-test-org-note
-            id={`${id}-note`}
-          >
-            {note}
-          </div>
-        </KeyValue>
-      }
+        {roles?.length && <KeyValue label={<FormattedMessage id="stripes-erm-components.organizations.roles" />}>{renderRoles()}</KeyValue>}
+        {note &&
+          <KeyValue label={<FormattedMessage id="stripes-erm-components.organizations.note" />}>
+            <div
+              data-test-org-note
+              id={`${id}-note`}
+            >
+              {note}
+            </div>
+          </KeyValue>
+        }
         {renderCard()}
       </Card>
     </div>

From 5de3e0dc6e12c17a2a376cf561632c5ad1c1c78b Mon Sep 17 00:00:00 2001
From: Claudia Malzer <claudia.malzer@tu-darmstadt.de>
Date: Mon, 4 Dec 2023 18:01:45 +0100
Subject: [PATCH 2/3] ERM-3119 Add Organisation status to organisation card
 display * remove comment

---
 .../ViewOrganizationCard.js                   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/lib/ViewOrganizationCard/ViewOrganizationCard.js b/lib/ViewOrganizationCard/ViewOrganizationCard.js
index 3cdc779c..4c258e39 100644
--- a/lib/ViewOrganizationCard/ViewOrganizationCard.js
+++ b/lib/ViewOrganizationCard/ViewOrganizationCard.js
@@ -149,13 +149,6 @@ const ViewOrganizationCard = ({
     })
   );
 
-  const renderOrganizationStatus = () => {
-    if (org?.orgsUuid_object?.status) {
-      return `&nbsp;·&nbsp;${org.orgsUuid_object.status}`;
-    }
-    return undefined;
-  };
-
   const renderOrganizationName = (name) => (
     <KeyValue label={<FormattedMessage id="stripes-erm-components.viewOrg.name" />}>
       <span
@@ -206,18 +199,6 @@ const ViewOrganizationCard = ({
 
   const hasOrgData = interfaces || !isEmpty(org);
 
-  // const renderCard = () => {
-  //   if (interfaces) {
-  //     return renderInterfaces();
-  //   }
-
-  //   if (hasOrgData) {
-  //     return renderOrganizationName(org.name);
-  //   }
-
-  //   return renderEmpty();
-  // };
-
   const renderCard = () => {
     if (interfaces) {
       return renderInterfaces();

From 2af1fdac3efc7c5525fe163880905c6cccbc4e81 Mon Sep 17 00:00:00 2001
From: Claudia Malzer <claudia.malzer@tu-darmstadt.de>
Date: Wed, 6 Dec 2023 13:58:38 +0100
Subject: [PATCH 3/3] ERM-3119 Add Organisation status to organisation card
 display

* add orgStatus to newly added org in edit page
---
 .../EditOrganizationCard.js                   |  2 +-
 .../ViewOrganizationCard.js                   | 29 +++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

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 4c258e39..e0cb461e 100644
--- a/lib/ViewOrganizationCard/ViewOrganizationCard.js
+++ b/lib/ViewOrganizationCard/ViewOrganizationCard.js
@@ -149,16 +149,22 @@ const ViewOrganizationCard = ({
     })
   );
 
-  const renderOrganizationName = (name) => (
-    <KeyValue label={<FormattedMessage id="stripes-erm-components.viewOrg.name" />}>
-      <span
-        data-test-org-name
-        id={`${id}-name`}
-      >
-        {name}
-      </span>
-    </KeyValue>
-  );
+  const renderOrganizationName = (name) => {
+    const orgStatus = org.orgsUuid_object?.status ? org.orgsUuid_object.status :
+      (org?.status ? org.status : null);
+    return (
+      <KeyValue label={<FormattedMessage id="stripes-erm-components.viewOrg.name" />}>
+        <span
+          data-test-org-name
+          id={`${id}-name`}
+        >
+          {name}
+          {orgStatus ? ' · ' : null}
+          {orgStatus ? <FormattedMessage id={`ui-organizations.organizationStatus.${orgStatus.toLowerCase()}`} /> : null}
+        </span>
+      </KeyValue>
+    );
+  };
 
   const renderError = (error) => (
     <Layout className={`textCentered ${css.error}`}>
@@ -205,10 +211,9 @@ const ViewOrganizationCard = ({
     }
 
     if (hasOrgData) {
-      const status = org?.orgsUuid_object?.status ? ` · ${org.orgsUuid_object.status}` : '';
       return (
         <>
-          {renderOrganizationName(`${org.name}${status}`)}
+          {renderOrganizationName(org.name)}
         </>
       );
     }