Skip to content

Commit

Permalink
feat: Rework Space Administration Table - MEED-7493 - Meeds-io/MIPs#160
Browse files Browse the repository at this point in the history
  • Loading branch information
boubaker committed Nov 6, 2024
1 parent 2856a7b commit a3d73e5
Show file tree
Hide file tree
Showing 71 changed files with 793 additions and 1,982 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -844,12 +844,15 @@ public static SpaceEntity buildEntityFromSpace(Space space, String userId, Strin
}
spaceEntity.setIdentity(identity);
spaceEntity.setIdentityId(spaceIdentity.getId());
spaceEntity.setTotalBoundUsers(groupSpaceBindingService.countBoundUsers(space.getId()));

boolean hasBindings = groupSpaceBindingService.isBoundSpace(space.getId());
spaceEntity.setHasBindings(hasBindings);
if (hasBindings) {
spaceEntity.setIsUserBound(groupSpaceBindingService.countUserBindings(space.getId(), userId) > 0);
if (expandFields.contains(RestProperties.GROUP_BINDING)
&& spaceService.canViewSpace(space, userId)) {
spaceEntity.setTotalBoundUsers(groupSpaceBindingService.countBoundUsers(space.getId()));
boolean hasBindings = groupSpaceBindingService.isBoundSpace(space.getId());
spaceEntity.setHasBindings(hasBindings);
if (hasBindings) {
spaceEntity.setIsUserBound(groupSpaceBindingService.countUserBindings(space.getId(), userId) > 0);
}
}

LinkEntity managers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ public class RestProperties {

public static final String MUTED = "muted";

public static final String GROUP_BINDING = "groupBinding";

/* Kept for backward compatibility */
public static final String USER_NAME = "userName";

Expand Down
1 change: 0 additions & 1 deletion webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@
<include>portlet/ProfileWorkExperience/Style.less</include>
<include>portlet/Search/Style.less</include>
<include>portlet/SpaceInfos/Style.less</include>
<include>portlet/SpacesAdministration/Style.less</include>
<include>portlet/SpacesListExternal/Style.less</include>
<include>portlet/SpacesOverview/Style.less</include>
<include>portlet/SuggestionsPeopleAndSpace/Style.less</include>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=مفتوح
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only

social.spaces.administration.manageSpaces.applications=إدارة تطبيقات الفضاءات
social.spaces.administration.manageSpaces.applications.remove=حذف
social.spaces.administration.manageSpaces.users=المستخدمون
social.spaces.administration.manageSpaces.users.tooltip=عدد المستخدمين المقيدين/العدد الإجمالي لأعضاء المساحة
social.spaces.administration.manageSpaces.actions=الإجراءات
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=مفتوح
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only

social.spaces.administration.manageSpaces.applications=إدارة تطبيقات الفضاءات
social.spaces.administration.manageSpaces.applications.remove=حذف
social.spaces.administration.manageSpaces.users=المستخدمون
social.spaces.administration.manageSpaces.users.tooltip=عدد المستخدمين المقيدين/العدد الإجمالي لأعضاء المساحة
social.spaces.administration.manageSpaces.actions=الإجراءات
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Öffnen
social.spaces.administration.manageSpaces.registration.validation=Genehmigung anfordern
social.spaces.administration.manageSpaces.registration.closed=Nur mit Einladung

social.spaces.administration.manageSpaces.applications=Verwalten Sie die Anwendungen von Räumen
social.spaces.administration.manageSpaces.applications.remove=Entfernen
social.spaces.administration.manageSpaces.users=Nutzer
social.spaces.administration.manageSpaces.users.tooltip=Anzahl der gebundenen Benutzer/Gesamtzahl der Raum-Mitglieder
social.spaces.administration.manageSpaces.actions=Aktionen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.name=Name
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down Expand Up @@ -115,3 +114,12 @@ MembersPortlet.label.name=Members
TaskManagementApplication.label.name=Tasks
social.spaces.templates.permissionEntry={0} in {1}
social.spaces.templates.any=Any

social.spaces.administration.manageSpaces.template=Template
social.spaces.administration.manageSpaces.admins=Admins
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.bindingStatus=Sync
social.spaces.administration.manageSpaces.noTemplate=No template
social.spaces.administration.manageSpaces.admins.drawerTitle=Admins of {0}
social.spaces.administration.manageSpaces.bindingStatus.tooltip={0} sync members
social.spaces.administration.manageSpaces.noBindingStatus.tooltip=No group sync
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Abierto
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only

social.spaces.administration.manageSpaces.applications=Administrar aplicaciones de espacios
social.spaces.administration.manageSpaces.applications.remove=Eliminar
social.spaces.administration.manageSpaces.users=Usuarios
social.spaces.administration.manageSpaces.users.tooltip=Número de usuarios asignados/Número total de miembros del espacio
social.spaces.administration.manageSpaces.actions=Acciones
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Ouverte
social.spaces.administration.manageSpaces.registration.validation=Sur validation
social.spaces.administration.manageSpaces.registration.closed=Sur invitation

social.spaces.administration.manageSpaces.applications=Gérer les applications de l'espace
social.spaces.administration.manageSpaces.applications.remove=Supprimer
social.spaces.administration.manageSpaces.users=Utilisateurs
social.spaces.administration.manageSpaces.users.tooltip=Nombre des utilisateurs liés/Nombre total des membres de l'espace
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Buka
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only

social.spaces.administration.manageSpaces.applications=Kelola aplikasi-aplikasi forum.
social.spaces.administration.manageSpaces.applications.remove=Hapus
social.spaces.administration.manageSpaces.users=Pengguna
social.spaces.administration.manageSpaces.users.tooltip=Jumlah pengguna yang terikat/Jumlah total anggota forum.
social.spaces.administration.manageSpaces.actions=Aksi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Validation
social.spaces.administration.manageSpaces.registration.closed=Closed
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Aperto
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Gestisci applicazioni degli spazi
social.spaces.administration.manageSpaces.applications.remove=Rimuovere
social.spaces.administration.manageSpaces.users=Utenti
social.spaces.administration.manageSpaces.users.tooltip=Numero di utenti associati/Numero totale di membri dello spazio
social.spaces.administration.manageSpaces.actions=Azioni
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Validation
social.spaces.administration.manageSpaces.registration.close=Closed
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ social.spaces.administration.manageSpaces.registration.open=Open
social.spaces.administration.manageSpaces.registration.validation=Request Approval
social.spaces.administration.manageSpaces.registration.closed=Invite Only
social.spaces.administration.manageSpaces.applications=Manage spaces' applications
social.spaces.administration.manageSpaces.applications.remove=Remove
social.spaces.administration.manageSpaces.users=Users
social.spaces.administration.manageSpaces.users.tooltip=Number of bound users/Total number of space members
social.spaces.administration.manageSpaces.actions=Actions
Expand Down
Loading

0 comments on commit a3d73e5

Please sign in to comment.