Fixes #327

OpenConext · Nov 26, 2024 · 44d219c · 44d219c
1 parent e43465f
commit 44d219c
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 12 deletions.
diff --git a/client/src/locale/en.js b/client/src/locale/en.js
@@ -187,7 +187,7 @@ const en = {
         }
     },
     applications: {
-        title: "Access Roles for this application",
+        title: "Access Roles for this application ({{nbr}})",
         applicationFound: "Applications ({{nbr}})",
         new: "New Access Role",
         searchPlaceHolder: "Search for applications",

diff --git a/client/src/locale/nl.js b/client/src/locale/nl.js
@@ -186,7 +186,7 @@ const nl = {
             andMore: "En nog {{nbr}} meer.. Bekijk de lijst van huidige gebruikers voor meer details."        }
     },
     applications: {
-        title: "Toegangsrollen voor deze applicatie",
+        title: "Toegangsrollen voor deze applicatie ({{nbr}})",
         applicationFound: "Applicaties ({{nbr}})",
         new: "Nieuwe toegangsrol",
         searchPlaceHolder: "Zoek naar applicaties",

diff --git a/client/src/pages/Application.js b/client/src/pages/Application.js
@@ -126,7 +126,7 @@ export const Application = () => {
                 <Entities
                     entities={roles}
                     modelName="applicationRoles"
-                    title={I18n.t("applications.title")}
+                    title={I18n.t("applications.title", {nbr: roles.length})}
                     showNew={true}
                     newLabel={I18n.t("applications.new")}
                     newEntityFunc={() => navigate("/role/new", {state: application.id})}

diff --git a/client/src/pages/Role.js b/client/src/pages/Role.js
@@ -17,6 +17,7 @@ import ClipBoardCopy from "../components/ClipBoardCopy";
 import {deriveApplicationAttributes} from "../utils/Manage";
 import DOMPurify from "dompurify";
 import {UnitHeaderInviter} from "../components/UnitHeaderInviter";
+import {isEmpty} from "../utils/Utils";
 
 export const Role = () => {
     const {id, tab = "users"} = useParams();
@@ -96,6 +97,34 @@ export const Role = () => {
 
     }, [id]);// eslint-disable-line react-hooks/exhaustive-deps
 
+    const separator = (role, index) => {
+        const l = role.applicationMaps.length;
+        if (index === (l - 1)) {
+            return "";
+        }
+        if (index === (l - 2)) {
+            return ` ${I18n.t("forms.and")} `
+        }
+        return ", ";
+    }
+
+    const landingPages = role => {
+        return role.applicationMaps
+            .filter(m => !isEmpty(m) && !m.unknown)
+            .map((m, index) => {
+                const name = m[`name:${I18n.locale}`] || m["name:en"];
+                const orgName = m[`OrganizationName:${I18n.locale}`] || m["OrganizationName:en"];
+                const landingPage = role.applicationUsages.find(au => au.application.manageId === m.id).landingPage;
+                return (
+                    <span>
+                        <a href={landingPage} target="_blank" rel="noreferrer">{`${name}`}</a>
+                        {`${orgName ? " (" + orgName + ")" : ""}`}
+                        {separator(role, index)}
+                    </span>
+                );
+            })
+    }
+
     const getActions = () => {
         const actions = [];
         if (allowedToEditRole(user, role)) {
@@ -158,11 +187,7 @@ export const Role = () => {
                 {!role.unknownInManage &&
                 <div className={"meta-data-row"}>
                     <WebsiteIcon/>
-                    <a href={role.applicationUsages[0].landingPage}
-                       rel="noreferrer"
-                       target="_blank">
-                        <span className={"application-name"}>{`${role.applicationNames}`}</span>
-                    </a>{role.applicationOrganizationName && <span>{` (${role.applicationOrganizationName})`}</span>}
+                    <div>{landingPages(role)}</div>
                 </div>}
                 {role.unknownInManage &&
                     <div className="meta-data-row unknown-in-manage">

diff --git a/client/src/tabs/Users.js b/client/src/tabs/Users.js
@@ -149,7 +149,7 @@ export const Users = () => {
 
     if (hasEntities) {
         title = I18n.t(`users.found`, {
-            count: totalElements,
+            count: totalElements.toLocaleString(),
             plural: I18n.t(`users.${totalElements === 1 ? "singleUser" : "multipleUsers"}`)
         })
     }

diff --git a/client/src/utils/Manage.js b/client/src/utils/Manage.js
@@ -108,7 +108,9 @@ export const mergeProvidersProvisioningsRoles = (providers, provisionings, roles
                 id: role.id,
                 name: role.name,
                 landingPage: role.applicationUsages.find(appUsage => appUsage.application.manageId === provider.id).landingPage
-            })),
+            }))
+            .sort((r1, r2) => r1.name.localeCompare(r2.name))
+        ,
         provisionings: provisionings
             .filter(prov => prov.applications.some(app => app.id === provider.id))
             .map(prov => ({

diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
@@ -192,8 +192,8 @@ email:
 # configure real users / passwords and test against those. See server/src/main/java/access/manage/ManageConf.java
 # and server/src/main/java/access/manage/LocalManage.java to see how it works.
 manage:
-#  enabled: True
-  enabled: False
+  enabled: True
+#  enabled: False
   url: "https://manage.test2.surfconext.nl"
   user: invite
   password: secret