Merge remote-tracking branch 'upstream/dev' into dev

KelvinTegelaar · Mar 19, 2024 · a23f6b9 · a23f6b9
2 parents aed7b03 + 86137e5
commit a23f6b9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/views/identity/administration/Users.jsx b/src/views/identity/administration/Users.jsx
@@ -15,7 +15,9 @@ import CippGraphUserFilter from 'src/components/utilities/CippGraphUserFilter'
 const Offcanvas = (row, rowIndex, formatExtraData) => {
   const tenant = useSelector((state) => state.app.currentTenant)
   const [ocVisible, setOCVisible] = useState(false)
-  const viewLink = `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}`
+  const viewLink = row?.tenant
+    ? `/identity/administration/users/view?userId=${row.id}&tenantDomain=${row.Tenant}&userEmail=${row.userPrincipalName}`
+    : `/identity/administration/users/view?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}&userEmail=${row.userPrincipalName}`
   const editLink = row?.tenant
     ? `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${row.Tenant}`
     : `/identity/administration/users/edit?userId=${row.id}&tenantDomain=${tenant.defaultDomainName}`