Fix non meeting members from being part of meeting (OpenSlides#5692)

Author: Elblinator

client/src/app/gateways/repositories/motions/motion-repository.service/motion-repository.service.ts

@@ -187,7 +187,12 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
 
     public createTextBased(
         partialMotion: Partial<
-            Motion & { workflow_id: Id; attachment_mediafile_ids?: Id[]; supporter_meeting_user_ids?: Id[] }
+            Motion & {
+                workflow_id: Id;
+                attachment_mediafile_ids?: Id[];
+                supporter_meeting_user_ids?: Id[];
+                submitter_meeting_user_ids: Id[];
+            }
         >
     ): Action<CreateResponse> {
         const payload = {
@@ -196,7 +201,7 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
             title: partialMotion.title,
             text: partialMotion.text,
             origin_id: partialMotion.origin_id,
-            submitter_ids: partialMotion.submitter_ids,
+            submitter_meeting_user_ids: partialMotion.submitter_meeting_user_ids,
             workflow_id: partialMotion.workflow_id,
             category_id: partialMotion.category_id,
             attachment_mediafile_ids: partialMotion.attachment_mediafile_ids,
@@ -212,15 +217,20 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
 
     public createParagraphBased(
         partialMotion: Partial<
-            Motion & { workflow_id: Id; attachment_mediafile_ids?: Id[]; supporter_meeting_user_ids?: Id[] }
+            Motion & {
+                workflow_id: Id;
+                attachment_mediafile_ids?: Id[];
+                supporter_meeting_user_ids?: Id[];
+                submitter_meeting_user_ids: Id[];
+            }
         >
     ): Action<CreateResponse> {
         const payload = {
             meeting_id: this.activeMeetingIdService.meetingId,
             lead_motion_id: partialMotion.lead_motion_id,
             title: partialMotion.title,
             origin_id: partialMotion.origin_id,
-            submitter_ids: partialMotion.submitter_ids === null ? [] : partialMotion.submitter_ids,
+            submitter_meeting_user_ids: partialMotion.submitter_meeting_user_ids,
             workflow_id: partialMotion.workflow_id,
             category_id: partialMotion.category_id,
             attachment_mediafile_ids:
@@ -320,7 +330,7 @@ export class MotionRepositoryService extends BaseAgendaItemAndListOfSpeakersCont
             title: partialMotion.title,
             text: partialMotion.text,
             origin_id: partialMotion.origin_id,
-            submitter_ids: partialMotion.submitter_ids,
+            submitter_meeting_user_ids: partialMotion.submitter_meeting_user_ids,
             additional_submitter: partialMotion.additional_submitter,
             workflow_id: partialMotion.workflow_id,
             category_id: partialMotion.category_id,

client/src/app/site/modules/global-headbar/components/account-button/account-button.component.html

@@ -81,6 +81,11 @@
                                 <mat-icon class="menu-icon">done</mat-icon>
                                 <span class="menu-text">{{ 'Present' | translate }}</span>
                             </div>
+                        } @else if (!isinMeeting) {
+                            <div mat-menu-item>
+                                <mat-icon class="menu-icon">clear</mat-icon>
+                                <span class="menu-text">{{ 'Not part of meeting' | translate }}</span>
+                            </div>
                         } @else {
                             <div mat-menu-item>
                                 <mat-icon class="menu-icon">clear</mat-icon>

client/src/app/site/modules/global-headbar/components/account-button/account-button.component.ts

@@ -44,14 +44,16 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
 
     private _langTriggerSubscription: Subscription;
 
+    public get isinMeeting(): boolean {
+        return this.hasActiveMeeting && this.operator.isInMeeting(this.activeMeetingId) && !this.operator.isAnonymous;
+    }
+
     public get isPresent(): boolean {
-        return this.hasActiveMeeting && this.operator.isInMeeting(this.activeMeetingId) && !this.operator.isAnonymous
-            ? this.user.isPresentInMeeting()
-            : false;
+        return this.isinMeeting && this.user.isPresentInMeeting();
     }
 
     public get isAllowedSelfSetPresent(): boolean {
-        return this._isAllowedSelfSetPresent && this.operator.isInMeeting(this.activeMeetingId);
+        return this.isinMeeting && this._isAllowedSelfSetPresent;
     }
 
     public get hasActiveMeeting(): boolean {

client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.html

@@ -1,6 +1,10 @@
 @if (poll && isReady) {
     <!-- own voting -->
-    @if (isUserPresent) {
+    @if (!isUserInMeeting) {
+        <div class="text-center">
+            {{ 'You are not part of the meeting' | translate }}
+        </div>
+    } @else if (isUserPresent) {
         <ng-container [ngTemplateOutlet]="votingArea" />
     } @else {
         <div class="text-center">

client/src/app/site/pages/meetings/modules/poll/components/base-poll-vote/base-poll-vote.component.ts

@@ -75,6 +75,10 @@ export abstract class BasePollVoteComponent<C extends PollContentObject = any> e
         return this.user?.isPresentInMeeting();
     }
 
+    public get isUserInMeeting(): boolean {
+        return this.user?.isInActiveMeeting;
+    }
+
     public get isMobile(): boolean {
         return this.viewport.isMobile;
     }

client/src/app/site/pages/meetings/pages/assignments/pages/assignment-detail/components/assignment-detail/assignment-detail.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { Id } from 'src/app/domain/definitions/key-types';
@@ -162,7 +163,8 @@ export class AssignmentDetailComponent extends BaseMeetingComponent implements O
         private pollDialog: AssignmentPollDialogService,
         private assignmentPollService: AssignmentPollService,
         private pollController: PollControllerService,
-        private userRepo: UserControllerService
+        private userRepo: UserControllerService,
+        private snackBar: MatSnackBar
     ) {
         super();
         this.assignmentForm = formBuilder.group({
@@ -355,7 +357,12 @@ export class AssignmentDetailComponent extends BaseMeetingComponent implements O
      * Adds the operator to list of candidates
      */
     public async addSelf(): Promise<void> {
-        await this.addCandidate({ userId: this.operator.operatorId! });
+        if (!this.operator.isInMeeting(this.activeMeetingIdService.meetingId)) {
+            const infoMessage = this.translate.instant(`Action not possible. You have to be part of the meeting.`);
+            this.snackBar.open(infoMessage, this.translate.instant(`Ok`));
+        } else {
+            await this.addCandidate({ userId: this.operator.operatorId! });
+        }
     }
 
     /**

client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/components/chat-group-detail-message-form/chat-group-detail-message-form.component.html

@@ -1,4 +1,9 @@
-<mat-form-field appearance="outline" class="chat-form-field full-width" (keydown)="onKeyDown($event)">
+<mat-form-field
+    appearance="outline"
+    class="chat-form-field full-width"
+    [color]="isPartOfMeeting() ? 'accent' : 'warn'"
+    (keydown)="onKeyDown($event)"
+>
     @if (currentMessage) {
         <div class="chat-form-field-prefix flex-vertical-center" matPrefix>
             <span>{{ 'Edit' | translate }}</span>
@@ -25,14 +30,21 @@
         </mat-hint>
     }
     <button
-        color="accent"
         mat-icon-button
         matSuffix
         matTooltip=" {{ 'Send' | translate }}"
         type="button"
+        [color]="isPartOfMeeting() ? 'accent' : 'warn'"
         [disabled]="!isMessageFormValid"
         (click)="sendChatMessage()"
     >
         <mat-icon>send</mat-icon>
     </button>
+    @if (!isPartOfMeeting()) {
+        <mat-hint>
+            <span class="warn">
+                {{ 'You have to be part of the meeting to write messages.' | translate }}
+            </span>
+        </mat-hint>
+    }
 </mat-form-field>

client/src/app/site/pages/meetings/pages/chat/pages/chat-group-list/components/chat-group-detail-message-form/chat-group-detail-message-form.component.ts

@@ -1,8 +1,12 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormControl, Validators } from '@angular/forms';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { TranslateService } from '@ngx-translate/core';
 import { CHAT_MESSAGE_MAX_LENGTH } from 'src/app/gateways/repositories/chat/chat-message-repository.service';
 import { KeyCode } from 'src/app/infrastructure/utils/key-code';
 import { ViewChatMessage } from 'src/app/site/pages/meetings/pages/chat';
+import { ActiveMeetingIdService } from 'src/app/site/pages/meetings/services/active-meeting-id.service';
+import { OperatorService } from 'src/app/site/services/operator.service';
 
 @Component({
     selector: `os-chat-group-detail-message-form`,
@@ -37,7 +41,13 @@ export class ChatGroupDetailMessageFormComponent {
 
     private _currentMessage: ViewChatMessage | null = null;
 
-    public constructor(fb: UntypedFormBuilder) {
+    public constructor(
+        fb: UntypedFormBuilder,
+        private operator: OperatorService,
+        private activeMeetingIdService: ActiveMeetingIdService,
+        private translate: TranslateService,
+        private snackBar: MatSnackBar
+    ) {
         this.messageForm = fb.control(``, [Validators.maxLength(CHAT_MESSAGE_MAX_LENGTH)]);
     }
 
@@ -49,9 +59,14 @@ export class ChatGroupDetailMessageFormComponent {
     }
 
     public sendChatMessage(): void {
-        const content = this.messageForm.value?.trim() as string;
-        this.messageSent.emit(content);
-        this.resetMessageForm();
+        if (!this.isPartOfMeeting()) {
+            const infoMessage = this.translate.instant(`Action not possible. You have to be part of the meeting.`);
+            this.snackBar.open(infoMessage, this.translate.instant(`Ok`));
+        } else {
+            const content = this.messageForm.value?.trim() as string;
+            this.messageSent.emit(content);
+            this.resetMessageForm();
+        }
     }
 
     public cancelEditingChatMessage(): void {
@@ -63,4 +78,8 @@ export class ChatGroupDetailMessageFormComponent {
         this.currentMessage = null;
         this.messageForm.markAsPristine();
     }
+
+    public isPartOfMeeting(): boolean {
+        return this.operator.isInMeeting(this.activeMeetingIdService.meetingId);
+    }
 }

client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component.ts

@@ -179,13 +179,17 @@ export class AmendmentCreateWizardComponent extends BaseMeetingComponent impleme
                 amendmentParagraphs[paraNo] = this.contentForm.value[`text_` + paraNo];
             }
         });
+        const submitterMeetingUserId = this.operator.isInMeeting(this.activeMeetingId)
+            ? [this.operator.user.getMeetingUser(this.activeMeetingId)?.id]
+            : [];
         const motionCreate = {
             ...this.contentForm.value,
             title: this.translate.instant(`Amendment to`) + ` ` + this.motion.getNumberOrTitle(),
             parent_id: this.motion.id,
             category_id: this.operator.hasPerms(Permission.motionCanManage) ? this.motion.category_id : undefined,
             lead_motion_id: this.motion.id,
             amendment_paragraphs: amendmentParagraphs,
+            submitter_meeting_user_ids: submitterMeetingUserId,
             workflow_id: this.meetingSettingsService.instant(`motions_default_amendment_workflow_id`)
         };
 

client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-form/components/motion-form/motion-form.component.ts

@@ -251,6 +251,11 @@ export class MotionFormComponent extends BaseMeetingComponent implements OnInit
             }
 
             if (this.newMotion) {
+                if (update.submitter_ids.length === 0 && this.operator.isInMeeting(this.activeMeetingId)) {
+                    update.submitter_meeting_user_ids = [this.operator.user.getMeetingUser(this.activeMeetingId).id];
+                } else {
+                    update.submitter_meeting_user_ids = update.submitter_ids;
+                }
                 for (const key in update) {
                     if (update[key] === null || update[key].length === 0) {
                         delete update[key];
@@ -323,7 +328,7 @@ export class MotionFormComponent extends BaseMeetingComponent implements OnInit
 
     public async createNewSubmitter(username: string): Promise<void> {
         const newUserObj = await this.createNewUser(username);
-        this.addNewUserToFormCtrl(newUserObj, `submitter_ids`);
+        this.addNewUserToFormCtrl(newUserObj, `submitter_meeting_user_ids`);
     }
 
     public async createNewSupporter(username: string): Promise<void> {