Merge branch 'main' into 4301_vote_weight

.github/dependabot.yml

@@ -36,6 +36,11 @@ updates:
           patterns:
             - "cm-chess*"
     open-pull-requests-limit: 42
+    ignore:
+      - dependency-name: "@angular*"
+        update-types: ["version-update:semver-major"]
+      - dependency-name: "@schematics/angular"
+        update-types: ["version-update:semver-major"]
 
   - package-ecosystem: "docker"
     directory: "/"

client/cli/generate-settings-defaults.ts

@@ -11,7 +11,7 @@ const DESTINATION = path.resolve(path.join(__dirname, '../src/app/domain/definit
 const FILE_TEMPLATE = dedent`
     // THIS FILE IS GENERATED AUTOMATICALLY. DO NOT CHANGE IT MANUALLY.
 
-    import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+    import { _ } from "@ngx-translate/core";
     import { Settings } from 'src/app/domain/models/meetings/meeting';
 
     export const meetingSettingsDefaults: { [key in keyof Settings]: any } = {

client/package.json

@@ -36,22 +36,22 @@
     "get-available-languages": "npm run ts -- cli/get-available-languages.ts"
   },
   "dependencies": {
-    "@angular/animations": "^18.2.11",
-    "@angular/cdk": "^18.2.12",
-    "@angular/common": "^18.2.11",
-    "@angular/compiler": "^18.2.11",
-    "@angular/core": "^18.2.11",
-    "@angular/forms": "^18.2.11",
-    "@angular/material": "^18.2.12",
-    "@angular/material-date-fns-adapter": "^18.2.12",
-    "@angular/platform-browser": "^18.2.11",
-    "@angular/platform-browser-dynamic": "^18.2.11",
-    "@angular/router": "^18.2.11",
-    "@angular/service-worker": "^18.2.11",
+    "@angular/animations": "^18.2.12",
+    "@angular/cdk": "^18.2.14",
+    "@angular/common": "^18.2.12",
+    "@angular/compiler": "^18.2.12",
+    "@angular/core": "^18.2.12",
+    "@angular/forms": "^18.2.12",
+    "@angular/material": "^18.2.14",
+    "@angular/material-date-fns-adapter": "^18.2.14",
+    "@angular/platform-browser": "^18.2.12",
+    "@angular/platform-browser-dynamic": "^18.2.12",
+    "@angular/router": "^18.2.12",
+    "@angular/service-worker": "^18.2.12",
     "@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",
+    "@ngx-translate/core": "^16.0.3",
+    "@ngx-translate/http-loader": "^16.0.0",
     "@tiptap/core": "^2.9.1",
     "@tiptap/extension-color": "^2.9.1",
     "@tiptap/extension-highlight": "^2.9.1",
@@ -69,10 +69,10 @@
     "@tiptap/pm": "^2.9.1",
     "@tiptap/starter-kit": "^2.9.1",
     "@tsparticles/angular": "^3.0.0",
-    "@tsparticles/engine": "^3.5.0",
-    "@tsparticles/plugin-emitters": "^3.5.0",
-    "@tsparticles/shape-text": "^3.5.0",
-    "@tsparticles/slim": "^3.5.0",
+    "@tsparticles/engine": "^3.6.0",
+    "@tsparticles/plugin-emitters": "^3.6.0",
+    "@tsparticles/shape-text": "^3.6.0",
+    "@tsparticles/slim": "^3.6.0",
     "chart.js": "^4.4.6",
     "cm-chess": "^3.5.1",
     "cm-chessboard": "^8.7.4",
@@ -100,15 +100,14 @@
     "zone.js": "^0.14.10"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^18.2.11",
-    "@angular-eslint/builder": "^18.4.0",
-    "@angular-eslint/eslint-plugin": "^18.4.0",
-    "@angular-eslint/eslint-plugin-template": "^18.4.0",
-    "@angular-eslint/schematics": "^18.4.0",
-    "@angular-eslint/template-parser": "^18.4.0",
-    "@angular/cli": "^18.2.11",
-    "@angular/compiler-cli": "^18.2.11",
-    "@colsen1991/ngx-translate-extract-marker": "^3.0.1",
+    "@angular-devkit/build-angular": "^18.2.12",
+    "@angular-eslint/builder": "^18.4.1",
+    "@angular-eslint/eslint-plugin": "^18.4.1",
+    "@angular-eslint/eslint-plugin-template": "^18.4.1",
+    "@angular-eslint/schematics": "^18.4.1",
+    "@angular-eslint/template-parser": "^18.4.1",
+    "@angular/cli": "^18.2.12",
+    "@angular/compiler-cli": "^18.2.12",
     "@types/file-saver": "^2.0.7",
     "@types/jasmine": "~5.1.4",
     "@types/js-yaml": "^4.0.9",
@@ -119,7 +118,7 @@
     "@types/video.js": "^7.3.58",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
-    "@vendure/ngx-translate-extract": "^9.2.1",
+    "@vendure/ngx-translate-extract": "^9.3.1",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",

client/src/app/domain/definitions/meeting-settings-defaults.ts

@@ -1,6 +1,6 @@
 // THIS FILE IS GENERATED AUTOMATICALLY. DO NOT CHANGE IT MANUALLY.
 
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 export const meetingSettingsDefaults: { [key: string]: any } = {
     name: `Meeting title`,

client/src/app/domain/definitions/permission.config.ts

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 import { Permission } from './permission';
 

client/src/app/domain/models/agenda/agenda-item.ts

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 import { Fqid, Id } from '../../definitions/key-types';
 import { HasMeetingId } from '../../interfaces/has-meeting-id';

client/src/app/domain/models/mediafiles/mediafile.constants.ts

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 export const LogoDisplayNames = {
     projector_main: _(`Projector logo`),

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

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 import { OptionDataKey, PollDataKey } from './generic-poll';
 

client/src/app/domain/models/projector/projection-default.ts

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 export const PROJECTIONDEFAULT = {
     agendaItemList: `agenda_item_list`,

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

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 import { User } from './user';
 

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

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 import { Id } from '../../definitions/key-types';
 import { OMLMapping } from '../../definitions/organization-permission';

client/src/app/gateways/error-mapping/error-map-utils.ts

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 import { MeetingAction } from '../repositories/meetings';
 import { MotionAction } from '../repositories/motions';

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

@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import { Id } from 'src/app/domain/definitions/key-types';
+
+import { Presenter } from './presenter';
+import { PresenterService } from './presenter.service';
+
+interface GetUserEditablePresenterPayload {
+    user_ids: Id[];
+    fields: string[];
+}
+
+interface GetUserEditableIdentifiedScope {
+    [field: string]: [boolean, string?];
+}
+
+export interface GetUserEditablePresenterResult {
+    [user_id: Id]: GetUserEditableIdentifiedScope;
+}
+
+@Injectable({
+    providedIn: `root`
+})
+export class GetUserEditablePresenterService {
+    public constructor(private presenter: PresenterService) {}
+
+    public async call(payload: GetUserEditablePresenterPayload): Promise<GetUserEditablePresenterResult> {
+        return await this.presenter.call(Presenter.GET_USER_EDITABLE, payload);
+    }
+}

client/src/app/gateways/presenter/index.ts

@@ -1,5 +1,6 @@
 export * from './get-active-users-amount-presenter.service';
 export * from './get-forwarding-meetings-presenter.service';
+export * from './get-user-editable-presenter.service';
 export * from './get-user-related-models-presenter.service';
 export * from './get-user-scope-presenter.service';
 export * from './get-users-presenter.service';

client/src/app/gateways/presenter/presenter.ts

@@ -2,6 +2,7 @@ export enum Presenter {
     SERVERTIME = `server_time`,
     GET_USERS = `get_users`,
     GET_ACTIVE_USER_AMOUNT = `get_active_users_amount`,
+    GET_USER_EDITABLE = `get_user_editable`,
     GET_USER_RELATED_MODELS = `get_user_related_models`,
     GET_USER_SCOPE = `get_user_scope`,
     GET_FORWARDING_COMMITTEES = `get_forwarding_committees`,

client/src/app/gateways/repositories/poll-candidate-lists/poll-candidate-list/poll-candidate-list-repository.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 import { PollCandidateList } from 'src/app/domain/models/poll-candidate-lists/poll-candidate-list';
 import { ViewPollCandidateList } from 'src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list';
 import { DEFAULT_FIELDSET, Fieldsets } from 'src/app/site/services/model-request-builder';

client/src/app/gateways/repositories/structure-levels/structure-level-repository.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 import { Id } from 'src/app/domain/definitions/key-types';
 
 import { Identifiable } from '../../../domain/interfaces';

client/src/app/infrastructure/errors/prevented-in-demo.error.ts

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 /**
  * Define custom error classes here

client/src/app/infrastructure/errors/process.error.ts

@@ -1,5 +1,5 @@
 import { HttpErrorResponse } from '@angular/common/http';
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 interface ErrorMessageResponse {
     message: string;

client/src/app/infrastructure/utils/functions.spec.ts

@@ -517,9 +517,10 @@ describe(`utils: functions`, () => {
                 number: 1,
                 boolean: true
             },
-            string: `string`
+            string: `string`,
+            empty_string: ``
         };
-        const expected = `{\n   "array": [\n      "string1",\n      "string2"\n   ],\n   "object": {\n      "number": 1,\n      "boolean": true\n   },\n   "string": "string"\n}`;
+        const expected = `{\n   "array": [\n      "string1",\n      "string2"\n   ],\n   "object": {\n      "number": 1,\n      "boolean": true\n   },\n   "string": "string",\n   "empty_string": ""\n}`;
         it(`test with an object`, () => {
             expect(objectToFormattedString(testObject)).toBe(expected);
         });
@@ -533,6 +534,12 @@ describe(`utils: functions`, () => {
             expect(objectToFormattedString(null)).toBe(undefined);
             expect(objectToFormattedString(``)).toBe(undefined);
         });
+
+        it(`test with object with empty string`, () => {
+            const obj1 = { string: `` };
+            const expected = `{\n   "string": ""\n}`;
+            expect(objectToFormattedString(obj1)).toBe(expected);
+        });
     });
 
     describe(`isValidId function`, () => {

client/src/app/infrastructure/utils/functions.ts

@@ -346,7 +346,7 @@ export function objectToFormattedString(jsonOrObject: string | object): string {
     );
 
     // Extract strings from JSON
-    const stringRegex = /\"([^\"]+)\"/g;
+    const stringRegex = /\"([^\"]*)\"/g;
     const stringReplacement = `#`;
     let strings: string[] = [...json.match(stringRegex)];
     while (stringRegex.test(json)) {

client/src/app/infrastructure/utils/import/import-step.ts

@@ -1,4 +1,4 @@
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 
 export enum ImportStepPhase {
     ENQUEUED,

client/src/app/infrastructure/utils/import/json-import-file-utils.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
+import { _ } from '@ngx-translate/core';
 import { TranslateService } from '@ngx-translate/core';
 import { FileData } from 'src/app/ui/modules/file-upload/components/file-upload/file-upload.component';