diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css
index cc5aa9ad2..cd479c248 100644
--- a/app/webroot/css/co-responsive.css
+++ b/app/webroot/css/co-responsive.css
@@ -117,6 +117,15 @@
align-items: center;
min-height: 2.5em;
}
+ .co-cards .cm-mvea-with-eis .field-data-container {
+ grid-template-columns: 2fr 100px 1fr;
+ }
+ .co-cards .field-data.data-eis {
+ padding: 0.25em 0;
+ }
+ .co-cards .field-data.data-eis .badge {
+ margin: 0;
+ }
#mvea-canvas-roles .field-data-container {
grid-template-columns: 1fr 1fr 2fr auto;
}
diff --git a/app/webroot/js/comanage/components/mvea/mvea-item.js b/app/webroot/js/comanage/components/mvea/mvea-item.js
index 0193fd060..eccc3056e 100644
--- a/app/webroot/js/comanage/components/mvea/mvea-item.js
+++ b/app/webroot/js/comanage/components/mvea/mvea-item.js
@@ -60,6 +60,10 @@ export default {
this.$parent.$parent.launchModal(this.core.mveaTitle, this.mveaLink, componentReference);
});
},
+ hasEis() {
+ return this.core?.externalIdentitySources &&
+ Object.keys(this.core.externalIdentitySources).length > 0;
+ },
getEisDescription(externalIdentityId) {
return externalIdentityId ? this.core?.externalIdentitySources[externalIdentityId] : null;
}
@@ -104,15 +108,17 @@ export default {
:valueToCopy="this.mvea.honorific + ' ' + this.mvea.given + ' ' + this.mvea.middle + ' ' + this.mvea.family + ' ' + this.mvea.suffix">
+
+
+ {{ getEisDescription(this.mvea?.source_name?.external_identity_id) }}
+
+
{{ this.txt['field.primary'] }}
{{ this.mvea.type.display_name }}
{{ calcLangHR(this.mvea.language) }}
-
- {{ getEisDescription(this.mvea?.source_name?.external_identity_id) }}
-
@@ -137,14 +143,16 @@ export default {
:valueToCopy="this.mvea.mail">
-
-
{{ this.txt['field.unverified'] }}
-
{{ this.mvea.type.display_name }}
+
{{ getEisDescription(this.mvea?.source_email_address?.external_identity_id) }}
+
+ {{ this.txt['field.unverified'] }}
+ {{ this.mvea.type.display_name }}
+
@@ -155,15 +163,17 @@ export default {
:valueToCopy="this.mvea.identifier">
-
{{ this.txt['enumeration.SuspendableStatusEnum.S'] }}
-
{{ this.txt['field.login'] }}
-
{{ this.mvea.type.display_name }}
+
{{ getEisDescription(mvea?.source_identifier?.external_identity_id) }}
+
+ {{ this.txt['enumeration.SuspendableStatusEnum.S'] }}
+ {{ this.txt['field.login'] }}
+ {{ this.mvea.type.display_name }}
+
@@ -175,13 +185,15 @@ export default {
:valueToCopy="this.mvea.value">
-
{{ this.mvea.tag }}
+
{{ getEisDescription(this.mvea?.source_ad_hoc_attribute?.external_identity_id) }}
+
+ {{ this.mvea.tag }}
+
@@ -202,13 +214,15 @@ export default {
:valueToCopy="this.mveaAddress">
-
{{ this.mvea.type.display_name }}
+
{{ getEisDescription(mvea?.source_address?.external_identity_id) }}
+
+ {{ this.mvea.type.display_name }}
+
@@ -219,13 +233,15 @@ export default {
:valueToCopy="this.mvea.country_code+this.mvea.area_code+this.mvea.number">
-
{{ this.mvea.type.display_name }}
+
{{ getEisDescription(mvea?.source_telephone_number?.external_identity_id) }}
+
+ {{ this.mvea.type.display_name }}
+
@@ -237,13 +253,15 @@ export default {
:valueToCopy="this.mvea.url">
-
{{ this.mvea.type.display_name }}
+
{{ getEisDescription(mvea?.source_url?.external_identity_id) }}
+
+ {{ this.mvea.type.display_name }}
+
@@ -254,13 +272,15 @@ export default {
:valueToCopy="this.mvea.pronouns">
-
{{ this.mvea.type.display_name }}
+
{{ getEisDescription(mvea?.source_pronoun?.external_identity_id) }}
+
+ {{ this.mvea.type.display_name }}
+
`
}
diff --git a/app/webroot/js/comanage/components/mvea/mveas.js b/app/webroot/js/comanage/components/mvea/mveas.js
index 0f50bac7c..908c32e77 100644
--- a/app/webroot/js/comanage/components/mvea/mveas.js
+++ b/app/webroot/js/comanage/components/mvea/mveas.js
@@ -46,6 +46,10 @@ export default {
computed: {
mveaModel: function() {
return this.mveas?.[camelize(this.core.mveaType)]
+ },
+ hasEis() {
+ return this.core?.externalIdentitySources &&
+ Object.keys(this.core.externalIdentitySources).length > 0;
}
},
methods: {
@@ -54,7 +58,8 @@ export default {
}
},
template: `
-