Merge branch 'main' into update-permissions-in-for-participant-views

OpenSlides · Apr 18, 2024 · 37ce757 · 37ce757
2 parents 1eefdc3 + 2a5a62c
commit 37ce757
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/...ipants/pages/participant-list/components/participant-list/participant-list.component.html b/...ipants/pages/participant-list/components/participant-list/participant-list.component.html
@@ -152,11 +152,13 @@ <h2>{{ 'Participants' | translate }}</h2>
     <!-- Menu -->
     <div *osScrollingTableCell="'menu'; row as user; config: { width: 40 }" class="cell-slot fill">
         <button
+            *osPerms="permission.userCanUpdate"
             mat-icon-button
             [disabled]="isMultiSelect"
             [matMenuTriggerFor]="singleItemMenu"
             (click)="$event.stopPropagation()"
             [matMenuTriggerData]="{ user: user }"
+            *ngIf="canSeeSingleItemMenu(user) || (viewport.isMobileSubject | async)"
         >
             <mat-icon>more_vert</mat-icon>
         </button>
@@ -177,12 +179,12 @@ <h2>{{ 'Participants' | translate }}</h2>
             <span>{{ 'Present' | translate }}</span>
         </mat-checkbox>
 
-        <button *osPerms="permission.userCanManage" mat-menu-item (click)="openEditInfo(user)">
+        <button *osPerms="permission.userCanUpdate" mat-menu-item (click)="openEditInfo(user)">
             <mat-icon>edit</mat-icon>
             <span>{{ 'Edit details' | translate }}</span>
         </button>
 
-        <button *osPerms="permission.userCanManage" mat-menu-item (click)="switchParticipants(user)">
+        <button *osPerms="permission.userCanUpdate" mat-menu-item (click)="switchParticipants(user)">
             <mat-icon>swap_horiz</mat-icon>
             <span>{{ 'Swap mandates' | translate }}</span>
         </button>
@@ -196,7 +198,7 @@ <h2>{{ 'Participants' | translate }}</h2>
             <span>{{ 'Change password' | translate }}</span>
         </button>
 
-        <button *osPerms="permission.userCanManage" mat-menu-item (click)="sendInvitationEmail(user)">
+        <button *osPerms="permission.userCanUpdate" mat-menu-item (click)="sendInvitationEmail(user)">
             <mat-icon>mail</mat-icon>
             <span>{{ 'Send invitation email' | translate }}</span>
         </button>

diff --git a/...icipants/pages/participant-list/components/participant-list/participant-list.component.ts b/...icipants/pages/participant-list/components/participant-list/participant-list.component.ts
@@ -458,6 +458,10 @@ export class ParticipantListComponent extends BaseMeetingListViewComponent<ViewU
         await this.repo.removeUsersFromMeeting([user]);
     }
 
+    public canSeeSingleItemMenu(user: ViewUser): boolean {
+        return this.operator.hasPerms(Permission.userCanUpdate) || this.canChangePassword(user);
+    }
+
     /**
      * Bulk deletes users. Needs multiSelect mode to fill selectedRows
      */

diff --git a/...ages/participant-list/services/participant-list-filter/participant-list-filter.service.ts b/...ages/participant-list/services/participant-list-filter/participant-list-filter.service.ts
@@ -1,12 +1,14 @@
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import { Permission } from 'src/app/domain/definitions/permission';
 import { GENDER_FITLERABLE, GENDERS } from 'src/app/domain/models/users/user';
 import { OsFilter, OsHideFilterSetting } from 'src/app/site/base/base-filter.service';
 import { BaseMeetingFilterListService } from 'src/app/site/pages/meetings/base/base-meeting-filter-list.service';
 import { MeetingActiveFiltersService } from 'src/app/site/pages/meetings/services/meeting-active-filters.service';
 import { MeetingSettingsService } from 'src/app/site/pages/meetings/services/meeting-settings.service';
 import { DelegationType } from 'src/app/site/pages/meetings/view-models/delegation-type';
 import { ViewUser } from 'src/app/site/pages/meetings/view-models/view-user';
+import { OperatorService } from 'src/app/site/services/operator.service';
 
 import { GroupControllerService } from '../../../../modules/groups/services/group-controller.service';
 import { StructureLevelControllerService } from '../../../structure-levels/services/structure-level-controller.service';
@@ -41,7 +43,8 @@ export class ParticipantListFilterService extends BaseMeetingFilterListService<V
         groupRepo: GroupControllerService,
         structureRepo: StructureLevelControllerService,
         private translate: TranslateService,
-        private meetingSettings: MeetingSettingsService
+        private meetingSettings: MeetingSettingsService,
+        private operator: OperatorService
     ) {
         super(store);
         this.updateFilterForRepo({
@@ -168,14 +171,26 @@ export class ParticipantListFilterService extends BaseMeetingFilterListService<V
             },
             {
                 property: `is_active`,
-                shouldHideFn() {
-                    return !this.canSeeSensitiveData;
+                shouldHideFn: (): boolean => {
+                    return !this.operator.hasPerms(Permission.userCanSeeSensitiveData);
                 }
             },
             {
                 property: `hasSamlId`,
-                shouldHideFn() {
-                    return !this.canSeeSensitiveData;
+                shouldHideFn: (): boolean => {
+                    return !this.operator.hasPerms(Permission.userCanSeeSensitiveData);
+                }
+            },
+            {
+                property: `isLastEmailSent`,
+                shouldHideFn: (): boolean => {
+                    return !this.operator.hasPerms(Permission.userCanSeeSensitiveData);
+                }
+            },
+            {
+                property: `isLastLogin`,
+                shouldHideFn: (): boolean => {
+                    return !this.operator.hasPerms(Permission.userCanUpdate);
                 }
             }
         ];

diff --git a/client/src/app/worker/http/http-stream.ts b/client/src/app/worker/http/http-stream.ts
@@ -148,6 +148,8 @@ export abstract class HttpStream {
 
         if (data instanceof ErrorDescription || isCommunicationError(data) || isCommunicationErrorWrapper(data)) {
             this.handleError(data);
+        } else if (isCommunicationError(this.parse(data)) || isCommunicationErrorWrapper(this.parse(data))) {
+            this.handleError(this.parse(data));
         } else {
             data = this.parse(data);
             this.failedCounter = 0;