Merge branch 'main' into 3841-update-user-two-meetings

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.17 as build
+FROM node:20.18 as build
 ENV NODE_VERSION=20.14.0
 
 WORKDIR /app

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:20.17-alpine
+FROM node:20.18-alpine
 ENV NODE_VERSION=20.14.0
 
 RUN apk add --no-cache git

client/package.json

@@ -36,18 +36,18 @@
     "get-available-languages": "npm run ts -- cli/get-available-languages.ts"
   },
   "dependencies": {
-    "@angular/animations": "^18.2.7",
-    "@angular/cdk": "^18.2.7",
-    "@angular/common": "^18.2.7",
-    "@angular/compiler": "^18.2.7",
-    "@angular/core": "^18.2.7",
-    "@angular/forms": "^18.2.7",
-    "@angular/material": "^18.2.7",
-    "@angular/material-date-fns-adapter": "^18.2.7",
-    "@angular/platform-browser": "^18.2.7",
-    "@angular/platform-browser-dynamic": "^18.2.7",
-    "@angular/router": "^18.2.7",
-    "@angular/service-worker": "^18.2.7",
+    "@angular/animations": "^18.2.8",
+    "@angular/cdk": "^18.2.8",
+    "@angular/common": "^18.2.8",
+    "@angular/compiler": "^18.2.8",
+    "@angular/core": "^18.2.8",
+    "@angular/forms": "^18.2.8",
+    "@angular/material": "^18.2.8",
+    "@angular/material-date-fns-adapter": "^18.2.8",
+    "@angular/platform-browser": "^18.2.8",
+    "@angular/platform-browser-dynamic": "^18.2.8",
+    "@angular/router": "^18.2.8",
+    "@angular/service-worker": "^18.2.8",
     "@material/typography": "^14.0.0",
     "@ngx-pwa/local-storage": "^18.0.0",
     "@ngx-translate/core": "^15.0.0",
@@ -100,19 +100,19 @@
     "zone.js": "^0.14.10"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.2.7",
+    "@angular-devkit/build-angular": "^18.2.8",
     "@angular-eslint/builder": "^18.3.1",
     "@angular-eslint/eslint-plugin": "^18.3.1",
     "@angular-eslint/eslint-plugin-template": "^18.3.1",
     "@angular-eslint/schematics": "^18.3.1",
     "@angular-eslint/template-parser": "^18.3.1",
-    "@angular/cli": "^18.2.7",
-    "@angular/compiler-cli": "^18.2.7",
+    "@angular/cli": "^18.2.8",
+    "@angular/compiler-cli": "^18.2.8",
     "@colsen1991/ngx-translate-extract-marker": "^2.0.8",
     "@types/file-saver": "^2.0.7",
     "@types/jasmine": "~5.1.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^20.16.10",
+    "@types/node": "^20.16.11",
     "@types/pdfmake": "^0.2.9",
     "@types/qrcode": "^1.5.5",
     "@types/tinycolor2": "^1.4.6",
@@ -126,7 +126,7 @@
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.1.4",
     "fetch-mock": "^11.1.5",
-    "jasmine-core": "~5.3.0",
+    "jasmine-core": "~5.4.0",
     "js-yaml": "^4.1.0",
     "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",

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

@@ -57,15 +57,17 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
         return this.theme.isDarkModeObservable;
     }
 
-    public user: ViewUser | null = null;
+    public get user(): ViewUser {
+        return this.operator.user;
+    }
+
     public username = ``;
     public isLoggedIn = false;
 
     private get activeMeetingId(): Id | null {
         return this.activeMeetingIdService.meetingId;
     }
 
-    private _userId: Id | null | undefined = undefined; // to distinguish from null!
     private _isAllowedSelfSetPresent = false;
     private _languageTrigger: MatMenuTrigger | undefined = undefined;
     private clickCounter = 0;
@@ -81,7 +83,6 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
         private theme: ThemeService,
         private meetingSettingsService: MeetingSettingsService,
         private activeMeetingIdService: ActiveMeetingIdService,
-        private controller: UserControllerService,
         chessChallengeService: ChessChallengeService
     ) {
         super();
@@ -117,11 +118,11 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
     }
 
     public toggleOperatorPresence(): void {
-        this.controller
+        this.userRepo
             .setPresent({
                 isPresent: !this.isPresent,
                 meetingId: this.activeMeetingId,
-                users: [this.user!]
+                users: [this.user]
             })
             .resolve();
     }
@@ -186,10 +187,5 @@ export class AccountButtonComponent extends BaseUiComponent implements OnInit {
     private onOperatorUpdate(): void {
         this.isLoggedIn = !this.operator.isAnonymous;
         this.username = this.operator.shortName;
-        const userId = this.operator.operatorId;
-        if (this._userId !== userId) {
-            this._userId = userId;
-            this.user = this.operator.user;
-        }
     }
 }

client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/components/motion-slide/motion-slide.component.html

@@ -172,14 +172,6 @@ <h3>{{ 'Reason' | translate }}</h3>
                     }
                 </div>
             </section>
-
-            <!-- Reason -->
-            @if (data.data.reason) {
-                <div>
-                    <h3>{{ 'Reason' | translate }}</h3>
-                    <div [innerHTML]="data.data.reason | trust: 'html'"></div>
-                </div>
-            }
         }
     </div>
 }

client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/pages/motion-view/components/motion-content/motion-content.component.scss

@@ -3,3 +3,9 @@
     flex-direction: column;
     margin-top: 10px;
 }
+
+.motion-content {
+    h3 {
+        font-weight: bold;
+    }
+}