Merge branch 'main' into feature/motion-forward

.github/dependabot.yml

@@ -45,6 +45,7 @@ updates:
       - "bastianjoel"
     assignees:
       - "bastianjoel"
+      - "rrenkert"
 
   - package-ecosystem: "github-actions"
     directory: "/"

Dockerfile

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

Dockerfile.dev

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

client/.eslintrc.js

@@ -67,6 +67,7 @@ module.exports = {
                 '@typescript-eslint/ban-types': ['error'],
                 '@typescript-eslint/explicit-member-accessibility': ['error'],
                 '@typescript-eslint/explicit-function-return-type': ['error'],
+                '@typescript-eslint/ban-ts-comment': ['error'],
 
                 'jsdoc/require-example': ['off'],
                 'jsdoc/newline-after-description': ['off'],
@@ -75,7 +76,6 @@ module.exports = {
                 '@typescript-eslint/no-empty-interface': ['off'],
 
                 // Should be switched to error ordered by priority
-                '@typescript-eslint/ban-ts-comment': ['warn'],
                 '@typescript-eslint/no-explicit-any': ['off'],
                 '@typescript-eslint/no-non-null-assertion': ['off'],
                 'no-console': ['off', { allow: ['warn', 'error', 'info', 'debug'] }],
@@ -102,12 +102,9 @@ module.exports = {
                 '@angular-eslint/template/attributes-order': ['error', {
                     alphabetical: true
                 }],
+                '@angular-eslint/template/prefer-control-flow': ['error'],
                 // Should be switched to error
-                '@angular-eslint/template/click-events-have-key-events': ['warn'],
-                '@angular-eslint/template/interactive-supports-focus': ['warn'],
-                '@angular-eslint/template/elements-content': ['warn'],
-                '@angular-eslint/template/alt-text': ['warn'],
-                '@angular-eslint/template/prefer-control-flow': ['warn']
+                '@angular-eslint/template/elements-content': ['warn']
             }
         },
         {

client/package.json

@@ -36,37 +36,38 @@
     "get-available-languages": "npm run ts -- cli/get-available-languages.ts"
   },
   "dependencies": {
-    "@angular/animations": "^18.1.1",
-    "@angular/cdk": "^18.1.1",
-    "@angular/common": "^18.1.1",
-    "@angular/compiler": "^18.1.1",
-    "@angular/core": "^18.1.1",
-    "@angular/forms": "^18.1.1",
-    "@angular/material": "^18.1.1",
-    "@angular/material-date-fns-adapter": "^18.1.1",
-    "@angular/platform-browser": "^18.1.1",
-    "@angular/platform-browser-dynamic": "^18.1.1",
-    "@angular/router": "^18.1.1",
-    "@angular/service-worker": "^18.1.1",
+    "@angular/animations": "^18.1.4",
+    "@angular/cdk": "^18.1.4",
+    "@angular/common": "^18.1.4",
+    "@angular/compiler": "^18.1.4",
+    "@angular/core": "^18.1.4",
+    "@angular/forms": "^18.1.4",
+    "@angular/material": "^18.1.4",
+    "@angular/material-date-fns-adapter": "^18.1.4",
+    "@angular/platform-browser": "^18.1.4",
+    "@angular/platform-browser-dynamic": "^18.1.4",
+    "@angular/router": "^18.1.4",
+    "@angular/service-worker": "^18.1.4",
+    "@material/typography": "^14.0.0",
     "@ngx-pwa/local-storage": "^18.0.0",
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^8.0.0",
-    "@tiptap/core": "^2.5.5",
-    "@tiptap/extension-color": "^2.5.5",
-    "@tiptap/extension-highlight": "^2.5.5",
-    "@tiptap/extension-image": "^2.5.5",
-    "@tiptap/extension-link": "^2.5.5",
-    "@tiptap/extension-subscript": "^2.5.5",
-    "@tiptap/extension-superscript": "^2.5.5",
-    "@tiptap/extension-table": "^2.5.5",
-    "@tiptap/extension-table-cell": "^2.5.5",
-    "@tiptap/extension-table-header": "^2.5.5",
-    "@tiptap/extension-table-row": "^2.5.5",
-    "@tiptap/extension-text-align": "^2.5.5",
+    "@tiptap/core": "^2.5.9",
+    "@tiptap/extension-color": "^2.5.9",
+    "@tiptap/extension-highlight": "^2.5.9",
+    "@tiptap/extension-image": "^2.5.9",
+    "@tiptap/extension-link": "^2.5.9",
+    "@tiptap/extension-subscript": "^2.5.9",
+    "@tiptap/extension-superscript": "^2.5.9",
+    "@tiptap/extension-table": "^2.5.9",
+    "@tiptap/extension-table-cell": "^2.5.9",
+    "@tiptap/extension-table-header": "^2.5.9",
+    "@tiptap/extension-table-row": "^2.5.9",
+    "@tiptap/extension-text-align": "^2.5.9",
     "@tiptap/extension-text-style": "^2.5.4",
-    "@tiptap/extension-underline": "^2.5.5",
+    "@tiptap/extension-underline": "^2.5.9",
     "@tiptap/pm": "^2.5.4",
-    "@tiptap/starter-kit": "^2.5.5",
+    "@tiptap/starter-kit": "^2.5.9",
     "@tsparticles/angular": "^3.0.0",
     "@tsparticles/engine": "^3.5.0",
     "@tsparticles/plugin-emitters": "^3.5.0",
@@ -88,44 +89,44 @@
     "ngx-file-drop": "^16.0.0",
     "ngx-material-timepicker": "^13.1.1",
     "ngx-papaparse": "^8.0.0",
-    "pdfmake": "^0.2.10",
+    "pdfmake": "^0.2.11",
     "pofile": "^1.1.4",
-    "qrcode": "^1.5.3",
+    "qrcode": "^1.5.4",
     "rxjs": "^7.8.1",
     "tinycolor2": "1.6.0",
-    "video.js": "^8.16.1",
-    "zone.js": "^0.14.8"
+    "video.js": "^8.17.2",
+    "zone.js": "^0.14.10"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.1.1",
-    "@angular-eslint/builder": "^18.1.0",
-    "@angular-eslint/eslint-plugin": "^18.1.0",
-    "@angular-eslint/eslint-plugin-template": "^18.1.0",
-    "@angular-eslint/schematics": "^18.1.0",
-    "@angular-eslint/template-parser": "^18.1.0",
-    "@angular/cli": "^18.1.1",
-    "@angular/compiler-cli": "^18.1.1",
+    "@angular-devkit/build-angular": "^18.1.4",
+    "@angular-eslint/builder": "^18.2.0",
+    "@angular-eslint/eslint-plugin": "^18.2.0",
+    "@angular-eslint/eslint-plugin-template": "^18.2.0",
+    "@angular-eslint/schematics": "^18.2.0",
+    "@angular-eslint/template-parser": "^18.2.0",
+    "@angular/cli": "^18.1.4",
+    "@angular/compiler-cli": "^18.1.4",
     "@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.14.11",
+    "@types/node": "^20.14.15",
     "@types/pdfmake": "^0.2.9",
     "@types/qrcode": "^1.5.5",
     "@types/tinycolor2": "^1.4.6",
     "@types/video.js": "^7.3.58",
-    "@typescript-eslint/eslint-plugin": "^7.17.0",
-    "@typescript-eslint/parser": "^7.17.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
     "@vendure/ngx-translate-extract": "^9.2.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^3.2.0",
-    "fetch-mock": "^10.0.8",
+    "fetch-mock": "^11.1.0",
     "jasmine-core": "~5.2.0",
     "js-yaml": "^4.1.0",
-    "karma": "~6.4.3",
+    "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",

client/src/app/domain/models/meetings/meeting.ts

@@ -199,6 +199,9 @@ export class Settings {
 
     // Structure Level
     public structure_level_ids: Id[]; // (structure_level/meeting_id)
+
+    // lock meeting
+    public locked_from_inside: boolean;
 }
 
 export class Meeting extends BaseModel<Meeting> {
@@ -293,6 +296,7 @@ export class Meeting extends BaseModel<Meeting> {
         `end_time`,
         `imported_at`,
         `language`,
+        `locked_from_inside`,
         `jitsi_domain`,
         `jitsi_room_name`,
         `jitsi_room_password`,

client/src/app/domain/models/organizations/organization.ts

@@ -21,6 +21,7 @@ export class OrganizationSetting {
     public limit_of_meetings!: number;
     public limit_of_users!: number;
     public default_language!: string;
+    public require_duplicate_from!: boolean;
 
     public users_email_sender!: string; // default: OpenSlides
     public users_email_subject!: string; // default: OpenSlides access data
@@ -70,6 +71,7 @@ export class Organization extends BaseModel<Organization> {
         `limit_of_meetings`,
         `limit_of_users`,
         `default_language`,
+        `require_duplicate_from`,
         `saml_enabled`,
         `saml_login_button_text`,
         `saml_attr_mapping`,

client/src/app/domain/models/poll/generic-poll.ts

@@ -25,7 +25,7 @@ export interface PollData {
     type: PollType;
     entitled_users_at_stop: EntitledUsersEntry[];
     options: OptionData[];
-    options_as_observable: Observable<OptionData[]>;
+    options$: Observable<OptionData[]>;
     global_option: OptionData;
     content_object?: PollContentObject;
     getContentObjectTitle: () => string | null;

client/src/app/domain/models/users/user.constants.ts

@@ -7,7 +7,7 @@ export const userHeadersAndVerboseNames: { [key in keyof User]?: any } = {
     first_name: _(`Given name`),
     last_name: _(`Surname`),
     email: _(`Email`),
-    member_number: _(`Member number`),
+    member_number: _(`Membership number`),
     pronoun: _(`Pronoun`),
     gender: _(`Gender`),
     username: _(`Username`),

client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts

@@ -316,7 +316,7 @@ export class HtmlToPdfService {
      * Can be overwritten by subclasses for more specific functionality.
      */
     protected createListParagraph(data: CreateSpecificParagraphPayload): any {
-        let children = this.parseChildren(data.element, data.styles);
+        let children: Element[] | Content[] = this.parseChildren(data.element, data.styles);
         const list = this.create(data.nodeName);
 
         // Fixes nested lists being placed inside `text` elements
@@ -325,7 +325,6 @@ export class HtmlToPdfService {
             (<any>children[0])?.text?.length &&
             (<any>children[0])?.text.find((el: any) => !!el.ul)
         ) {
-            // @ts-ignore
             children = [{ stack: (<any>children[0]).text }];
         }
 

client/src/app/gateways/presenter/get-user-related-models-presenter.service.ts

@@ -14,6 +14,7 @@ export interface GetUserRelatedModelsUser {
         assignment_candidate_ids: Id[];
         speaker_ids: Id[];
         motion_submitter_ids: Id[];
+        is_locked?: boolean;
     }[];
     committees?: GetUserRelatedModelsCommittee[];
     error?: string; // This is in case the presenter fails in an unpredicted way

client/src/app/gateways/repositories/base-repository.ts

@@ -20,7 +20,7 @@ import { Action, ActionService } from '../actions';
 import { ActionRequest } from '../actions/action-utils';
 import { RepositoryServiceCollectorService } from './repository-service-collector.service';
 
-const RELATION_AS_OBSERVABLE_SUFFIX = `_as_observable`;
+const RELATION_AS_OBSERVABLE_SUFFIX = `$`;
 
 export interface CreateResponse extends Identifiable, HasSequentialNumber {}
 

client/src/app/gateways/repositories/meeting-repository.service.ts

@@ -72,7 +72,8 @@ export class MeetingRepositoryService extends BaseRepository<ViewMeeting, Meetin
             `admin_group_id`,
             `committee_id`,
             `group_ids`,
-            `language`
+            `language`,
+            `locked_from_inside`
         ]);
         const detailEditFields: TypedFieldset<Meeting> = [
             `default_meeting_for_committee_id`,

client/src/app/gateways/repositories/organization-repository.service.ts

@@ -37,6 +37,7 @@ export class OrganizationRepositoryService extends BaseRepository<ViewOrganizati
             `users_email_replyto`,
             `users_email_sender`,
             `users_email_subject`,
+            `require_duplicate_from`,
             `saml_enabled`,
             `saml_login_button_text`,
             `saml_attr_mapping`,